diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java index 2a9e89dbd9..cb187e829c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java @@ -83,6 +83,19 @@ public class BaseManufacturerDetailsVo implements Vo { private String city; @ApiModelProperty(value = "县区") private String county; + + @ApiModelProperty("所属分公司sid") + private String createOrg; + + @ApiModelProperty(value = "所属分公司名称") + private String createOrgName; + + @ApiModelProperty("使用组织sid") + private String useOrg; + + @ApiModelProperty(value = "使用组织名称") + private String useOrgName; + @ApiModelProperty(value = "厂商开户行sid") private String manBankSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java index 20916fcd4d..6db736d3c5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java @@ -120,6 +120,4 @@ public class BaseManufacturerDto implements Dto { @ApiModelProperty(value = "使用组织名称") private String useOrgName; -/* @ApiModelProperty(value = "厂商开户行sid") - private String manBankSid;*/ } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 50e9232625..ec73d493e5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -567,7 +567,7 @@ public class BaseAccadjApplyService extends MybatisBaseService diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 9ae0bff696..bf8668aa5f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -165,7 +165,7 @@ public class BaseVehicleOutService extends MybatisBaseService - and fMaterialId=#{fMaterialId} + and fMaterialId like concat('%',#{fMaterialId},'%') and useOrgSid=#{useOrgSid} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 87526910b7..55ac529fb7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -202,7 +202,7 @@ @@ -98,6 +101,8 @@ sve.vinNo as vin, sve.departureDate as dispatchedDate, sve.purchaseType, + sve.purchaseTypeKey, + sve.businessSid, sve.inspection as inspectedName, sve.inspectionDate as inspectedDate, sve.inspectionResult as inspectedType diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index f583b88617..0e18fd01ff 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -29,12 +29,18 @@ 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; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; +import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; +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; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; @@ -119,6 +125,12 @@ public class ScmVehicleExamineService extends MybatisBaseService createQueryWrapper(ScmVehicleExamineQuery query) { @@ -186,6 +198,36 @@ public class ScmVehicleExamineService extends MybatisBaseService factoryImages = new ArrayList<>(); List 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); + } + } if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(vo.getPurchaseKey())) { vo.setEditVin(true); } else { @@ -351,7 +423,36 @@ public class ScmVehicleExamineService extends MybatisBaseService 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); + } + } List scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid); List inspectionItemVos = new ArrayList<>(); for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {