修改收车推送车辆台账推送的采购系统code

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;
 }

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;*/
 }

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<BaseAccadjApplyMa
                             SysOrganizationVo vo = sysOrganizationVoResultBean1.getData();
                             if (vo != null) {
                                 bdSupplier.setFName(vo.getName());
-                                bdSupplier.setFLocMobile(vo.getLinkPhone());
+                                bdSupplier.setFLocMobile("13333333333");
                                 bdSupplier.setFNumber(vo.getOtherCode());
                             }
                         }
@@ -683,7 +683,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 /**
                  * 批号:FLot
                  */
-                fe.setFlot(baseVehicle.getVinNo());
+                fe.setFlot(fe.getFMaterialID());
                 /**
                  * 货主:FOwnerID  (必填项)
                  */

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -85,7 +85,9 @@
         bm.region,
         bm.province,
         bm.city,
-        bm.county
+        bm.county,
+        bm.createOrg,
+        bm.useOrg
         FROM base_manufacturer bm
         WHERE bm.sid = #{sid}
     </select>

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<BaseVehicleOutMapp
             bdEmpinfo.setFNumber(sysStaffinfoDetailsVo.getJobNumber());
             bdEmpinfo.setFAddress(sysStaffinfoDetailsVo.getAddress());
             bdEmpinfo.setFCreateOrgId(sysOrganizationVo.getOrgCode());
-            bdEmpinfo.setFMobile(sysOrganizationVo.getLinkPhone());
+            bdEmpinfo.setFMobile(sysStaffinfoDetailsVo.getMobile());
             bdEmpinfo.setFUseOrgId(sysOrganizationVo.getOrgCode());
             finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
         } catch (Exception e) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkInstockNumber/FinStkInstockNumberMapper.xml

@@ -6,7 +6,7 @@
         select * from fin_stkInstock_number
         where 1=1
         <if test="fMaterialId!=null">
-            and fMaterialId=#{fMaterialId}
+            and fMaterialId like concat('%',#{fMaterialId},'%')
         </if>
         <if test="useOrgSid!=null">
             and useOrgSid=#{useOrgSid}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -202,7 +202,7 @@
     </select>
 
     <select id="selectOrgSidList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
-        select sid,name from sys_organization so where so.isDept = 0
+        select sid,name,orgCode from sys_organization so where so.isDept = 0
     </select>
 
     <select id="getListDeptByOrgSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgVo">

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java

@@ -16,6 +16,9 @@ public class AppScmVehicleExamineDetailsVo implements Vo {
     @ApiModelProperty("订单类型")
     private String type;
 
+    @ApiModelProperty("订单类型key")
+    private String purchaseTypeKey;
+
     @ApiModelProperty("车型")
     private String model;
 
@@ -71,4 +74,10 @@ public class AppScmVehicleExamineDetailsVo implements Vo {
 
     @ApiModelProperty("发动机号")
     private String engineNo;
+
+    @ApiModelProperty("外采 排产 调车 sid")
+    private String businessSid;
+
+    @ApiModelProperty("供应商名称")
+    private String manufacturerName; // 供应商名称
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@@ -74,4 +74,9 @@ public class AppScmVehicleExamineInfoVo implements Vo {
 
     private String orgPath;
 
+    @ApiModelProperty("外采 排产 调车 sid")
+    private String businessSid;
+
+    @ApiModelProperty("供应商名称")
+    private String manufacturerName; // 供应商名称
 }

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

@@ -62,6 +62,9 @@ public class ScmVehicleExaminePageVo implements Vo {
     @ApiModelProperty("采购订单类型（外采，内购，排产）")
     private String purchaseType;
 
+    @ApiModelProperty("采购订单类型（外采，内购，排产）key")
+    private String purchaseTypeKey;
+
     @ApiModelProperty("验车人")
     private String inspectedName;
 
@@ -74,4 +77,9 @@ public class ScmVehicleExaminePageVo implements Vo {
     @ApiModelProperty("是否验车 未验车 1 以验车2")
     private String inspectedType;
 
+    @ApiModelProperty("供应商名称")
+    private String manufacturerName; // 供应商名称
+
+    @ApiModelProperty("外采 排产 调车 sid")
+    private String businessSid;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -511,6 +511,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     if (baseVehicle.getDepartureDate() != null){
                         baseVehicleDto.setDepartureDate(new SimpleDateFormat("yyyy-MM-dd").format(baseVehicle.getDepartureDate()));
                     }
+                    baseVehicleDto.setVehMark(baseVehicle.getVehMark());
                     baseVehicleDto.setInsideCode(baseVehicle.getInsideCode());
                     baseVehicleDto.setCostPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                     baseVehicleDto.setVinNo(scmVehicleEnterlibrary.getVinNo());

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

@@ -62,6 +62,7 @@
                modelSid,
                configSid,
                engineNo,
+               businessSid,
                 sve.useOrgSid as orgPath
         FROM scm_vehicle_examine sve
         WHERE sve.sid = #{inspectedSid}
@@ -71,6 +72,7 @@
             resultType="com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDetailsVo">
         SELECT sve.vinNo            as vin,
                sve.purchaseType     as type,
+               sve.purchaseTypeKey,
                sve.modelName        as model,
                sve.configName       as config,
                sve.departureDate    as dispatchedDate,
@@ -86,7 +88,8 @@
                sve.inboundDate,
                sve.modelSid,
                sve.configSid,
-               sve.engineNo
+               sve.engineNo,
+               sve.businessSid
         FROM scm_vehicle_examine sve
         WHERE sve.sid = #{inspectedSid}
     </select>
@@ -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

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<ScmVehicleExami
 
     @Autowired
     BaseManufacturerFeign baseManufacturerFeign;
+    @Autowired
+    private BusVehicleApplyFeign busVehicleApplyFeign;
+    @Autowired
+    private BaseInternalPurchaseFeign baseInternalPurchaseFeign;
+    @Autowired
+    private BaseVehicleBrandFeign baseVehicleBrandFeign;
 
 
     private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
@@ -186,6 +198,36 @@ 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);
+                }
+            }
         }
         return iPage;
     }
@@ -289,6 +331,36 @@ 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);
+            }
+        }
         if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(vo.getPurchaseKey())) {
             vo.setEditVin(true);
         } else {
@@ -351,7 +423,36 @@ 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);
+            }
+        }
         List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
         List<AppScmInspectionItemVo> inspectionItemVos = new ArrayList<>();
         for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {