yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

验车

master
dimengzhe 2 years ago
parent
6164c14edb
commit
21fed3317d
6 changed files with 29 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java
  2. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
  3. 114
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  4. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDetailsVo.java
  5. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java
  6. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java
View File

@ -79,7 +79,8 @@ public class ScmVehicleExaminePageVo implements Vo {
@ApiModelProperty("供应商名称")
private String manufacturerName; // 供应商名称
private String modelSid;
@ApiModelProperty("外采 排产 调车 sid")
private String businessSid;
/* @ApiModelProperty("外采 排产 调车 sid")
private String businessSid;*/
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
View File

@ -106,7 +106,8 @@
sve.businessSid,
sve.inspection as inspectedName,
sve.inspectionDate as inspectedDate,
sve.inspectionResult as inspectedType
sve.inspectionResult as inspectedType,
sve.modelSid
FROM scm_vehicle_examine sve
<where>
${ew.sqlSegment}

114
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
View File

@ -29,7 +29,6 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
@ -41,7 +40,6 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState;
@ -202,36 +200,14 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
if ("1".equals(record.getInspectedType())) {
record.setShowInspectedBtn(true);
}
String purchaseTypeKey = record.getPurchaseTypeKey();
String businessSid = record.getBusinessSid();
if ("001".equals(purchaseTypeKey)){//排产
BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(businessSid).getData();
String carBrandSid = busVehicleApplyDetailsVo.getCarBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
record.setManufacturerName(manufacturerName);
}
}else if ("002".equals(purchaseTypeKey)){//外采
BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(businessSid).getData();
String carBrandSid = baseOutsourcingApplicationDetailsVo.getCarBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
record.setManufacturerName(manufacturerName);
}
}else if ("003".equals(purchaseTypeKey)){//内购
BaseInternalPurchaseDetailsVo baseInternalPurchaseDetailsVo = baseInternalPurchaseFeign.fetchDetailsBySid(businessSid).getData();
String carBrandSid = baseInternalPurchaseDetailsVo.getBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
record.setManufacturerName(manufacturerName);
}
}
//品牌
BaseVehicleModel data = baseVehicleModelFeign.selectDetails(record.getModelSid()).getData();
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
//厂商sid
BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
//供应商名称
record.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
}
return iPage;
}
@ -342,36 +318,13 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
List<String> factoryImages = new ArrayList<>();
List<String> carInspectedImages = new ArrayList<>();
AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid);
String businessSid = vo.getBusinessSid();
String purchaseTypeKey = vo.getPurchaseKey();
if ("001".equals(purchaseTypeKey)){//排产
BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(businessSid).getData();
String carBrandSid = busVehicleApplyDetailsVo.getCarBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
vo.setManufacturerName(manufacturerName);
}
}else if ("002".equals(purchaseTypeKey)){//外采
BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(businessSid).getData();
String carBrandSid = baseOutsourcingApplicationDetailsVo.getCarBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
vo.setManufacturerName(manufacturerName);
}
}else if ("003".equals(purchaseTypeKey)){//内购
BaseInternalPurchaseDetailsVo baseInternalPurchaseDetailsVo = baseInternalPurchaseFeign.fetchDetailsBySid(businessSid).getData();
String carBrandSid = baseInternalPurchaseDetailsVo.getBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
vo.setManufacturerName(manufacturerName);
}
}
//品牌
BaseVehicleModel data = baseVehicleModelFeign.selectDetails(vo.getModelSid()).getData();
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
//厂商sid
BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
//供应商名称
vo.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(vo.getPurchaseKey())) {
vo.setEditVin(true);
} else {
@ -434,36 +387,13 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
List<String> carInspectedImages = new ArrayList<>();
AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid);
String businessSid = vo.getBusinessSid();
String purchaseTypeKey = vo.getPurchaseTypeKey();
if ("001".equals(purchaseTypeKey)){//排产
BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(businessSid).getData();
String carBrandSid = busVehicleApplyDetailsVo.getCarBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
vo.setManufacturerName(manufacturerName);
}
}else if ("002".equals(purchaseTypeKey)){//外采
BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(businessSid).getData();
String carBrandSid = baseOutsourcingApplicationDetailsVo.getCarBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
vo.setManufacturerName(manufacturerName);
}
}else if ("003".equals(purchaseTypeKey)){//内购
BaseInternalPurchaseDetailsVo baseInternalPurchaseDetailsVo = baseInternalPurchaseFeign.fetchDetailsBySid(businessSid).getData();
String carBrandSid = baseInternalPurchaseDetailsVo.getBrandSid();
if (StringUtils.isNotBlank(carBrandSid)){
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(carBrandSid);
BaseManufacturerAllVo data = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
String manufacturerName = data.getBaseManufacturerDto().getManufacturerName();
vo.setManufacturerName(manufacturerName);
}
}
//品牌
BaseVehicleModel data = baseVehicleModelFeign.selectDetails(vo.getModelSid()).getData();
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data.getCarBrand());
//厂商sid
BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData();
//供应商名称
vo.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
List<AppScmInspectionItemVo> inspectionItemVos = new ArrayList<>();
for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDetailsVo.java
View File

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -11,6 +10,7 @@ import java.util.List;
@Data
public class AppExamineDetailsVo implements Vo {
private static final long serialVersionUID = 2286616136395209632L;
@ApiModelProperty("车架号")
private String vin;
@ -74,7 +74,6 @@ public class AppExamineDetailsVo implements Vo {
@ApiModelProperty("发动机号")
private String engineNo;
@JsonProperty("supplier")
private String manufacturerName;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java
View File

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -75,7 +74,6 @@ public class AppExamineInfoVo implements Vo {
private String orgPath;
@JsonProperty("supplier")
private String manufacturerName;
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java
View File

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -42,7 +41,7 @@ public class AppExaminePageVo implements Vo {
@ApiModelProperty("保存状态（默认为0 未操作 1 已保存）")
private int saveStatus;
@JsonProperty("supplier")
@ApiModelProperty("供应商")
private String manufacturerName;
}

Write Preview
Loading…
Cancel
Save