调车推送金蝶出库单和入库单

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyToJDRu.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseaccadjapply;
+
+
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(调账管理) <br/>
+ * File: BaseAccadjApplyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo <br/>
+ * Description: 调账申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-07 16:57:24 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "调账申请表 视图数据对象", description = "调账申请表 视图数据对象")
+public class BaseAccadjApplyToJDRu implements Vo {
+
+	@ApiModelProperty("采购部门sid")
+    private String callInBuyerOrgSid; // 采购部门sid
+    @ApiModelProperty("调车车辆列表")
+    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles;//调车车辆列表
+    @ApiModelProperty("车辆台账列表")
+    private List<BaseVehicle> baseVehicles;//车辆台账列表
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java

@@ -82,4 +82,12 @@ public class BaseInternalPurchase extends BaseEntity {
     private String procInstId;
     @ApiModelProperty("任务id")
     private String taskId;
+    @ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("调入方采购部门sid")
+    private String callInBuyerOrgSid; // 调入方采购部门sid
+    @ApiModelProperty("调入方采购部门名称")
+    private String callInBuyerOrgName; // 调入方采购部门名称
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java

@@ -94,6 +94,14 @@ public class BaseInternalPurchaseDetailsVo implements Vo {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
+    @ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("调入方采购部门sid")
+    private String callInBuyerOrgSid; // 调入方采购部门sid
+    @ApiModelProperty("调入方采购部门名称")
+    private String callInBuyerOrgName; // 调入方采购部门名称
     @ApiModelProperty("内购车辆列表")
     private List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicles; // 内购车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java

@@ -78,6 +78,14 @@ public class BaseInternalPurchaseDto implements Dto {
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("调入方采购部门sid")
+    private String callInBuyerOrgSid; // 调入方采购部门sid
+    @ApiModelProperty("调入方采购部门名称")
+    private String callInBuyerOrgName; // 调入方采购部门名称
     @ApiModelProperty("内购车辆列表")
     private List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles; // 内购车辆列表
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java

@@ -94,4 +94,8 @@ public class BaseInternalPurchaseVehicle extends BaseEntity {
     private String recallStateValue; // 调回状态value
     @ApiModelProperty("厂家结算价")
     private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("调入方采购部门sid")
+    private String callInBuyerOrgSid; // 调入方采购部门sid
+    @ApiModelProperty("调入方采购部门名称")
+    private String callInBuyerOrgName; // 调入方采购部门名称
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java

@@ -109,4 +109,8 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo {
     private String recallStateValue; // 调回状态value
     @ApiModelProperty("厂家结算价")
     private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("调入方采购部门sid")
+    private String callInBuyerOrgSid; // 调入方采购部门sid
+    @ApiModelProperty("调入方采购部门名称")
+    private String callInBuyerOrgName; // 调入方采购部门名称
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java

@@ -97,4 +97,8 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
     private String recallStateValue; // 调回状态value
     @ApiModelProperty("厂家结算价")
     private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("调入方采购部门sid")
+    private String callInBuyerOrgSid; // 调入方采购部门sid
+    @ApiModelProperty("调入方采购部门名称")
+    private String callInBuyerOrgName; // 调入方采购部门名称
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java

@@ -99,4 +99,8 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
     private String recallStateValue; // 调回状态value
     @ApiModelProperty("厂家结算价")
     private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("调入方采购部门sid")
+    private String callInBuyerOrgSid; // 调入方采购部门sid
+    @ApiModelProperty("调入方采购部门名称")
+    private String callInBuyerOrgName; // 调入方采购部门名称
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -39,9 +39,16 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
 import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
 import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
+import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
+import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.common.enums.VehicleState;
@@ -118,6 +125,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
     private ScmWarehouseFeign scmWarehouseFeign;
     @Autowired
     private BaseVehicleBrandService baseVehicleBrandService;
+    @Autowired
+    private BaseManufacturerService baseManufacturerService;
+    @Autowired
+    private BaseManufacturerBankService baseManufacturerBankService;
+
     private QueryWrapper<BaseAccadjApply> createQueryWrapper(BaseAccadjApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -427,12 +439,20 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
                 }
                 try {
-                    List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+                    //关联查询调车车辆列表中的采购部门sid
-                    List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles1 = new ArrayList<>();
+                    List<String> stringList = baseAccadjApplyeVehService.fetchCallInBuyerOrgSidByMainSid(baseAccadjApply.getSid());
+                    List<BaseAccadjApplyToJDRu> baseAccadjApplyToJDRus = new ArrayList<>();
                     for (String s : stringList) {
-                        BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+                        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicleList = baseInternalPurchaseVehicleService.fetchByAccSidAndCallInBuyerOrgSid(baseAccadjApply.getSid(), s);
-                        baseInternalPurchaseVehicles1.add(baseInternalPurchaseVehicle);
+                        BaseAccadjApplyToJDRu baseAccadjApplyToJDRu = new BaseAccadjApplyToJDRu();
+                        baseAccadjApplyToJDRu.setCallInBuyerOrgSid(s);
+                        baseAccadjApplyToJDRu.setBaseInternalPurchaseVehicles(baseInternalPurchaseVehicleList);
+                        baseAccadjApplyToJDRus.add(baseAccadjApplyToJDRu);
                     }
+                    //推送金蝶销售出库单
+                    SalOutStock salOutStock = createSalOutStock(baseAccadjApply);
+                    finKingDeeFeign.draftSalOutStock(salOutStock);
+                    for (BaseAccadjApplyToJDRu baseAccadjApplyToJDRu : baseAccadjApplyToJDRus) {
                         //推送金蝶采购入库单
                         StkInStock stkInStock = new StkInStock();
                         /**
@@ -442,14 +462,10 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         /**
                          *   // 采购部门:FPurchaseDeptId  (必填项)
                          */
-                    /*ResultBean<SysOrganizationVo> pcResubean = sysOrganizationFeign.fetchBySid(baseVehicle.getPurchaseSystemSid());
+                        String callInBuyerOrgSid = baseAccadjApplyToJDRu.getCallInBuyerOrgSid();
-                    if (pcResubean.getSuccess()) {
+                        SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
-                        SysOrganizationVo vo = pcResubean.getData();
+                        stkInStock.setFPurchaseDeptId(data.getOtherCode());
-                        if (vo != null) {
+                        //stkInStock.setFPurchaseDeptId("05.04");
-                            stkInStock.setFPurchaseDeptId(vo.getOrgCode());
-                        }
-                    }*/
-                    stkInStock.setFPurchaseDeptId("05.04");
                         /**
                          *  //采购组织:FPurchaseOrgId  (必填项)
                          */
@@ -469,12 +485,20 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         /**
                          * // 供应商:FSupplierId  (必填项)
                          */
-                    stkInStock.setFSupplierId("010001");//TODO
+                        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles2 = baseAccadjApplyToJDRu.getBaseInternalPurchaseVehicles();
+                        String vinNo = baseInternalPurchaseVehicles2.get(0).getVinNo();
+                        BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
+                        if (baseVehicle != null) {
+                            String supplierSid = baseVehicle.getSupplierSid();
+                            BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(supplierSid);
+                            stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode());
+                        }
+                        //stkInStock.setFSupplierId("010001");
                         /**
                          * // 物料列表:FInStockEntry  (必填项)
                          */
                         List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
-                    for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles1) {
+                        for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
                             StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
                             /**
                              * 单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
@@ -483,11 +507,14 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             /**
                              * 车辆类型
                              */
-                        sf.setCllx("03");//TODO
+                            BaseVehicle baseVehicle2 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
+                            String manufacturerSid = baseVehicle2.getManufacturerSid();
+                            String s = baseManufacturerBankService.fetchByMainSidAndManufSaleAccessName(manufacturerSid, baseVehicle2.getManufSaleAccessName());
+                            sf.setCllx(s);//TODO
                             /**
                              * 车辆类型
                              */
-                        sf.setCllxType("03");
+                            sf.setCllxType(s);
                             /**
                              *   //  批号:FLot
                              */
@@ -499,14 +526,13 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             /**
                              *   //  仓库:FStockId
                              */
-                        ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseInternalPurchaseVehicle.getInventoryLocationSid());
+                            BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
-                        if(voResultBean.getSuccess()){
                             //fe.setFStockID(voResultBean.getData().getGressionCode());
-                            sf.setFStockId(voResultBean.getData().getGressionCode());
+                            String location = baseVehicle1.getLocation();
+                            ScmWarehouseVo data1 = scmWarehouseFeign.fetchBySid(location).getData();
+                            sf.setFStockId(data1.getGressionCode());
                             // fe.setFStockID("CK001");
                             //fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
-                        }
-
                             /**
                              * 物料分组
                              */
@@ -523,9 +549,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         }
                         stkInStock.setFInStockEntry(fInStockEntry);
                         finKingDeeFeign.draftStkInStock(stkInStock);
-                    //推送金蝶销售出库单
+                    }
-                    SalOutStock salOutStock = createSalOutStock(baseAccadjApply);
-                    finKingDeeFeign.draftSalOutStock(salOutStock);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -540,12 +564,18 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         SalOutStock salOutStock = new SalOutStock();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = new Date();
-        List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+        List<String> stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(),baseAccadjApply.getCallOutOrgSid());
-        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
+        List<BaseAccadjApplyToJDRu> baseAccadjApplyToJDRus = new ArrayList<>();
         for (String s : stringList) {
-            BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+            List<BaseVehicle> baseVehicles = baseInternalPurchaseVehicleService.fetchByAccSidAndPurchaseSystemSid(baseAccadjApply.getSid(), s);
-            baseInternalPurchaseVehicles.add(baseInternalPurchaseVehicle);
+            BaseAccadjApplyToJDRu baseAccadjApplyToJDRu = new BaseAccadjApplyToJDRu();
-        }
+            baseAccadjApplyToJDRu.setCallInBuyerOrgSid(s);
+            baseAccadjApplyToJDRu.setBaseVehicles(baseVehicles);
+            baseAccadjApplyToJDRus.add(baseAccadjApplyToJDRu);
+        }
+        for (BaseAccadjApplyToJDRu accadjApplyToJDRus : baseAccadjApplyToJDRus) {
+            String callInBuyerOrgSid = accadjApplyToJDRus.getCallInBuyerOrgSid();
+            List<BaseVehicle> baseVehicles = accadjApplyToJDRus.getBaseVehicles();
             /**
              * 日期:FDate  (必填项)
              */
@@ -571,7 +601,10 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             /**
              * 客户:FCustomerID  (必填项)
              */
-        salOutStock.setFCustomerID(" JXYXB");
+            String callInOrgSid = baseAccadjApply.getCallInOrgSid();
+            SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInOrgSid).getData();
+            salOutStock.setFCustomerID(data.getOtherCode());
+            //salOutStock.setFCustomerID(" JXYXB");
             /**
              * 销售部门:FSaleDeptID  (必填项)
              */
@@ -590,16 +623,16 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             //salOutStock.setFStockOrgId("101");
 
             List<SalOutStock.FEntity> fEntity = new ArrayList<>();
-        for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
+            for (BaseVehicle baseVehicle : baseVehicles) {
                 SalOutStock.FEntity fe = new SalOutStock.FEntity();
                 /**
                  * 单价:FPrice
                  */
-            fe.setFPrice(baseInternalPurchaseVehicle.getWitPinMoney());
+                fe.setFPrice(String.valueOf(baseVehicle.getSalePrice()));
                 /**
                  * 物料编码:FMaterialID
                  */
-            fe.setFMaterialID(baseInternalPurchaseVehicle.getVinNo());
+                fe.setFMaterialID(baseVehicle.getVinNo());
                 /**
                  * 库存单位:FUnitID  (必填项)
                  */
@@ -611,7 +644,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 /**
                  * 批号:FLot
                  */
-            fe.setFlot(baseInternalPurchaseVehicle.getVinNo());
+                fe.setFlot(baseVehicle.getVinNo());
                 /**
                  * 货主:FOwnerID  (必填项)
                  */
@@ -619,7 +652,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 /**
                  * 仓库:FStockID
                  */
-            ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseInternalPurchaseVehicle.getInventoryLocationSid());
+                ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation());
                 if (voResultBean.getSuccess()) {
                     fe.setFStockID(voResultBean.getData().getGressionCode());
                     // fe.setFStockID("CK001");
@@ -632,6 +665,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 fEntity.add(fe);
             }
             salOutStock.setFEntity(fEntity);
+        }
         return salOutStock;
     }
 
@@ -686,6 +720,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
             List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
             List<String> candidateGroups = voList.get(0).getCandidateGroups();
+            if (candidateGroups != null) {
                 UserRoleQuery userRoleQuery = new UserRoleQuery();
                 userRoleQuery.setRoleSid(candidateGroups.get(0));
                 userRoleQuery.setOrgSid(callInOrgSid);
@@ -700,6 +735,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
                 bv.setNextNodeUserSids(substring);
             }
+        }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java

@@ -69,4 +69,8 @@ public interface BaseAccadjApplyeVehMapper extends BaseMapper<BaseAccadjApplyeVe
 
 	@Select("select purchaseSid from base_accadj_applye_veh where accadjSid = #{sid1}")
 	List<String> fetchByMainSid(String sid1);
+
+	List<String> fetchCallInBuyerOrgSidByMainSid(String sid);
+
+	List<String> fetchByAccSidAndCallOutOrgSid(@Param("sid") String sid,@Param("callOutOrgSid") String callOutOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml

@@ -4,10 +4,41 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehVo">
-		SELECT * FROM base_accadj_applye_veh <where> ${ew.sqlSegment} </where>
+        SELECT * FROM base_accadj_applye_veh
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehVo">
-		SELECT * FROM base_accadj_applye_veh <where> ${ew.sqlSegment} </where>
+        SELECT * FROM base_accadj_applye_veh
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="fetchCallInBuyerOrgSidByMainSid" resultType="java.lang.String">
+        SELECT bipv.`callInBuyerOrgSid`
+        FROM base_internal_purchase_vehicle bipv
+                     LEFT JOIN base_accadj_applye_veh baav
+                ON bipv.`sid` = baav.`purchaseSid`
+                     LEFT JOIN base_accadj_apply baa
+                ON baa.`sid` = baav.`accadjSid`
+        WHERE baa.`sid` = #{sid}
+        GROUP BY bipv.`callInBuyerOrgSid`
+    </select>
+
+    <select id="fetchByAccSidAndCallOutOrgSid" resultType="java.lang.String">
+        SELECT bv.`purchaseSystemSid`
+        FROM base_internal_purchase_vehicle bipv
+                     LEFT JOIN base_accadj_applye_veh baav
+                ON bipv.`sid` = baav.`purchaseSid`
+                     LEFT JOIN base_accadj_apply baa
+                ON baa.`sid` = baav.`accadjSid`
+                     LEFT JOIN base_vehicle bv
+                ON bv.`vinNo` = bipv.`vinNo`
+        WHERE baa.`sid` = #{sid}
+          AND bv.`createOrgSid` = #{callOutOrgSid}
+        GROUP BY bv.`purchaseSystemSid`
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java

@@ -115,4 +115,12 @@ public class BaseAccadjApplyeVehService extends MybatisBaseService<BaseAccadjApp
 	public List<String> fetchByMainSid(String sid1) {
 		return baseMapper.fetchByMainSid(sid1);
 	}
+
+	public List<String> fetchCallInBuyerOrgSidByMainSid(String sid) {
+		return baseMapper.fetchCallInBuyerOrgSidByMainSid(sid);
+	}
+
+	public List<String> fetchByAccSidAndCallOutOrgSid(String sid, String callOutOrgSid) {
+		return baseMapper.fetchByAccSidAndCallOutOrgSid(sid,callOutOrgSid);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -240,6 +240,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 baseInternalPurchaseVehicle1.setIsAccadj("0");
                 baseInternalPurchaseVehicle1.setIsInvoicing("0");
                 baseInternalPurchaseVehicle1.setInitialWitPinMoney(baseInternalPurchaseVehicle1.getWitPinMoney());
+                baseInternalPurchaseVehicle1.setCallInBuyerOrgSid(baseInternalPurchase.getCallInBuyerOrgSid());
+                baseInternalPurchaseVehicle1.setCallInBuyerOrgName(baseInternalPurchase.getCallInBuyerOrgName());
                 baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
             }
             return rb.success().setMsg("保存成功").setData(baseInternalPurchase.getSid());
@@ -491,6 +493,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     //验车推送数据
                     ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
                     scmEntryVehicleExamineDto.setBusinessSid(booad.getSid());
+                    //发动机号
+                    BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
+                    scmEntryVehicleExamineDto.setEngineNo(baseVehicle1.getEngineNo());
                     //配置的名称
                     scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
                     scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java

@@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingListVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
 import org.apache.ibatis.annotations.*;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo;
@@ -84,4 +86,8 @@ public interface BaseInternalPurchaseVehicleMapper extends BaseMapper<BaseIntern
 
 	@Update("update base_internal_purchase_vehicle set witPinMoney = #{witPinMoney} where sid = #{sid}")
     void updateWitPinMoneyBySid(@Param("witPinMoney") String witPinMoney,@Param("sid") String sid);
+
+    List<BaseInternalPurchaseVehicle> fetchByAccSidAndCallInBuyerOrgSid(@Param("sid") String sid,@Param("s") String s);
+
+	List<BaseVehicle> fetchByAccSidAndPurchaseSystemSid(@Param("sid") String sid, @Param("s") String s);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml

@@ -3,12 +3,20 @@
 <mapper namespace="com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo">
+    <select id="selectPageVo"
-		SELECT * FROM base_internal_purchase_vehicle <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo">
+        SELECT * FROM base_internal_purchase_vehicle
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo">
+    <select id="selectListAllVo"
-		SELECT * FROM base_internal_purchase_vehicle <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo">
+        SELECT * FROM base_internal_purchase_vehicle
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="getListBySid" resultType="com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingListVo">
@@ -25,6 +33,30 @@
                sid
         from base_internal_purchase_vehicle
         where mainSid = #{sid}
+    </select>
+
+    <select id="fetchByAccSidAndCallInBuyerOrgSid"
+            resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle">
+        SELECT bipv.*
+        FROM base_internal_purchase_vehicle bipv
+                     LEFT JOIN base_accadj_applye_veh baav
+                ON bipv.`sid` = baav.`purchaseSid`
+                     LEFT JOIN base_accadj_apply baa
+                ON baa.`sid` = baav.`accadjSid`
+        WHERE baa.`sid` = #{sid}
+          AND bipv.callInBuyerOrgSid = #{s}
+    </select>
 
+    <select id="fetchByAccSidAndPurchaseSystemSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
+        SELECT bv.*
+        FROM base_internal_purchase_vehicle bipv
+                     LEFT JOIN base_accadj_applye_veh baav
+                ON bipv.`sid` = baav.`purchaseSid`
+                     LEFT JOIN base_accadj_apply baa
+                ON baa.`sid` = baav.`accadjSid`
+                     LEFT JOIN base_vehicle bv
+                ON bv.`vinNo` = bipv.`vinNo`
+        WHERE baa.`sid` = #{sid}
+          AND bv.`purchaseSystemSid` = #{s}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingListVo;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.*;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -133,4 +134,12 @@ public class BaseInternalPurchaseVehicleService extends MybatisBaseService<BaseI
 	public void updateWitPinMoneyBySid(String witPinMoney,String sid) {
 		baseMapper.updateWitPinMoneyBySid(witPinMoney,sid);
 	}
+
+	public List<BaseInternalPurchaseVehicle> fetchByAccSidAndCallInBuyerOrgSid(String sid, String s) {
+		return baseMapper.fetchByAccSidAndCallInBuyerOrgSid(sid,s);
+	}
+
+	public List<BaseVehicle> fetchByAccSidAndPurchaseSystemSid(String sid, String s) {
+		return baseMapper.fetchByAccSidAndPurchaseSystemSid(sid,s);
+	}
 }

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

@@ -636,4 +636,5 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         BaseOutManuVo vo = baseMapper.getManDetails(modelSid);
         return rb.success().setData(vo);
     }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@@ -67,4 +67,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
     List<BusApplyVo> selectBankByApplySid(String createOrgSid);
 
     List<BaseManPayVo> payList(@Param("supplierTypeValue") String supplierTypeValue, @Param("code") String code);
+
+    String fetchByMainSidAndManufSaleAccessName(@Param("manufacturerSid") String manufacturerSid,@Param("manufSaleAccessName") String manufSaleAccessName);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -70,7 +70,9 @@
                      left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
                      left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
         where bvm.sid = #{modelSid}
-          and bmb.dueBankValue = '订金账户' and bmb.isDelete = 0 AND BM.isDelete = 0
+          and bmb.dueBankValue = '订金账户'
+          and bmb.isDelete = 0
+          AND BM.isDelete = 0
     </select>
 
     <select id="actualList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo">
@@ -91,7 +93,9 @@
         from base_manufacturer bm
                      left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
         where bm.createOrg = #{createOrgSid}
-          and dueBankValue = '订金账户' and bmb.isDelete = 0 AND BM.isDelete = 0
+          and dueBankValue = '订金账户'
+          and bmb.isDelete = 0
+          AND BM.isDelete = 0
     </select>
 
     <select id="payList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo">
@@ -105,4 +109,11 @@
           AND bm.supplierTypeValue = #{supplierTypeValue}
           and bmb.dueBankKey = #{code}
     </select>
+
+    <select id="fetchByMainSidAndManufSaleAccessName" resultType="java.lang.String">
+        SELECT actualPayKey
+        FROM base_manufacturer_bank
+        WHERE manufacturerSid = #{manufacturerSid}
+          AND actualPay = #{manufSaleAccessName}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@@ -82,4 +82,8 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
     public List<BaseManPayVo> payList(String supplierTypeValue, String code) {
         return baseMapper.payList(supplierTypeValue,code);
     }
+
+    public String fetchByMainSidAndManufSaleAccessName(String manufacturerSid, String manufSaleAccessName) {
+        return baseMapper.fetchByMainSidAndManufSaleAccessName(manufacturerSid,manufSaleAccessName);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -677,7 +677,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         }
         //金额
         if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {
-            finPaymentrecordDto.setCost(booad.getPurchasePrice().intValue());
+            int price = booad.getPurchasePrice().intValue();
+            Integer num = booad.getNum();
+            finPaymentrecordDto.setCost(price * num - booad.getDeposit().intValue());
         } else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
             finPaymentrecordDto.setCost(booad.getDeposit().intValue());
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -396,6 +396,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
             for (BaseVehicleDto baseVehicleDto : dto) {
                 StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
+                /**
+                 * 物料分组
+                 */
+                BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid());
+                if (baseVehicleBrand != null) {
+                    sf.setWlfz(baseVehicleBrand.getBrandCode());
+                }
                 /**
                  * 单价   对应厂家结算价
                  */
@@ -415,6 +422,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
                      */
                     sf.setCllx("60");
                     sf.setCllxType("sellChannel");
+                    sf.setWlfz("99.01");
                 }
 //                sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中  规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。
 //                sf.setCllxType("03");
@@ -440,13 +448,6 @@ public class BaseVehicleRest implements BaseVehicleFeign {
                     }
                 }
 
-                /**
-                 * 物料分组
-                 */
-                BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid());
-                if (baseVehicleBrand != null) {
-                    sf.setWlfz(baseVehicleBrand.getBrandCode());
-                }
 //                sf.setWlfz("01");
                 /**
                  * 物料分组

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1629,14 +1629,12 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private QueryWrapper<BaseVehicle> vehiclePurchaseWrapper(BaseVehiclePurchaseQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
+            //品牌
+            qw.eq("bvm.carBrand", params.getBrandSid());
             if (StringUtils.isNotBlank(params.getUserSid())) {
                 String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
                 qw.eq("bv.useOrgSid", orgSid);
             }
-            //品牌
-            if (StringUtils.isNotBlank(params.getBrandSid())) {
-                qw.eq("bvm.carBrand", params.getBrandSid());
-            }
             //功能
             if (StringUtils.isNotBlank(params.getVehicleType())) {
                 qw.eq("bvm.vehicleType", params.getVehicleType());

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -30,7 +30,7 @@ public enum ProcDefEnum {
     FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
     FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
     BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
-    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:567508"),
+    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:687504"),
     BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"),

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -100,6 +100,16 @@ public interface SysOrganizationFeign {
     @GetMapping("/getListOrgByBrand/{orgSid}")
     ResultBean<List<SysOrgVo>> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid);
 
+    @ApiOperation("获取指定品牌下分公司")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid);
+
+    @ApiOperation("获取指定分公司下部门信息")
+    @ResponseBody
+    @GetMapping("/getListDeptByOrgSid/{orgSid}")
+    ResultBean<List<SysOrgVo>> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid);
+
     @ApiOperation("根据业务员sid获取到分公司")
     @ResponseBody
     @GetMapping("/getUseOrgByUserSid")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -108,6 +108,16 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrandSid(String orgSid, String brandSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<SysOrganizationVo> getUseOrgByUserSid(String staffSid) {
         return null;

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

@@ -116,4 +116,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
 
     @Select("select * from sys_organization where orgSidPath = #{orgSidPath}")
     SysOrganizationVo selectByOrgSidPath(String orgSidPath);
+
+    List<SysOrgVo> getListDeptByOrgSid(String orgSid);
 }

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

@@ -204,4 +204,11 @@
     <select id="selectOrgSidList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
         select sid,name from sys_organization so where so.isDept = 0
     </select>
+
+    <select id="getListDeptByOrgSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 1
+          AND so.psid = #{orgSid}
+    </select>
 </mapper>

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

@@ -278,6 +278,16 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return sysOrganizationService.getListOrgByBrand(orgSid);
     }
 
+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrandSid(String orgSid, String brandSid) {
+        return sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid);
+    }
+
+    @Override
+    public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
+        return sysOrganizationService.getListDeptByOrgSid(orgSid);
+    }
+
     @Override
     public ResultBean<SysOrganizationVo> getUseOrgByUserSid(String userSid) {
         ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();

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

@@ -378,6 +378,27 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return rb.success().setData(list);
     }
 
+    public ResultBean<List<SysOrgVo>> getListOrgByBrandSid(String orgSid, String brandSid) {
+        ResultBean<List<SysOrgVo>> rb = ResultBean.fireFail();
+        BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(brandSid);
+        List<String> orgSids = new ArrayList<>();
+        List<SysOrgVo> list = new ArrayList<>();
+        String useOrg = baseVehicleBrand.getUseOrg();
+        if (StringUtils.isNotBlank(useOrg)) {
+            String[] orgSidss = useOrg.split(",");
+            for (String sidss : orgSidss) {
+                if (!orgSids.contains(sidss)) {
+                    if (!orgSid.equals(sidss)) {
+                        orgSids.add(sidss);
+                        SysOrgVo sysOrgVo = baseMapper.getListOrgByBrand(sidss);
+                        list.add(sysOrgVo);
+                    }
+                }
+            }
+        }
+        return rb.success().setData(list);
+    }
+
     public SysOrganization selectOrgCodeByPsid() {
         return baseMapper.selectOrgCodeByPsid();
     }
@@ -525,4 +546,10 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         SysOrganizationVo sysOrganizationVo = baseMapper.selectByOrgSidPath(orgSidPath);
         return rb.success().setData(sysOrganizationVo);
     }
+
+    public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
+        ResultBean<List<SysOrgVo>> rb = ResultBean.fireFail();
+        List<SysOrgVo> sysOrgVos = baseMapper.getListDeptByOrgSid(orgSid);
+        return rb.success().setData(sysOrgVos);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -39,10 +39,12 @@ import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
 import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehicleexamine.ScmVehicleExamineService;
 import com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemService;
+import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -106,6 +108,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     private BaseVehicleBrandFeign baseVehicleBrandFeign;
     @Autowired
     private BaseManufacturerFeign baseManufacturerFeign;
+    @Autowired
+    private ScmWarehouseService scmWarehouseService;
 
     public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
         ScmApplyInboundQuery query = pq.getParams();
@@ -552,8 +556,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             baseVehicleDto.setManPurOrderTypeKey(booad.getManPurOrderTypeKey());
             baseVehicleDto.setManPurOrderTypeValue(booad.getManPurOrderTypeValue());
             //存放地点
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseService.selectByGressionCode(booad.getUseOrgSid());
+            if (scmWarehouseVo == null){
                 baseVehicleDto.setLocation("");
                 baseVehicleDto.setLocationName("");
+            }else {
+                baseVehicleDto.setLocation(scmWarehouseVo.getSid());
+                baseVehicleDto.setLocationName(scmWarehouseVo.getWarehouseName());
+            }
             //品牌
             BaseVehicleModel data = baseVehicleModelFeign.selectDetails(s.getModelSid()).getData();
             baseVehicleDto.setCarBrandSid(data.getCarBrand());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java

@@ -72,4 +72,7 @@ public interface ScmWarehouseMapper extends BaseMapper<ScmWarehouse> {
 
     @Select("select * from scm_warehouse where sid =#{addressSid}")
     ScmWarehouseVo selectByAddressSid(@Param("addressSid") String addressSid);
+
+    @Select("select * from scm_warehouse where gressionCode = 'ARZTCK' AND useOrgSid = #{useOrgSid}")
+    ScmWarehouseVo selectByGressionCode(String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -156,4 +156,8 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         ScmWarehouseVo scmWarehouseVo = baseMapper.selectByAddressSid(addressSid);
         return rb.success().setData(scmWarehouseVo);
     }
+
+    public ScmWarehouseVo selectByGressionCode(String useOrgSid) {
+        return baseMapper.selectByGressionCode(useOrgSid);
+    }
 }