Merge remote-tracking branch 'origin/master'

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/basedistributor/app/BaseDistributorsListQuery.java

@@ -17,4 +17,7 @@ public class BaseDistributorsListQuery implements Query {
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java

@@ -17,5 +17,8 @@ public class BaseDistributorsQuery implements Query {
     @ApiModelProperty(value = "用户sid")
     private String userSid;
 
+    @ApiModelProperty("机构sid")
+    private String orgPath;
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Author dimengzhe
  * @Date 2022/7/15 10:37
@@ -69,4 +71,10 @@ public class BaseInfoDto implements Dto {
 
     @ApiModelProperty(value = "经销商sid")
     private String distributorSid;
+
+    @ApiModelProperty("用户sid")
+    @NotBlank(message = "用户sid不能为空")
+    private String userSid;
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 }

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-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -190,4 +190,10 @@ public interface BaseManufacturerFeign {
     @GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}")
     @ResponseBody
     ResultBean<String> selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid);
+
+    @ApiOperation("根据车型sid查询品牌、厂商等信息")
+    @GetMapping("/getManDetails/{modelSid}")
+    @ResponseBody
+    ResultBean<BaseOutManuVo> getManDetails(@PathVariable("modelSid")String modelSid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -115,4 +115,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
     public ResultBean<String> selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<BaseOutManuVo> getManDetails(String modelSid) {
+        return null;
+    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseOutManuVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/19 16:28
+ * @Description
+ */
+@Data
+public class BaseOutManuVo implements Vo {
+    private static final long serialVersionUID = 1493324794029065913L;
+    @ApiModelProperty("品牌sid")
+    private String brandSid;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("厂商sid")
+    private String manufacturerSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -126,4 +126,6 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
     private CommonAppendixVo contract; // 备注
     @ApiModelProperty("外采车辆列表")
     private List<BaseOutsourcingApplicationVehicleVo> baseOutsourcingApplicationVehicleVos; // 外采车辆列表
+
+    private String createBySid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java

@@ -145,4 +145,9 @@ public interface CommonAppendixFeign {
     @ApiOperation("根据文件相对路径查询文件名称")
     @PostMapping("/fetchByFilePath")
     ResultBean<CommonAppendixVo> fetchByFilePath(@RequestParam(value = "s") String s);
+
+    @ApiOperation(value = "根据业务sid和附件类型批量删除")
+    @PostMapping("/delFilesByLinkSidAndAttachType")
+    ResultBean delFilesByLinkSidAndAttachType(@RequestParam(value = "linkSid") String linkSid,@RequestParam(value = "attachType") String attachType);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java

@@ -167,4 +167,9 @@ public class CommonAppendixFeignFallback implements CommonAppendixFeign {
 	public ResultBean<CommonAppendixVo> fetchByFilePath(String s) {
 		return null;
 	}
+
+	@Override
+	public ResultBean delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+		return null;
+	}
 }

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()));
@@ -410,7 +422,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         if (formVariables == null) {
             map.put("isAdj", i);
             bv.setFormVariables(map);
-        }else {
+        } else {
             formVariables.put("isAdj", i);
         }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
@@ -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());
-                    List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles1 = new ArrayList<>();
+                    //关联查询调车车辆列表中的采购部门sid
+                    List<String> stringList = baseAccadjApplyeVehService.fetchCallInBuyerOrgSidByMainSid(baseAccadjApply.getSid());
+                    List<BaseAccadjApplyToJDRu> baseAccadjApplyToJDRus = new ArrayList<>();
                     for (String s : stringList) {
-                        BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
-                        baseInternalPurchaseVehicles1.add(baseInternalPurchaseVehicle);
+                        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicleList = baseInternalPurchaseVehicleService.fetchByAccSidAndCallInBuyerOrgSid(baseAccadjApply.getSid(), s);
+                        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());
-                    if (pcResubean.getSuccess()) {
-                        SysOrganizationVo vo = pcResubean.getData();
-                        if (vo != null) {
-                            stkInStock.setFPurchaseDeptId(vo.getOrgCode());
-                        }
-                    }*/
-                    stkInStock.setFPurchaseDeptId("05.04");
+                        String callInBuyerOrgSid = baseAccadjApplyToJDRu.getCallInBuyerOrgSid();
+                        SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
+                        stkInStock.setFPurchaseDeptId(data.getOtherCode());
+                        //stkInStock.setFPurchaseDeptId("05.04");
                         /**
                          *  //采购组织:FPurchaseOrgId  (必填项)
                          */
@@ -469,25 +485,36 @@ 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();
                             /**
                              * 单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
                              */
-                        sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice()+"");
+                            sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice() + "");
                             /**
                              * 车辆类型
                              */
-                        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());
-                        if(voResultBean.getSuccess()){
+                            BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
                             //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<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
+        List<String> stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(),baseAccadjApply.getCallOutOrgSid());
+        List<BaseAccadjApplyToJDRu> baseAccadjApplyToJDRus = new ArrayList<>();
         for (String s : stringList) {
-            BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
-            baseInternalPurchaseVehicles.add(baseInternalPurchaseVehicle);
-        }
+            List<BaseVehicle> baseVehicles = baseInternalPurchaseVehicleService.fetchByAccSidAndPurchaseSystemSid(baseAccadjApply.getSid(), s);
+            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,8 +652,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 /**
                  * 仓库:FStockID
                  */
-            ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseInternalPurchaseVehicle.getInventoryLocationSid());
-            if(voResultBean.getSuccess()){
+                ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation());
+                if (voResultBean.getSuccess()) {
                     fe.setFStockID(voResultBean.getData().getGressionCode());
                     // fe.setFStockID("CK001");
                     //fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
@@ -632,6 +665,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 fEntity.add(fe);
             }
             salOutStock.setFEntity(fEntity);
+        }
         return salOutStock;
     }
 
@@ -656,7 +690,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             if (formVariables == null) {
                 map.put("isAdj", i);
                 bv.setFormVariables(map);
-            }else {
+            } else {
                 formVariables.put("isAdj", i);
             }
             ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
@@ -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

@@ -1,13 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    <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/basedistributor/BaseDistributorMapper.xml

@@ -122,7 +122,7 @@
                case bd.state
                    when 1 then '未备案'
                    when 2 then '已备案' end             as state,
-               bd.pDistributorName,
+               if(length(bd.pDistributorName)>0,bd.pDistributorName,'无') as pDistributorName,
                bd.registNum,
                bd.registDetailAddress,
                bd.invoPhone,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -14,6 +14,8 @@ import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
 import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
 import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -59,6 +61,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private BaseDistributorAppendixService baseDistributorAppendixService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     /**
      * 经销商分页列表
@@ -512,11 +516,15 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             if (StringUtils.isNotBlank(params.getOrgName())) {
                 qw.like("disName", params.getOrgName());
             }
+            if (StringUtils.isNotBlank(params.getOrgPath())) {
+                qw.eq("useOrg", params.getOrgPath());
+            } else {
                 if (StringUtils.isNotBlank(params.getUserSid())) {
                     ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
                     qw.eq("useOrg", resultBean.getData());
                 }
             }
+        }
         IPage<BaseDistributorsListVo> pagging = baseMapper.getDistributorList(page, qw);
         PagerVo<BaseDistributorsListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
@@ -527,10 +535,14 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         BaseDistributorsQuery params = pagerQuery.getParams();
         QueryWrapper<BaseDistributor> qw = new QueryWrapper<>();
         if (params != null) {
+            if (StringUtils.isNotBlank(params.getOrgPath())) {
+                qw.eq("bd.useOrg", params.getOrgPath());
+            } else {
                 if (StringUtils.isNotBlank(params.getUserSid())) {
                     ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
                     qw.eq("bd.useOrg", resultBean.getData());
                 }
+            }
             if (StringUtils.isNotBlank(params.getName())) {
                 qw.like("bd.disName", params.getName());
             }
@@ -664,9 +676,24 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
     public ResultBean<String> saveDistributorBaseInfo(BaseInfoDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getDistributorSid();
+        String userSid = dto.getUserSid();
+        String orgPath = dto.getOrgPath();
         if (StringUtils.isBlank(sid)) {
             BaseDistributor baseDistributor = new BaseDistributor();
             BeanUtil.copyProperties(dto, baseDistributor, "sid");
+            baseDistributor.setCreateBySid(userSid);
+            if (StringUtils.isBlank(orgPath)) {
+                orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+            }
+            //查询机构信息
+            ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgPath);
+            if (resultBean.getSuccess()) {
+                SysOrganizationVo sysOrganizationVo = resultBean.getData();
+                baseDistributor.setCreateOrgName(sysOrganizationVo.getName());
+                baseDistributor.setUseOrgName(sysOrganizationVo.getName());
+            }
+            baseDistributor.setCreateOrg(orgPath);
+            baseDistributor.setUseOrg(orgPath);
             baseMapper.insert(baseDistributor);
             sid = baseDistributor.getSid();
 

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

@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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 * FROM base_internal_purchase_vehicle <where> ${ew.sqlSegment} </where>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            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 * FROM base_internal_purchase_vehicle <where> ${ew.sqlSegment} </where>
+    <select id="selectListAllVo"
+            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/BaseManufacturerMapper.java

@@ -135,4 +135,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
     List<BaseManufacturer> selectByMank(@Param("mankSid") String s, @Param("type") String type, @Param("orgSid") String orgSid);
 
     int updateMank(@Param("sid") String sid, @Param("name") String name, @Param("createName") String name1);
+
+    BaseOutManuVo getManDetails(String modelSid);
 }

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

@@ -298,4 +298,11 @@
             manufacturerName = #{name}
         where sid = #{sid}
     </update>
+
+    <select id="getManDetails" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo">
+        select bm.brandName, bm.carBrand brandSid, bb.manufacturerSid
+        from base_vehicle_model bm
+                 left join base_vehicle_brand bb on bm.carBrand = bb.sid
+        where bm.sid = #{modelSid}
+    </select>
 </mapper>

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

@@ -203,6 +203,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
 
     @Override
     public ResultBean<String> selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) {
-        return baseManufacturerService.selectByOrgSidAndManBankSid(useOrgSid,manufacturerSid);
+        return baseManufacturerService.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid);
+    }
+
+    @Override
+    public ResultBean<BaseOutManuVo> getManDetails(String modelSid) {
+        return baseManufacturerService.getManDetails(modelSid);
     }
 }

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

@@ -541,7 +541,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         //去重
         stringList = stringList.stream().distinct().collect(Collectors.toList());
         for (String s : stringList) {
-            if(orgSid.equals(s)){
+            if (orgSid.equals(s)) {
                 continue;
             }
             ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(s);
@@ -554,7 +554,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             if (!list.isEmpty()) {
                 BaseManufacturer baseManufacturer = list.get(0);
                 //修改
-                baseMapper.updateMank(baseManufacturer.getSid(),sysOrganizationVo.getName(),vo.getName());
+                baseMapper.updateMank(baseManufacturer.getSid(), sysOrganizationVo.getName(), vo.getName());
             } else {
                 if (sysOrganizationVo != null) {
                     BaseManufacturer baseManufacturer = new BaseManufacturer();
@@ -562,7 +562,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     baseManufacturer.setSupplierTypeValue("分公司");
                     baseManufacturer.setManufacturerName(sysOrganizationVo.getName());
                     baseManufacturer.setCreateOrg(orgSid);
-                    if(vo != null){
+                    if (vo != null) {
                         baseManufacturer.setCreateOrgName(vo.getName());
                         baseManufacturer.setUseOrgName(vo.getName());
                     }
@@ -630,4 +630,11 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid);
         return rb.success().setData(baseManufacturerDetailsVo.getSid());
     }
+
+    public ResultBean<BaseOutManuVo> getManDetails(String modelSid) {
+        ResultBean<BaseOutManuVo> rb = ResultBean.fireFail();
+        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

@@ -128,11 +128,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         String orgSidPath = pagerQuery.getOrgSidPath();
         SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
         String orgLevelKey = data.getOrgLevelKey();
-        if ("2".equals(orgLevelKey)){
-            orgSidPath = orgSidPath.substring(0,73);
-            qw.like("so.orgSidPath",orgSidPath);
-        }else if ("3".equals(orgLevelKey)){
-            qw.eq("bv.createOrgSid",pagerQuery.getCreateOrgSid());
+        if ("2".equals(orgLevelKey)) {
+            orgSidPath = orgSidPath.substring(0, 73);
+            qw.like("so.orgSidPath", orgSidPath);
+        } else if ("3".equals(orgLevelKey)) {
+            qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
         }
         qw.eq("bv.isDelete", "0");
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
@@ -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-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java

@@ -65,5 +65,8 @@ public interface CommonAppendixMapper extends BaseMapper<CommonAppendix> {
     @Select("SELECT * FROM common_appendix WHERE filePath =#{s}")
     CommonAppendixVo fetchByFilePath(String s);
 
-    List<PrintConfirmVo> selectByType(@Param("sid") String sid, @Param("attachType") String attachType,@Param("path") String path);
+    List<PrintConfirmVo> selectByType(@Param("sid") String sid, @Param("attachType") String attachType, @Param("path") String path);
+
+    @Delete("delete from common_appendix where linkSid = #{linkSid} and  attachType = #{attachType} ")
+    int delFilesByLinkSidAndAttachType(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java

@@ -247,4 +247,11 @@ public class CommonAppendixRest implements CommonAppendixFeign {
 	public ResultBean<CommonAppendixVo> fetchByFilePath(String s) {
 		return commonAppendixService.fetchByFilePath(s);
 	}
+
+	@Override
+	public ResultBean delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+		ResultBean rb = ResultBean.fireFail();
+		int i = commonAppendixService.delFilesByLinkSidAndAttachType(linkSid,attachType);
+		return rb.success().setMsg("删除成功");
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java

@@ -489,4 +489,9 @@ public class CommonAppendixService extends MybatisBaseService<CommonAppendixMapp
     public List<PrintConfirmVo> selectByType(String sid, String attachType,String path) {
         return baseMapper.selectByType(sid,attachType,path);
     }
+
+    public int delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+        return baseMapper.delFilesByLinkSidAndAttachType(linkSid,attachType);
+
+    }
 }

anrui-base/anrui-base-biz/src/main/resources/application-test.yml

@@ -27,5 +27,5 @@ image:
   url:
     prefix: http://anrui.yyundong.com/upload/
 templateUrl:
-  uploadUrl: http://anrui.yyundong.com/template
-  prefixUrl: /home/lzh/webapps/template/
+  uploadUrl: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/template/
+  prefixUrl: http://anrui.yyundong.com/upload/template/

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java

@@ -57,7 +57,7 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
     private List<String> payFiles = new ArrayList<>();
 
     @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> contractList = new ArrayList<>();
+    private List<AppFinSelectedReceivablesPaymentDetailsVo> contractList = new ArrayList<>();
 
     @ApiModelProperty("余额")
     private String balance;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -41,12 +41,15 @@
     <select id="initCollectionConfirm"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationInitVo">
         SELECT sid                  AS collectionBillSid,
+               collectionBankNumKey AS collectionNumKey,
                collectionBankNum    AS collectionNum,
                collectionBank,
+               collectionBankKey,
                collectionTypeValue  AS collectionType,
+               collectionTypeKey    AS collectionTypeKey,
                collectionDate,
                payerName            AS paymentName,
-               collectionMoney,
+               collectionMoney      AS paymentMoney,
                remarks,
                balance
         FROM fin_collection_confirmation

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -54,6 +54,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -349,12 +350,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             BigDecimal balance = record.getBalance();
             int i = balance.intValue();
             int collectionBillState = record.getAuditState();
-            if (i <= 0 || collectionBillState == 1 || collectionBillState == 3) {
+            if (i <= 0) {
+                if (collectionBillState == 1 && collectionBillState == 3) {
                     record.setShowHandle(false);
                 }
+                record.setShowHandle(false);
+            } else {
+                record.setShowHandle(true);
+            }
+            if (collectionBillState == 3) {
                 record.setShowDownload(false);
+            }
             List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getSid());
-            if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != 1) {
+            if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState == 1) {
+                record.setShowDelete(false);
+            } else {
+                record.setShowDelete(true);
+            }
+            if (collectionBillState == 3) {
+                record.setShowDelete(true);
+            } else {
                 record.setShowDelete(false);
             }
         }
@@ -390,7 +405,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
         CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
-        BeanUtil.copyProperties(dto, finCollectionConfirmation,"sid");
+        BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
         finCollectionConfirmation.setUseOrgSid(useOrgSid);
 
         List<String> payFiles = dto.getPayFiles();
@@ -421,9 +436,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (subtract.compareTo(BigDecimal.ZERO) < 0) {
             return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
         }
-        finCollectionConfirmation.setBalance(totalSubscriptionMone);
+        finCollectionConfirmation.setBalance(subtract);
         finCollectionConfirmation.setPaymentState(1);
-        finCollectionConfirmation.setAuditState(1);
         save(finCollectionConfirmation);
         return rb.success().setData(finCollectionConfirmation.getSid());
     }
@@ -439,6 +453,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail();
         String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
         AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
+        List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);
+        vo.setContractList(list);
         List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
         List<String> payFiles = new ArrayList<>();
         for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
@@ -446,6 +462,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             payFiles.add(url);
         }
         vo.setPayFiles(payFiles);
+        vo.setUserSid(userSid);
         return rb.success().setData(vo);
     }
 
@@ -458,6 +475,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
         ResultBean<AppFinCollectionConfirmationDetailedVo> rb = ResultBean.fireFail();
         AppFinCollectionConfirmationDetailedVo vo = baseMapper.getCollectionConfirmDetail(collectionBillSid);
+        List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);
+        vo.setContractList(list);
         List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
         List<String> payFiles = new ArrayList<>();
         for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
@@ -486,6 +505,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         List<AppFinSelectedReceivablesDetailedDto> paymentDetails = dto.getContractList();
         CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+        if (StringUtils.isBlank(dto.getCollectionBillSid())) {
             FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
             BeanUtil.copyProperties(dto, finCollectionConfirmation);
             for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
@@ -499,7 +519,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
                 finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
                 finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
-            finSelectedReceivablesDetailed.setCollSid(dto.getSid());
+                finSelectedReceivablesDetailed.setCollSid(dto.getCollectionBillSid());
+                finSelectedReceivablesDetailed.setAuditState(1);
                 finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
                 //已选应收款项-车架号
                 String vin = finSelectedReceivablesDetailed.getVIN();
@@ -534,6 +555,63 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 remFilePath += remFilePath + ",";
             }
             finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
+            finCollectionConfirmation.setAuditState(1);
+            save(finCollectionConfirmation);
+        } else {
+            FinCollectionConfirmation finCollectionConfirmation = fetchBySid(dto.getCollectionBillSid());
+            BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
+            finSelectedReceivablesDetailedService.deleteByCollSid(dto.getCollectionBillSid());
+            for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
+                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
+                finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
+                finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin());
+                finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney());
+                finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId());
+                finSelectedReceivablesDetailed.setReceivablesName(paymentDetail.getProjectName());
+                finSelectedReceivablesDetailed.setContractSid(paymentDetail.getContractSid());
+                finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
+                finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
+                finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
+                finSelectedReceivablesDetailed.setCollSid(dto.getCollectionBillSid());
+                finSelectedReceivablesDetailed.setAuditState(1);
+                finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
+                //已选应收款项-车架号
+                String vin = finSelectedReceivablesDetailed.getVIN();
+                //已选应收款项-应收项目名称
+                String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
+                FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
+                //应收未收款项-当前应收金额
+                BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
+                //已选应收款项-认款金额
+                BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
+                BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
+                if (subtract.compareTo(BigDecimal.ZERO) < 0) {
+                    return rb.setMsg("认款金额超出应收金额，请重新输入");
+                }
+                finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
+                FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
+                BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
+                finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
+            }
+            commonAppendixFeign.delFilesByLinkSidAndAttachType(dto.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+            List<String> payConfirmFiles = dto.getPayConfirmFiles();
+            String remFilePath = "";
+            for (String payFilePath : payConfirmFiles) {
+                if (payFilePath != null) {
+                    remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    commonAppendixDto.setLinkSid(dto.getSid());
+                    commonAppendixDto.setFilePath(payFilePath);
+                    commonAppendixDto.setCreateBySid(staffSid);
+                    commonAppendixDto.setFileName("汇款确认");
+                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+                    commonAppendixFeign.save(commonAppendixDto);
+                }
+                remFilePath += remFilePath + ",";
+            }
+            finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
+            finCollectionConfirmation.setAuditState(1);
+            updateById(finCollectionConfirmation);
+        }
         return rb.success();
     }
 
@@ -566,8 +644,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
-        List<String> sidList = pagerQuery.getParams().getSidList();
-        IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw);
+        IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw);
         List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
         for (AppFinUncollectedReceivablesDetailedVo record : records) {
             record.setReceivable(record.getConfirmMoney());
@@ -586,10 +663,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {
-                qw.like("customerName", pagerQuery.getName());
+                qw.like("furd.customerName", pagerQuery.getName());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrgSid())) {
-                qw.eq("useOrgSid", pagerQuery.getUseOrgSid());
+                qw.eq("furd.useOrgSid", pagerQuery.getUseOrgSid());
+            }
+            if (pagerQuery.getSidList().size() > 0) {
+                qw.notIn("furd.contractSid", pagerQuery.getSidList());
             }
         }
         return qw;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -79,7 +79,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
      * @param qw
      * @return
      */
-    IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw);
+    IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw);
 
 
     @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}")
@@ -94,4 +94,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
 
     @Update("update fin_selected_receivables_detailed set auditDate = NOW() where sid = #{sid1}")
     void updateAuditDateBySid(String sid1);
+
+    List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(@Param("collectionBillSid") String collectionBillSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -28,16 +28,13 @@
         customerPhone AS mobile,
         customerName AS `name`,
         currentReceivableMoney AS receivable,
-        contractSid AS contractSid,
+        contractSid,
         currentReceivableMoney AS confirmMoney,
         VIN AS vin
         FROM
         fin_uncollected_receivables_detailed furd
         <where>
             ${ew.sqlSegment}
-            <foreach collection="sidList" item="sids" index="index" separator="," open="(" close=")">
-                #{sids}
-            </foreach>
         </where>
     </select>
 
@@ -62,4 +59,19 @@
                  receivablesName
         ORDER BY auditDate
     </select>
+    <select id="selectByCollSid"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo">
+        SELECT contractNo             as contractId,
+               receivablesName        as projectName,
+               customerPhone          as mobile,
+               customerName           as `name`,
+               currentReceivableMoney as receivable,
+               contractSid,
+               subscriptionMoney      as confirmMoney,
+               VIN                    as vin,
+               subscriptionDate       as confirmDate,
+               auditState             as `state`
+        FROM fin_selected_receivables_detailed
+        WHERE collSid = #{collectionBillSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -179,8 +179,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
      * @param qw
      * @return
      */
-    public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw) {
-        return baseMapper.getPaymentDetailsList(sidList, page, qw);
+    public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw) {
+        return baseMapper.getPaymentDetailsList(page, qw);
     }
 
     public List<FinSelectedReceivablesDetailedVo> fetchByAuditState(String sid,Integer auditState) {
@@ -202,4 +202,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public void updateAuditDateBySid(String sid1) {
         baseMapper.updateAuditDateBySid(sid1);
     }
+
+    public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) {
+        return baseMapper.selectByCollSid(collectionBillSid);
+    }
 }

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-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java

@@ -127,5 +127,7 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
 
     @ApiModelProperty("车架号")
     private List<ScmVehicleGressionVehVo> scmVehicleGressionVehs;
+    @ApiModelProperty("组织机构sid")
+    private String useOrgSid;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java

@@ -94,26 +94,8 @@ public class AppScmVehicleGressionDto implements Dto {
     private String locationCode;
     @ApiModelProperty("车架号")
     private List<ScmVehicleGressionVehDto> scmVehicleGressionVehs;
-    //    @ApiModelProperty("车辆sid")
-//    private String vehicleSid;
-//    @ApiModelProperty("车架号")
-//    private String vinNo;
-//    @ApiModelProperty("车架号")
-//    private List<String> vins;
- /*   @ApiModelProperty("申请编号")
-    private String applicantNo;*/
-    //    @ApiModelProperty("申请人")
-//    private String applicantName;
-//    @ApiModelProperty("申请日期")
-//    private String applicantDate;
-/*    @ApiModelProperty("现存放地点")
-    private String locationKey;*/
-    /*  @ApiModelProperty("目标库")
-      private String targetLocationKey;*/
-//    @ApiModelProperty("临牌")
-//    private String temporaryCard;
-//    @ApiModelProperty("保单照片")
-//    private List<String> policyImage;
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java

@@ -110,16 +110,8 @@ public class AppScmVehicleGressionInfoVo implements Vo {
     private List<ScmVehicleGressionVehVo> scmVehicleGressionVehs = new ArrayList<>();
     private String createBySid;
 
-  /*  @ApiModelProperty("车辆sid")
-    private String vehicleSid;
-    @ApiModelProperty("车架号")
-    private String vinNo;*/
-
-/*    @ApiModelProperty("现存地点")
-    private String locationKey;*/
-
-    /*   @ApiModelProperty("目标地点")
-       private String targetLocationKey;*/
+    @ApiModelProperty("机构sid")
+    private String useOrgSid;
 
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleGressionQuery.java <br/>
@@ -48,7 +50,9 @@ import lombok.Data;
 @ApiModel(value = "移位单 查询条件", description = "移位单 查询条件")
 public class AppScmVehicleGressionPageQuery implements Query {
 
+    private static final long serialVersionUID = 8190967049215312840L;
     @ApiModelProperty("用户sid")
+    @NotBlank(message = "用户sid不能为空")
     private String userSid;
 
     @ApiModelProperty(" 先 申请单编号 后 车架号 ")
@@ -58,6 +62,6 @@ public class AppScmVehicleGressionPageQuery implements Query {
     private String type;
 
     @ApiModelProperty("分公司sid")
-    private String useOrgSid;
+    private String orgPath;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java

@@ -99,7 +99,7 @@ public interface ScmVehicleGressionFeign {
     @ApiOperation("手机端-获取车辆移位列表")
     @PostMapping("/getCarTransferList")
     @ResponseBody
-    public ResultBean<PagerVo<AppScmVehicleGressionPageVo>> getCarTransferList(@RequestBody PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery);
+    public ResultBean<PagerVo<AppScmVehicleGressionPageVo>> getCarTransferList(@Valid @RequestBody PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery);
 
     @ApiOperation("移动端、PC端-保存车库移库信息")
     @PostMapping("/saveCarTransferInfo")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppScmVehicleStayInventoryListPageQuery implements Query {
 
+    private static final long serialVersionUID = 5599273643899587257L;
     @ApiModelProperty("用户sid")
     private String userSid;
 
@@ -17,5 +18,5 @@ public class AppScmVehicleStayInventoryListPageQuery implements Query {
     private String warehouseSid;
 
     @ApiModelProperty("使用组织分公司sid")
-    private String useOrgSid;
+    private String orgPath;
 }

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/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -32,6 +32,8 @@ import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
+import com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@@ -46,6 +48,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
@@ -114,6 +117,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private ScmWarehouseService scmWarehouseService;
+    @Autowired
+    private BaseManufacturerFeign baseManufacturerFeign;
 
     private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -391,6 +396,28 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                         }
                         baseVehicleDto.setOrderingNo(applicationDetailsVo.getApplicationCode()); // 采购编号 厂家订单编号
                         baseVehicleDto.setInsideCode(applicationDetailsVo.getInsideCode());
+                        //添加品牌sid、品牌名称、厂商sid、供应商sid、采购系统及sid、回款通路及sid
+                        //根据外采编号查询外采的申请人部门
+                        String createBySid = applicationDetailsVo.getCreateBySid();
+                        //查询该申请人的部门
+                        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid);
+                        if (sysUserInfoVoResultBean.getSuccess()) {
+                            SysUserInfoVo sysUserInfoVo = sysUserInfoVoResultBean.getData();
+                            if (sysUserInfoVo != null) {
+                                String orgDeptSid = sysUserInfoVo.getOrgSid();
+                                //采购系统及sid
+                                baseVehicleDto.setPurchaseSystemSid(orgDeptSid);
+                                baseVehicleDto.setPurchaseSystemName(sysUserInfoVo.getOrgName());
+                            }
+                        }
+                        //根据车型sid查询品牌及名称及厂商sid
+                        ResultBean<BaseOutManuVo> resultBeanBaseManu = baseManufacturerFeign.getManDetails(scmVehicleEnterlibrary.getModelSid());
+                        baseVehicleDto.setSupplierSid(applicationDetailsVo.getPurchasingUnitSid());
+                        if (resultBeanBaseManu.getData() != null) {
+                            baseVehicleDto.setManufacturerSid(resultBeanBaseManu.getData().getManufacturerSid());
+                            baseVehicleDto.setCarBrandSid(resultBeanBaseManu.getData().getBrandSid());
+                            baseVehicleDto.setCarBrandName(resultBeanBaseManu.getData().getBrandName());
+                        }
                     }
                     baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
                     baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName());
@@ -404,6 +431,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setSpecialInstructions(scmVehicleEnterlibrary.getSpecialInstructions()); // 特殊差异说明 验车
                     baseVehicleDto.setManPurOrderTypeKey(scmVehicleEnterlibrary.getPurchaseTypeKey());
                     baseVehicleDto.setManPurOrderTypeValue(scmVehicleEnterlibrary.getPurchaseType());
+
                     List<BaseVehicleDto> list = new ArrayList<>();
                     list.add(baseVehicleDto);
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@@ -151,13 +151,11 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
     @ApiOperation("手机端-获取车辆移位列表")
     @PostMapping("/getCarTransferList")
     public ResultBean<PagerVo<AppScmVehicleGressionPageVo>> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
-        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
-            new ResultBean<>().success().setMsg("用户sid不能为空");
-        }
+        ResultBean<PagerVo<AppScmVehicleGressionPageVo>> rb = ResultBean.fireFail();
         PagerVo<AppScmVehicleGressionPageVo> page = new PagerVo<>();
         IPage<AppScmVehicleGressionPageVo> iPage = scmVehicleGressionService.getCarTransferList(pagerQuery);
         PagerVo<AppScmVehicleGressionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return new ResultBean<PagerVo<AppScmVehicleGressionPageVo>>().success().setData(pagerVo);
+        return rb.success().setData(pagerVo);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
@@ -71,9 +72,12 @@ import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService;
 import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService;
+import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.WordConvertUtils;
+import com.yxt.common.base.utils.WordUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -81,14 +85,19 @@ import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
+import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader;
+
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleGressionService.java <br/>
@@ -148,6 +157,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private ScmWarehouseService scmWarehouseService;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
 
     private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -219,7 +230,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             //查询出门证
             ScmExitPermit scmExitPermit = scmExitPermitService.selectByLinkSid(record.getSid());
             if (scmExitPermit != null) {
-                record.setDownloadUrl(fileUploadComponent.getUrlPrefix() + scmExitPermit.getUrl());
+                record.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + scmExitPermit.getUrl());
             }
             List<ScmFile> scmFiles1 = scmFileService.getByLinkSidAndType(sid, type1);
             for (ScmFile scmFile : scmFiles1) {
@@ -312,24 +323,21 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     public IPage<AppScmVehicleGressionPageVo> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
         String type = "05";
         IPage<AppScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        /*String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);*/
         QueryWrapper<AppScmVehicleGressionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
         AppScmVehicleGressionPageQuery params = pagerQuery.getParams();
         IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, params.getNames());
         List<AppScmVehicleGressionPageVo> records = iPage.getRecords();
         for (AppScmVehicleGressionPageVo record : records) {
-
             List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
-
             record.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
-
             if ("已办结".equals(record.getState())) {
                 record.setShowDownloadBtn(true);
                 //查询出门证
                 ScmExitPermit scmExitPermit = scmExitPermitService.selectByLinkSid(record.getSid());
                 if (scmExitPermit != null) {
-                    record.setDownloadUrl(fileUploadComponent.getUrlPrefix() + scmExitPermit.getUrl());
+                    record.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + scmExitPermit.getUrl());
                 }
                 List<ScmFile> list = scmFileService.getByLinkSidAndType(record.getSid(), type);
                 if (list.size() > 0) {
@@ -357,6 +365,9 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         if (StringUtils.isNotBlank(query.getType())) {
             qw.eq("svg.handleState", query.getType());
         }
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
+            qw.eq("svg.useOrgSid", query.getOrgPath());
+        }
         return qw;
     }
 
@@ -375,25 +386,33 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         }
         String userSid = dto.getUserSid();
         String sid = dto.getSid();
+        //机构sid
+        String useOrgSid = dto.getOrgPath();
+        if (StringUtils.isBlank(useOrgSid)) {
+            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
         //获取用户信息
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
         if (!userVoResultBean.getSuccess()) {
             return rb.setMsg(userVoResultBean.getMsg());
         }
         SysUserVo sysUserVo = userVoResultBean.getData();
-        //获取分公司
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         //获取当天日期
         String today = DateUtil.today();
-        if (StringUtils.isBlank(sid)) {
+        if (StringUtils.isBlank(sid)) {//新增
             ScmVehicleGression scmVehicleGression = new ScmVehicleGression();
             BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
-            scmVehicleGression.setApplicantName(sysUserVo.getName());//申请人
-            scmVehicleGression.setApplicantDate(today);//申请时间
-            scmVehicleGression.setUseOrgSid(useOrgSid);//分公司sid
-            scmVehicleGression.setCreateBySid(dto.getUserSid());
+            //申请人
+            scmVehicleGression.setApplicantName(sysUserVo.getName());
+            //申请时间
+            scmVehicleGression.setApplicantDate(today);
+            //分公司sid
+            scmVehicleGression.setUseOrgSid(useOrgSid);
+            scmVehicleGression.setCreateBySid(userSid);
+            //1待办 2已办
             scmVehicleGression.setHandleState("1");
-            String billNo = getApplyCode(dto);//申请编号
+            //申请编号
+            String billNo = getApplyCode(dto);
             scmVehicleGression.setApplicantNo(billNo);
             int i = baseMapper.insert(scmVehicleGression);
             sid = scmVehicleGression.getSid();
@@ -403,7 +422,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 return rb.setMsg("保存失败");
             }
 
-        } else {
+        } else {//编辑
             ScmVehicleGression scmVehicleGression = fetchBySid(sid);
             if (scmVehicleGression == null) {
                 return rb.setMsg("该申请不存在");
@@ -855,18 +874,87 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         appMap.put("sid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        //===============================添加多线程开始======================
         if (bv.getTaskId().equals(scmVehicleGression.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }
+            UpdateFlowFieldVo ufVo = resultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
                 if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                /* String pdfPath = createPdf(bv.getBusinessSid());
+                    Future future1 = pool.submit(() -> {
+                        String pdfPath = createPdf(bv.getBusinessSid());
                         //将生成的出门证添加到出门证表中
                         ScmExitPermit scmExitPermit = new ScmExitPermit();
                         scmExitPermit.setLinkSid(bv.getBusinessSid());
                         scmExitPermit.setUrl(pdfPath);
-                scmExitPermitService.insert(scmExitPermit);*/
+                        scmExitPermitService.insert(scmExitPermit);
+                    });
+                    ScmVehicleGression finalScmVehicleGression = scmVehicleGression;
+                    Future future2 = pool.submit(() -> {
+                        //推送调拨单
+                        List<String> vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid());
+                        if (vinList.size() > 0) {
+                            //根据分公司sid查询分公司编码
+                            String useOrgSid = finalScmVehicleGression.getUseOrgSid();
+                            ResultBean<SysOrganizationVo> sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid);
+                            SysOrganizationVo sysOrganizationVo = sysOrg.getData();
+                            for (String s : vinList) {
+                                BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData();
+                                List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
+                                StkTransferDirect stkTransferDirect = new StkTransferDirect();
+                                stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
+                                stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期
+                                StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
+                                ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(finalScmVehicleGression.getTargetLocationSid());
+                                fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
+                                fBillEntry.setFMaterialId(s);//物料编码
+                                scmWarehouse = scmWarehouseService.fetchBySid(finalScmVehicleGression.getLocationSid());
+                                fBillEntry.setFSrcStockId(scmWarehouse.getGressionCode());//调出仓库
+                                FPAYBILLENTRYs.add(fBillEntry);
+                                stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
+                                finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
+                            }
+                        }
+
+                    });
+                } else {
+                    //极光推送
+                    scmVehicleGression = fetchBySid(bv.getBusinessSid());
+                    ufVo.setProcInsId(scmVehicleGression.getProcInstId());
+                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                    MessageFlowVo messageFlowVo = new MessageFlowVo();
+                    BeanUtil.copyProperties(ufVo, messageFlowVo);
+                    ufVo.setProcInsId(scmVehicleGression.getProcInstId());
+                    messageFlowableQuery.setUfVo(messageFlowVo);
+                    messageFlowableQuery.setAppMap(appMap);
+                    messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+                    messageFlowableQuery.setModuleName("存放地点变更申请");
+                    messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                    messageFlowableQuery.setMsgTitle("存放地点变更");
+                    ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                }
+
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //===============================添加多线程结束======================
+        /*if (bv.getTaskId().equals(scmVehicleGression.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
             }
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
@@ -887,15 +975,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
 
             } else {
-//                //推送车辆台账数据
-//                VehicleGression vehicleGression = new VehicleGression();
-//                List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
-//                vehicleGression.setVin(list);
-//                vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
-//                vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
-//                baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);
-//                //删除申请状态
-//                baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid());
                 //推送调拨单
                 List<String> vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid());
                 if (vinList.size() > 0) {
@@ -907,19 +986,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                         BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData();
                         List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
                         StkTransferDirect stkTransferDirect = new StkTransferDirect();
-//                        stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织
-                        // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
-//                        stkTransferDirect.setFStockOrgId("101"); //调入库存组织
                         stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
                         stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期
                         StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
                         ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getTargetLocationSid());
-//                        fBillEntry.setFDestStockId("CK003");//调入仓库
                         fBillEntry.setFDestStockId(scmWarehouse.getGressionCode());//调入仓库
                         fBillEntry.setFMaterialId(s);//物料编码
                         scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleGression.getLocationSid());
                         fBillEntry.setFSrcStockId(scmWarehouse.getGressionCode());//调出仓库
-//                        fBillEntry.setFSrcStockId("CK001");//调出仓库
                         FPAYBILLENTRYs.add(fBillEntry);
                         stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
                         finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
@@ -930,7 +1004,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
-
+*/
     }
 
     /**
@@ -943,10 +1017,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-//        Map<String, Object> formVariables = query.getFormVariables();
-        //判断流程分支
-//        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
-//        bv.setFormVariables(map);
         bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@@ -964,13 +1034,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-//        Map<String, Object> formVariables = query.getFormVariables();
-        //判断流程分支
-//        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
-//        bv.setFormVariables(map);
         bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
-        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将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());
         return rb.success().setData(voList);
     }
@@ -1188,10 +1253,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return rb.success().setData(temporaryExitPermitInfo);
     }
 
-    /*public String createPdf(String sid) {
+    public String createPdf_old(String sid) {
         ScmVehicleGression scmVehicleGression = fetchBySid(sid);
         SysOrganization sysOrganization = sysOrganizationFeign.selectBySid(scmVehicleGression.getUseOrgSid()).getData();
-        BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData();
+//        BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData();
+        BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getSid()).getData();
         ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
         Map<String, Object> dataMap = new HashMap<String, Object>();
         dataMap.put("date", DateUtil.today());
@@ -1227,7 +1293,73 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return "template" + "/" + dateStr + "/" + pdfName;
 
 
-    }*/
+    }
+
+    public String createPdf(String sid) {
+        ScmVehicleGression scmVehicleGression = fetchBySid(sid);
+        SysOrganization sysOrganization = sysOrganizationFeign.selectBySid(scmVehicleGression.getUseOrgSid()).getData();
+        List<String> vinList = new ArrayList<>();
+        List<String> vinSidList = new ArrayList<>();
+        List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
+        if (scmVehicleGressionVehVos.size() > 0) {
+            for (ScmVehicleGressionVehVo v : scmVehicleGressionVehVos) {
+                String vehSid = v.getVehSid();
+                String vin = v.getVehVin();
+                vinList.add(vin);
+                vinSidList.add(vehSid);
+            }
+        }
+        String vin = String.join(",", vinList);
+        List<String> modelNameList = new ArrayList<>();
+        for (String vinSid : vinSidList) {
+            BaseVehicleSelectVo data = baseVehicleFeign.details(vinSid).getData();
+            ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
+            String model = exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor();
+            modelNameList.add(model);
+        }
+        String modelName = String.join(",", modelNameList);
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        //日期
+        dataMap.put("date", DateUtil.today());
+        //合同编号
+        dataMap.put("contract", "—");
+        //机构名称
+        dataMap.put("orgName", sysOrganization.getName());
+        //客户名称
+        dataMap.put("name", "—");
+        //车型
+        dataMap.put("modelName", modelName);
+        //台数
+        dataMap.put("number", vinSidList.size());
+        dataMap.put("vinNo", vin);
+        //出门原因
+        dataMap.put("reason", "存放地点变更");
+        //业务经办人
+        dataMap.put("operator", scmVehicleGression.getOperator());
+        //财务经办人
+//        dataMap.put("finOperator", "-");
+        //提车人
+        dataMap.put("carCollector", "—");
+        //出门签章
+//        dataMap.put("signature", "-");
+        //申请人
+        dataMap.put("apply", scmVehicleGression.getApplicantName());
+        //获取模板
+        File file = new File(getClass().getClassLoader().getResource("ftl/outdoor.ftl").getFile());
+        String dir = getClassLoader().getResource("ftl").getPath();
+        //生成word文件名
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String typeName = dateStr + seconds + ".doc";
+        WordConvertUtils.creatWord(dataMap, file, targetPath, typeName, dir);
+        //新生成的word路径
+        String wordPath = targetPath + typeName;
+        //生成出门证文件名
+        String pdfName = "出门证_" + dateStr + seconds + ".pdf";
+        WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+        return pdfName;
+    }
 
     public ResultBean<String> getToDoNum(String userSid) {
         ResultBean rb = ResultBean.fireFail();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -28,32 +28,25 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.itextpdf.text.pdf.PRAcroForm;
-import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleStayInventoryQuery;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehiclestayinventory.ScmVehicleStayInventoryService;
 import com.yxt.common.base.config.component.FileUploadComponent;
-import com.yxt.common.core.result.ResultBean;
-import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
-
-import org.apache.ibatis.annotations.Param;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -61,7 +54,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -220,15 +212,19 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
      */
     public IPage<AppScmVehicleStayInventoryListPageVo> getInventoryList(PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery) {
         IPage<AppScmVehicleStayInventoryListPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        pagerQuery.getParams().setUseOrgSid(useOrgSid);
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw = new QueryWrapper<>();
+        AppScmVehicleStayInventoryListPageQuery query = pagerQuery.getParams();
+        String orgPath = query.getOrgPath();
+        String userSid = query.getUserSid();
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
+        if(StringUtils.isNotBlank(orgPath)){
+            qw.eq("createOrgSid", orgPath);
+        }
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         qw.eq("isDelete", 0);
         qw.eq("InventoryState", "无");
-        if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
-            qw.eq("createOrgSid", pagerQuery.getParams().getUseOrgSid());
-        }
         if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
             qw.eq("locationSid", pagerQuery.getParams().getWarehouseSid());
         }

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

anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml

@@ -24,3 +24,7 @@ image:
     path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/
+
+templateUrl:
+  uploadUrl: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/template/
+  prefixUrl: http://anrui.yyundong.com/upload/template/

anrui-scm/anrui-scm-biz/src/main/resources/临时出门证.docx

@@ -2,15 +2,15 @@
                                                                       日期：
 ${date!}
                                                                    申请人：
-${application!}
+${apply!}
+                                                                合同编号：
+${contract!}
                                                                 客户名称：
 ${name!}
-                                                                合同编号：
-${contractNo!}
-                                                                车型名称：
-${modelName!}
                                                                       台数：
 ${number!}
+                                                                车型名称：
+${modelName!}
                                                                    车架号：
 ${vinNo!}
                                                                 出门原因：

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@@ -26,10 +26,6 @@
 package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
 
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
-import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto;
-import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
-import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageQuery;
-import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java

@@ -77,4 +77,9 @@ public class DisBaseInfoDto implements Dto {
 
     @ApiModelProperty(value = "经销商sid")
     private String distributorSid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java

@@ -16,4 +16,7 @@ public class DistributorQuery implements Query {
     private String userSid;
     @ApiModelProperty(value = "名称")
     private String name;
+
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java

@@ -58,7 +58,7 @@ public class ConfirmationInitVo implements Vo {
     private List<String> payFiles = new ArrayList<>() ;
 
     @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> contractList = new ArrayList<>();
+    private List<UncollectedReceivablesDetailedVo> contractList = new ArrayList<>();
 
     @ApiModelProperty("余额")
     private String balance;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java

@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "盘库记录")
 @FeignClient(
-        contextId = "anrui-scm-ScmVehicleInventory",
+        contextId = "anrui-terminal-ScmVehicleInventory",
         name = "anrui-terminal",
         path = "/supplychain/v1/inventory",
         fallback = AppScmVehicleInventoryFeignFallback.class)

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java

@@ -7,13 +7,14 @@ import lombok.Data;
 @Data
 public class InventoryListPageQuery implements Query {
 
+    private static final long serialVersionUID = 5831697424231715724L;
     @ApiModelProperty("用户sid")
     private String userSid;
-
     @ApiModelProperty("优先匹配车架号 盘库人员")
     private String names;
-
     @ApiModelProperty("存放地点 “”/null 全部  有值时只查询当前存放地点的记录")
     private String warehouseSid;
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageQuery.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppExaminePageQuery implements Query {
 
+    private static final long serialVersionUID = -581635592157173314L;
     @ApiModelProperty("用户sid")
     private String userSid;
 
@@ -16,7 +17,7 @@ public class AppExaminePageQuery implements Query {
     @ApiModelProperty("车架号、车型 、订单类型")
     private String names;
 
-    @ApiModelProperty("验车时间")
+  /*  @ApiModelProperty("验车时间")
     private String date;
 
     @ApiModelProperty("验车开始时间")
@@ -26,6 +27,6 @@ public class AppExaminePageQuery implements Query {
     private String dateEnd;
 
     @ApiModelProperty("使用组织分公司sid")
-    private String useOrgSid;
+    private String useOrgSid;*/
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java

@@ -123,5 +123,8 @@ public class AppGressionDetailsVo implements Vo {
     @ApiModelProperty("调出方负责人用户sid")
     @JsonProperty("personSid")
     private String personUserSid;
+    @ApiModelProperty("组织机构sid")
+    @JsonProperty("orgPath")
+    private String useOrgSid;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data
@@ -63,40 +64,9 @@ public class AppGressionDto implements Dto {
     private String personUserSid;
     @ApiModelProperty("车架号")
     private List<VehicleGressionVehDto> scmVehicleGressionVehs;
-/*    @ApiModelProperty("现存放地点")
-    @JsonProperty("nowAddressKey")
-    private String locationKey;*/
-    /*    @ApiModelProperty("目标库")
-    @JsonProperty("targetAddressKey")
-    private String targetLocationKey;*/
-//    @ApiModelProperty("申请人名称")
-//    @JsonProperty("applyNmae")
-//    private String applicantName;
-//
-//    @ApiModelProperty("申请日期")
-//    @JsonProperty("applyDate")
-//    private String applicantDate;
 
-
-//    @ApiModelProperty("车架号")
-//    @JsonProperty("vin")
-//    private String vinNo;
-//
-//    @ApiModelProperty("车架号")
-//    private List<String> vins;
-
-
-//    @ApiModelProperty("保单照片")
-//    @JsonProperty("policyImage")
-//    private List<String> policyImage;
-
-
-//    @ApiModelProperty("临牌")
-//    @JsonProperty("proCard")
-//    private String temporaryCard;
-//
-//    @ApiModelProperty("现场照片")
-//    private List<String> image;
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java

@@ -112,5 +112,9 @@ public class AppGressionInfoVo implements Vo {
     @JsonProperty("personSid")
     private String personUserSid;
 
+    @ApiModelProperty("机构sid")
+    @JsonProperty("orgPath")
+    private String useOrgSid;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageQuery.java

@@ -1,18 +1,24 @@
 package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 public class AppGressionPageQuery implements Query {
 
+    private static final long serialVersionUID = 6179915096664858861L;
     @ApiModelProperty("用户sid")
+    @NotBlank(message = "用户sid不能为空")
     private String userSid;
-
     @ApiModelProperty("")
     private String names;
-
-    @ApiModelProperty("")
+    @ApiModelProperty("1待办、2已办")
     private String type;
+
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java

@@ -38,6 +38,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleGressionFeign.java <br/>
@@ -59,17 +61,17 @@ import org.springframework.web.bind.annotation.*;
         fallback = AppScmVehicleGressionFeignFallback.class)
 public interface AppScmVehicleGressionFeign {
 
-    @ApiOperation("手机端-获取车辆移位列表")
+    @ApiOperation("手机端-获取车辆移位列表：已添加机构sid")
     @PostMapping("/getCarTransferList")
     @ResponseBody
     public ResultBean<PagerVo<AppGressionPageVo>> getCarTransferList(@RequestBody PagerQuery<AppGressionPageQuery> pagerQuery);
 
-    @ApiOperation("手机端-保存车库移库信息")
+    @ApiOperation("手机端-保存车库移库信息：已添加机构sid")
     @PostMapping("/saveCarTransferInfo")
     @ResponseBody
-    public ResultBean saveCarTransferInfo(@RequestBody AppGressionDto dto);
+    public ResultBean saveCarTransferInfo(@Valid @RequestBody AppGressionDto dto);
 
-    @ApiOperation("手机端-初始化移库申请")
+    @ApiOperation("手机端-初始化移库申请：已添加机构sid")
     @GetMapping("/getCarTransferInfo/{sid}/{userSid}")
     @ResponseBody
     public ResultBean<AppGressionInfoVo> getCarTransferInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

@@ -42,7 +42,6 @@ import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import org.apache.axis.i18n.RB;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -145,11 +144,6 @@ public class AppScmVehicleGressionService {
         ResultBean rb = ResultBean.fireFail();
         SubmitCarTransferDto submitCarTransferDto = new SubmitCarTransferDto();
         BeanUtil.copyProperties(dto, submitCarTransferDto);
-//        //根据车架号查询车辆sid
-//        ResultBean<BaseVehicleVo> stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo());
-//        if (stringResultBean.getSuccess()) {
-//            submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid());
-//        }
         ResultBean resultBean = scmVehicleGressionFeign.submitCarTransfer(submitCarTransferDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());