From 07451bd0df3df082ce955a7a410bfd091297fa4e Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 3 Nov 2022 10:08:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehicleout/BaseVehicleOutDto.java |   3 +
 .../basevehicleout/BaseVehicleOutFeign.java   |   5 +
 .../BaseVehicleModelMapper.java               |   2 +-
 .../BaseVehicleModelMapper.xml                |   2 +-
 .../BaseVehicleModelService.java              |   8 +-
 .../basevehicleout/BaseVehicleOutMapper.xml   |   1 +
 .../basevehicleout/BaseVehicleOutRest.java    |   5 +
 .../basevehicleout/BaseVehicleOutService.java | 123 +++++++++++++++++-
 .../CrmCustomerTempService.java               |   8 +-
 .../FinPaymentrecordService.java              |   9 +-
 .../ScmApplyInboundService.java               |  21 ++-
 .../ScmVehInventorymonthService.java          |   5 +-
 12 files changed, 171 insertions(+), 21 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
index c5e6371f97..998ee8a8a1 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
@@ -69,4 +69,7 @@ public class BaseVehicleOutDto implements Dto {
     private String middleCodeTwo;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("是否要修改客户")
+    private String isUpdateOrInsertCrm; // 是否要修改客户
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
index 33477c7346..15daec5a0c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
@@ -27,6 +27,11 @@ public interface BaseVehicleOutFeign {
     @ResponseBody
     public ResultBean vehicleOut(@RequestBody BaseVehicleOutDto dto);
 
+    @ApiOperation("是否修改客户编码并车辆出库")
+    @PostMapping("/isUpdateOrInsertCrm")
+    @ResponseBody
+    public ResultBean isUpdateOrInsertCrm(@RequestBody BaseVehicleOutDto dto);
+
     @ApiOperation("车辆出库分页列表")
     @PostMapping("/pagerList")
     @ResponseBody
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
index 8633e90f97..3027cb3da3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
@@ -38,7 +38,7 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
      * @param qw
      * @return
      */
-    IPage<BaseVehicleModelVo> pagerList(IPage<BaseVehicleModelQuery> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleModelVo> qw);
+    IPage<BaseVehicleModelVo> pagerList(IPage<BaseVehicleModelQuery> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleModelVo> qw,@Param("createOrgSid") String createOrgSid);
 
     /**
      * 详情以及修改回显接口
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
index b2cf145951..16830d5d7d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
@@ -25,7 +25,7 @@
         FROM
         base_vehmodel_config bvc
         WHERE bvm.`sid` = bvc.`modelSid`
-        AND bvm.`createOrg` = bvc.useOrgSid) AS relationConfigNum
+        AND bvm.`createOrg` = bvc.useOrgSid AND bvm.createOrg = #{createOrgSid}) AS relationConfigNum
         FROM
         base_vehicle_model bvm
         LEFT JOIN base_vehicle_brand bvb
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
index b82a1c5d65..4b437783c6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
@@ -71,7 +71,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     public IPage<BaseVehicleModelVo> pagerList(PagerQuery<BaseVehicleModelQuery> pagerQuery) {
         IPage<BaseVehicleModelQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseVehicleModelVo> qw = buildQueryWrapper(pagerQuery.getParams());
-        return baseMapper.pagerList(page, qw);
+        return baseMapper.pagerList(page, qw, pagerQuery.getParams().getCreateOrgSId());
     }
 
     /**
@@ -602,7 +602,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             String modelSid = baseVehmodelConfigVo.getModelSid();
             params.setModelSid(modelSid);
             QueryWrapper<BaseVehicleModelVo> qw = buildQueryWrapper(params);
-            IPage<BaseVehicleModelVo> baseVehicleModelVoIPage = baseMapper.pagerList(page, qw);
+            IPage<BaseVehicleModelVo> baseVehicleModelVoIPage = baseMapper.pagerList(page, qw, params.getCreateOrgSId());
             List<BaseVehicleModelVo> records = baseVehicleModelVoIPage.getRecords();
             for (BaseVehicleModelVo record : records) {
                 record.setConfigSid(params.getConfigSid());
@@ -631,7 +631,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         return rb.success().setData(baseVehicleModel);
     }
 
-    public String getCode(String modelSid,String createOrgSid) {
-        return baseMapper.getCode(modelSid,createOrgSid);
+    public String getCode(String modelSid, String createOrgSid) {
+        return baseMapper.getCode(modelSid, createOrgSid);
     }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
index dbee53e6ff..4541248c6b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
@@ -59,6 +59,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        ORDER BY bvo.saleDate DESC
     </select>
 
     <select id="details" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
index f003c1bb09..c4306ae67a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
@@ -30,6 +30,11 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
         return baseVehicleOutService.vehicleOut(dto);
     }
 
+    @Override
+    public ResultBean isUpdateOrInsertCrm(BaseVehicleOutDto dto) {
+        return baseVehicleOutService.isUpdateOrInsertCrm(dto);
+    }
+
     @Override
     public ResultBean<PagerVo<BaseVehicleOutVo>> pagerList(PagerQuery<BaseVehicleOutQuery> query) {
         ResultBean<PagerVo<BaseVehicleOutVo>> rb = ResultBean.fireFail();
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index 10b8586972..dca4e31e28 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -10,6 +10,8 @@ import com.yxt.anrui.base.api.basevehicleout.*;
 import com.yxt.anrui.base.biz.basemiddleman.BaseMiddlemanService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
@@ -48,9 +50,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private ScmWarehouseFeign scmWarehouseFeign;
     @Autowired
     private BaseMiddlemanService baseMiddlemanService;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
 
-    public ResultBean vehicleOut(BaseVehicleOutDto dto) {
+    public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        Boolean b = false;
        /* List<BaseVehicleOutQuery> list = dto.getQueryList();
         List<String > stringList = list.stream().map(BaseVehicleOutQuery -> BaseVehicleOutQuery.getVinSid()).collect(Collectors.toList());
         //根据sid查询出库的车辆是否符合出库条件（库存状态为库存或调入、且问题状态为无问题的、且为相同合同内的，车辆才能出库、可以批量选择）、当选择的车辆不满足条件时，点击出库按钮时
@@ -61,6 +66,30 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             return rb.setMsg(vinNo + "车辆不满足出库条件");
         }*/
 
+        String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+        Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
+        if (!aBoolean){
+            Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+            if (!aBoolean1){
+                List<BdCustomer> bdCustomers = new ArrayList<>();
+                BdCustomer bdCustomer = new BdCustomer();
+                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+                bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+                bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
+                String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+                if (FNumber1.length() > 30){
+                    FNumber1 = FNumber1.substring(0,30);
+                    bdCustomer.setFNumber(FNumber1);
+                }else {
+                    bdCustomer.setFNumber(FNumber1);
+                }
+                bdCustomers.add(bdCustomer);
+                finKingDeeFeign.draftBdCustomers(bdCustomers);
+            }else {
+                b = true;
+                return rb.setData(b);
+            }
+        }
         //查询出库的车辆是否满足出库条件
         int count = baseMapper.selectCountByVinSid(dto.getVinSid());
         if (count > 0) {
@@ -118,6 +147,95 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
+    public ResultBean isUpdateOrInsertCrm(BaseVehicleOutDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String isUpdateOrInsertCrm = dto.getIsUpdateOrInsertCrm();
+        if ("是".equals(isUpdateOrInsertCrm)){
+            List<BdCustomer> bdCustomers = new ArrayList<>();
+            BdCustomer bdCustomer = new BdCustomer();
+            String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+            if (FNumber.length() > 30){
+                FNumber = FNumber.substring(0,30);
+                bdCustomer.setFNumber(FNumber);
+            }else {
+                bdCustomer.setFNumber(FNumber);
+            }
+            bdCustomer.setFNumber(HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8));
+            bdCustomer.setOldFNumber(dto.getCustomerNo());
+            bdCustomers.add(bdCustomer);
+            finKingDeeFeign.saveBdCustomers(bdCustomers);
+        }else if ("否".equals(isUpdateOrInsertCrm)){
+            List<BdCustomer> bdCustomers = new ArrayList<>();
+            BdCustomer bdCustomer = new BdCustomer();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+            bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+            bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
+            String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+            if (FNumber1.length() > 30){
+                FNumber1 = FNumber1.substring(0,30);
+                bdCustomer.setFNumber(FNumber1);
+            }else {
+                bdCustomer.setFNumber(FNumber1);
+            }
+            bdCustomers.add(bdCustomer);
+            finKingDeeFeign.draftBdCustomers(bdCustomers);
+        }
+        //查询出库的车辆是否满足出库条件
+        int count = baseMapper.selectCountByVinSid(dto.getVinSid());
+        if (count > 0) {
+            return rb.setMsg(dto.getVinNo() + "车辆不满足出库条件");
+        }
+        //查询是否已出库
+        int counts = baseMapper.selectCountBySidVin(dto.getVinSid());
+        if (counts > 0) {
+            return rb.setMsg("该车辆已出库，不允许重复出库");
+        }
+        BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
+        BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
+        if (StringUtils.isNotBlank(dto.getPrice())) {
+            baseVehicleOut.setPrice(new BigDecimal(dto.getPrice()));
+        }
+        if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
+            baseVehicleOut.setSalesAllowance(new BigDecimal(dto.getSalesAllowance()));
+        }
+        if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) {
+            baseVehicleOut.setRebateMoneyOne(new BigDecimal(dto.getRebateMoneyOne()));
+        }
+        if (StringUtils.isNotBlank(dto.getRebateMoneyTwo())) {
+            baseVehicleOut.setRebateMoneyTwo(new BigDecimal(dto.getRebateMoneyTwo()));
+        }
+        baseMapper.insert(baseVehicleOut);
+        //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
+        String remarks = baseVehicleOut.getConcatNo() + baseVehicleOut.getType();
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(dto.getVinSid());
+        baseVehicle.setRemarks(remarks);
+        baseVehicle.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
+        baseVehicle.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
+        baseVehicle.setSalesDate(new Date());
+        if (StringUtils.isNotBlank(dto.getPrice())) {
+            baseVehicle.setSalePrice(Integer.valueOf(dto.getPrice()));
+        }
+        baseVehicleService.updateById(baseVehicle);
+        ////ToDo:推送财务中介单位、推送金蝶客户、推送金蝶出库单
+        try {
+            //推送财务客户信息
+            BdCustomer bdCustomer = createBdCustomer(baseVehicle, dto);
+            ResultBean resultBeanCustomer = finKingDeeFeign.updateSingleCustomer(bdCustomer);
+            //推送财务中介人
+            if (StringUtils.isNotBlank(dto.getMiddleOne())) {
+                BdCustomer bdMiddle = createBdMiddle(baseVehicle, dto);
+                ResultBean resultBeanMiddle = finKingDeeFeign.draftBdCustomer(bdMiddle);
+            }
+            //创建出库单数据对象前 需要将客户的编码修改为新生成的客户的编码。
+            dto.setCustomerNo(bdCustomer.getFNumber());
+            SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
+            ResultBean resultBean1 = finKingDeeFeign.draftSalOutStock(salOutStock);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        }
+        return rb.success();
+    }
+
     private BdCustomer createBdCustomer(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
         BdCustomer bdCustomer = new BdCustomer();
         String vinNo = baseVehicle.getVinNo();
@@ -343,7 +461,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(params.getOrgSid())){
                 qw.eq("bvo.createOrgSid",params.getOrgSid());
             }
-            qw.orderByDesc("bvo.saleDate");
         }
         IPage<BaseVehicleOutVo> pagging = baseMapper.selectPageVo(page, qw);
         for (BaseVehicleOutVo record : pagging.getRecords()) {
@@ -395,4 +512,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         }
         return rb.success().setData(maps);
     }
+
+
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 7ecf5ee227..d1179260b9 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -1157,7 +1157,13 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             BdCustomer bdCustomer = new BdCustomer();
             bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
             bdCustomer.setFName(crmCustomerTemp.getName() + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length()-8));
-            bdCustomer.setFNumber(HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length()-8));
+            String FNumber = HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length() - 8);
+            if (FNumber.length() > 30){
+                FNumber = FNumber.substring(0,30);
+                bdCustomer.setFNumber(FNumber);
+            }else {
+                bdCustomer.setFNumber(FNumber);
+            }
             bdCustomers.add(bdCustomer);
         }
         finKingDeeFeign.draftBdCustomers(bdCustomers);
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index e30525c726..e1296872a8 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -46,7 +46,6 @@ import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
 import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTask;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
-import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -365,7 +364,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
             for (FlowTask flowTask : flowList) {
                 FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
-                finPaymentrecordSourceLCVo.setName(flowTask.getAssigneeName());
+                finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName());
                 finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment());
                 finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(),"yyyy-MM-dd"));
                 finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
@@ -384,7 +383,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
             for (FlowTask flowTask : flowList) {
                 FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
-                finPaymentrecordSourceLCVo.setName(flowTask.getAssigneeName());
+                finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName());
                 finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment());
                 finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(),"yyyy-MM-dd"));
                 finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
@@ -402,9 +401,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         dataMap.put("payRemark", finPaymentrecord.getPayRemark());
         //获取图片路径
 //        String photoPath = "file://D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg";
-        String photoPath =fileUploadComponent.getUrlPrefix()+ "20211227/kbjl_20211227143750186948.jpg";
+        /*String photoPath =fileUploadComponent.getUrlPrefix()+ "20211227/kbjl_20211227143750186948.jpg";
         String photoPath64 = image2Base64(photoPath);
-        dataMap.put("photoPath64", photoPath64);
+        dataMap.put("photoPath64", photoPath64);*/
         //获取模板
         File file = new File(getClass().getClassLoader().getResource("ftl/prePaymentApply.ftl").getFile());
         String dir = getClassLoader().getResource("ftl").getPath();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index 3484a27408..a4dbc73f93 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -41,6 +41,7 @@ import com.yxt.anrui.scm.api.scmapplyinbound.*;
 import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
+import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleQuery;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
@@ -176,18 +177,28 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
      */
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> saveOrUpdateApplyInBound(ScmApplyInboundDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         List<ScmFileDto> scmFiles = dto.getScmFiles();
         // 验证车架号：不能为空、不能重复
-       /* List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-        List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
-        if (vehicleList.size() != vinNoList.size()) {
+        List<ScmApplyInboundVehicleDto> vehicleList1 = dto.getVehicleList();
+        List<String> vinNoList1 = vehicleList1.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
+        /*if (vehicleList.size() != vinNoList.size()) {
             return new ResultBean().fail().setMsg("车架号不能为空");
         }*/
         // 去重
-       /* long disCount = vinNoList.stream().distinct().count();
-        if (vinNoList.size() != disCount) {
+        /*long disCount = vinNoList1.stream().distinct().count();
+        if (vinNoList1.size() != disCount) {
             return new ResultBean().fail().setMsg("车架号不能重复");
         }*/
+        for (String s : vinNoList1) {
+            ScmApplyInboundVehicleQuery scmApplyInboundVehicleQuery = new ScmApplyInboundVehicleQuery();
+            scmApplyInboundVehicleQuery.setVinNo(s);
+            List<ScmApplyInboundVehicle> scmApplyInboundVehicles = scmApplyInboundVehicleService.listAll(scmApplyInboundVehicleQuery);
+            if (scmApplyInboundVehicles.size() > 0){
+                return rb.setMsg("车架号" + s + "已存在入库申请中，请重新填写");
+            }
+        }
+
 
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             // 验证数据库是否重复
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
index 9eb63c7e00..134347a7ee 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
@@ -123,11 +123,12 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
             record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
             if (record.getState() == 0) {
-                if (vo.getSurplusNumber() == 0) {
+                record.setShowBtn(true);
+               /* if (vo.getSurplusNumber() == 0) {
                     record.setShowBtn(true);
                 } else {
                     record.setShowBtn(false);
-                }
+                }*/
             } else {
                 record.setShowBtn(false);
             }