Merge remote-tracking branch 'origin/master'

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; // 是否要修改客户
 }

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

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

@@ -1054,6 +1054,7 @@
           AND modelSid = #{modelSid}
           AND modelConfigSid = #{configSid}
           AND createOrgSid = #{sellerOrgSid}
+          AND isDelete = 0
     </select>
 
     <select id="selVehicleByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
@@ -1146,6 +1147,7 @@
         FROM base_vehicle
         WHERE vinNo = #{vinNo}
           AND useOrgSid = #{useOrgSid}
+        AND isDelete = 0
     </select>
 
     <select id="vehicleRebatePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo">

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);
 
     /**
      * 详情以及修改回显接口

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

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) {
+    public String getCode(String modelSid, String createOrgSid) {
-        return baseMapper.getCode(modelSid,createOrgSid);
+        return baseMapper.getCode(modelSid, createOrgSid);
     }
 }

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">

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();

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

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -30,6 +30,8 @@ import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -112,14 +114,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private DictCommonFeign dictCommonFeign;
     @Autowired
     private BusDepositFeign busDepositFeign;
-    /*  @Autowired
-      private BusOrderFeign busOrderFeign;
-      @Autowired
-      private BusOrderDiscountFeign busOrderDiscountFeign;*/
-  /*  @Autowired
-    private BusOrderModelFeign busOrderModelFeign;
-    @Autowired
-    private BusOrderVehicleFeign busOrderVehicleFeign;*/
     @Autowired
     private BusDepositVehicleFeign busDepositVehicleFeign;
     @Autowired
@@ -152,6 +146,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private MessageFeign messageFeign;
     @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedDetailedFeign;
 
     private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1447,6 +1443,59 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                             commonAppendixService.insert(commonAppendix);
                         }
                     }
+                    //添加推送至款项确认的应收未收明细中
+                    if ("现车".equals(appOrderDetailsVo.getOrderType())) {
+                        List<String> vinList = appOrderModelInfoVo.getVinList();
+                        for (int i = 0; i < vinList.size(); i++) {
+                            UnCollectionDto unCollectionDto = new UnCollectionDto();
+                            //合同sid
+                            unCollectionDto.setContractSid(commonContract.getSid());
+                            //合同编号
+                            unCollectionDto.setContractNo(commonContract.getContractNo());
+                            //客户名称
+                            unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
+                            //客户sid
+                            unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+                            //客户类型
+                            unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
+                            //客户类型
+                            unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
+                            //客户头像
+                            unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
+                            unCollectionDto.setReceivablesName("订金");
+                            unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
+                            unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
+                            unCollectionDto.setVinNo(vinList.get(i).toString());
+                            unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
+                            finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                        }
+                    } else {
+                        int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue();
+                        for (int i = 0; i < qualiy; i++) {
+                            UnCollectionDto unCollectionDto = new UnCollectionDto();
+                            //合同sid
+                            unCollectionDto.setContractSid(commonContract.getSid());
+                            //合同编号
+                            unCollectionDto.setContractNo(commonContract.getContractNo());
+                            //客户名称
+                            unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
+                            //客户sid
+                            unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+                            //客户类型
+                            unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
+                            //客户类型
+                            unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
+                            //客户头像
+                            unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
+                            unCollectionDto.setReceivablesName("订金");
+                            unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
+                            unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
+                            unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
+                            finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                        }
+
+                    }
+
                     return commonContract.getSid();
                 });
             }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java

@@ -118,4 +118,7 @@ public class BusSalesOrder extends BaseEntity {
     private String financePlan;
     @ApiModelProperty(value = "付款类型下级value")
     private String financePlanValue;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -88,4 +88,7 @@ public class AppOrderDetailsVo implements Vo {
     private String financePlanValue;
     @ApiModelProperty("付款类型")
     private String payTypeKey;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.busmaindeposit;
 
 import cn.hutool.core.bean.BeanUtil;
+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;
@@ -62,6 +63,8 @@ import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCu
 import com.yxt.anrui.buscenter.biz.flow.FlowableService;
 import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
@@ -179,6 +182,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     private SysProUrlFeign sysProUrlFeign;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
 
 
     public PagerVo<BusMainDeposit> listPage(PagerQuery<BusMainDepositQuery> pq) {
@@ -1992,13 +1997,37 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 messageFlowableQuery.setMsgTitle("简易订单");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
-                //更新已选择的车架号的状态为简易订单锁定
+                //如果类型为订金，推送款项确认
-                //如果类型为订车
                 if (DictCommonEnum.DepositBillType.JYDD_DJ.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
+                    BusDeposit busDeposit = busDepositService.selectByBillSid(bv.getBusinessSid());
                     //推送款项确认
+                    FinConfirmDto finConfirmDto = new FinConfirmDto();
+                    //收款日期
+                    finConfirmDto.setCollectionDate(DateUtil.format(busDeposit.getPaymentDate(), "yyyy-MM-dd"));
+                    //收款银行key
+                    finConfirmDto.setCollectionBankKey(busDeposit.getProBankKey());
+                    //收款银行value
+                    finConfirmDto.setCollectionBank(busDeposit.getProBankValue());
+                    //收款银行账号key
+                    finConfirmDto.setCollectionBankNumKey(busDeposit.getProBankAccKey());
+                    //收款银行账号value
+                    finConfirmDto.setCollectionBankNum(busDeposit.getProBankAccValue());
+                    //收款方式key
+                    finConfirmDto.setCollectionTypeKey(busDeposit.getPayTypeKey());
+                    //收款银行value
+                    finConfirmDto.setCollectionTypeValue(busDeposit.getPayType());
+                    //付款方名称
+                    //收款金额
+                    finConfirmDto.setCollectionMoney(busDeposit.getDeposit().toString());
+                    //分公司sid
+                    finConfirmDto.setUseOrgSid(busDeposit.getOrgSid());
+                    //创建人sid
+                    finConfirmDto.setCreateBySid(busMainDeposit.getCreateBySid());
+                    finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
 
                 }
                 if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
+                    //更新已选择的车架号的状态为简易订单锁定
                     AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(bv.getBusinessSid()).getData();
                     List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
                     BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -195,7 +195,8 @@
                bo.orgSid,
                bo.billNo,
                bo.financePlanValue,
-               bo.payTypeKey
+               bo.payTypeKey,
+               bo.useOrgSid
         from bus_sales_order bo
         where sid = #{sid}
     </select>
@@ -230,15 +231,15 @@
 
     <select id="getApprovalContractList"
             resultType="com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo">
-        SELECT bo.sid as busSid,
+        SELECT bo.sid          as busSid,
-        bo.customerName as customerName,
+               bo.customerName as customerName,
-        bo.mobile as modelName,
+               bo.mobile       as modelName,
-        bsov.linkNo AS vin
+               bsov.linkNo     AS vin
         FROM bus_sales_order bo
-        LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
+                 LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
-            and length( bo.contractNo ) > 1
+              and length(bo.contractNo) > 1
         </where>
     </select>
     <select id="selectByContractNo"

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1422,6 +1422,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
                     busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                 }
+                //根据用户sid查询分公司sid
+                String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+                busSalesOrder.setUseOrgSid(useOrgSid);
                 boolean isSave = save(busSalesOrder);
                 if (!isSave) {
                     return rb.setMsg("保存失败");

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

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

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -108,4 +109,10 @@ public interface FinCollectionConfirmationFeign {
     @ApiOperation("手机端—查询可使用款项明细列表")
     @PostMapping("/getPaymentDetailsList")
     public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
+
+    @ApiOperation("简易订单-订金推送款项确认")
+    @PostMapping("/saveFinConfirm")
+    ResultBean saveFinConfirm(@RequestBody FinConfirmDto dto);
+
+
 }

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

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -113,4 +114,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean saveFinConfirm(FinConfirmDto dto) {
+        return null;
+    }
 }

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

@@ -0,0 +1,53 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.app;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/2 11:11
+ * @Description
+ */
+@Data
+public class FinConfirmDto implements Dto {
+    private static final long serialVersionUID = 943766899406641199L;
+    @ApiModelProperty("收款日期")
+    private String collectionDate;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBankKey;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBank;
+
+    @ApiModelProperty("收款银行账号")
+    private String collectionBankNumKey;
+
+    @ApiModelProperty("收款银行账号")
+    private String collectionBankNum;
+
+    @ApiModelProperty("收款方式")
+    private String collectionTypeKey;
+
+    @ApiModelProperty("收款方式")
+    private String collectionTypeValue;
+
+    @ApiModelProperty("付款方名称")
+    private String payerName;
+
+    @ApiModelProperty("收款金额")
+    private String collectionMoney;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+
+    private List<FinSelectDto> finSelectList = new ArrayList<>();
+
+}

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

@@ -0,0 +1,36 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.app;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/2 11:34
+ * @Description
+ */
+@Data
+public class FinSelectDto implements Dto {
+    private static final long serialVersionUID = -3886526423118907465L;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+    @ApiModelProperty("联系电话")
+    private String customerPhone;
+
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
+    @ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney;
+
+    @ApiModelProperty("认款申请日期")
+    private String subscriptionDate;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -90,4 +90,9 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("app获取账单详情")
     @PostMapping("/getCustomerBillDetail/{paymentSid}")
     public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid);
+
+    @ApiOperation("合同推送-款项确认应收未收")
+    @PostMapping("/saveUnCollection")
+    ResultBean saveUnCollection(@RequestBody UnCollectionDto dto);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -90,4 +90,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 	public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean saveUnCollection(UnCollectionDto dto) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/2 15:11
+ * @Description
+ */
+@Data
+public class UnCollectionDto implements Dto {
+    private static final long serialVersionUID = -6071524233335201421L;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("联系电话")
+    private String customerPhone;
+
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
+
+    @ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney;
+
+    @ApiModelProperty("款项类型key")
+    private String paymentTypeKey;
+    @ApiModelProperty("款项类型value")
+    private String paymentTypeValue;
+
+    @ApiModelProperty("客户头像")
+    private String customerImage;
+    @ApiModelProperty("客户类型")
+    private String customerClass;
+    @ApiModelProperty("客户类型key")
+    private String customerClassKey;
+
+}

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

@@ -27,6 +27,7 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -187,4 +188,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
         PagerVo<AppFinUncollectedReceivablesDetailedVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return new ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>>().success().setData(pagerVo);
     }
+
+    @Override
+    public ResultBean saveFinConfirm(FinConfirmDto dto) {
+        return finCollectionConfirmationService.saveFinConfirm(dto);
+    }
 }

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

@@ -33,6 +33,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
@@ -54,19 +55,15 @@ 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;
 
-import javax.xml.crypto.Data;
 import java.math.BigDecimal;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Project: anrui-fin(销售相关) <br/>
@@ -348,7 +345,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         IPage<AppFinCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
         for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
             BigDecimal balance = record.getBalance();
-            int i = balance.intValue();
+            int i = 0;
+            if(balance != null){
+                i = balance.intValue();
+            }
             int collectionBillState = record.getAuditState();
             if (i <= 0) {
                 if (collectionBillState == 1 && collectionBillState == 3) {
@@ -737,4 +737,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         return rb.success().setMsg("款项确认成功");
     }
+
+    public ResultBean saveFinConfirm(FinConfirmDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        FinCollectionConfirmation confirmation = new FinCollectionConfirmation();
+        BeanUtil.copyProperties(dto, confirmation);
+        baseMapper.insert(confirmation);
+        return rb.success();
+    }
 }

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();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -55,66 +54,71 @@ import java.util.List;
 @RequestMapping("/finuncollectedreceivablesdetailed")
 public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign {
 
-	@Autowired
+    @Autowired
-	private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
+    private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件查询所有数据列表")
+    @ApiOperation("根据条件查询所有数据列表")
-	@PostMapping("/listAll")
+    @PostMapping("/listAll")
-	public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query){
+    public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		List<DetailsOfReceivablesAndUncollectedItemsVo> list = finUncollectedReceivablesDetailedService.listAllVo(query);
+        List<DetailsOfReceivablesAndUncollectedItemsVo> list = finUncollectedReceivablesDetailedService.listAllVo(query);
-		return rb.success().setData(list);
+        return rb.success().setData(list);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("新增或修改保存")
+    @ApiOperation("新增或修改保存")
-	@PostMapping("/saveOrUpdate")
+    @PostMapping("/saveOrUpdate")
-	public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto){
+    public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto) {
-		return finUncollectedReceivablesDetailedService.saveOrUpdateDto(dto);
+        return finUncollectedReceivablesDetailedService.saveOrUpdateDto(dto);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<FinUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid){
+    public ResultBean<FinUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		FinUncollectedReceivablesDetailedVo vo = new FinUncollectedReceivablesDetailedVo();
+        FinUncollectedReceivablesDetailedVo vo = new FinUncollectedReceivablesDetailedVo();
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<CustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.listPageVo(pq);
+        PagerVo<CustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillDetailedListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillDetailedListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinUncollectedReceivablesDetailedVo> pv = finUncollectedReceivablesDetailedService.detailedListPageVo(pq);
+        PagerVo<FinUncollectedReceivablesDetailedVo> pv = finUncollectedReceivablesDetailedService.detailedListPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<AppCustomerBillSummaryDetailsVo> pv = finUncollectedReceivablesDetailedService.getCustomerBillList(pq);
+        PagerVo<AppCustomerBillSummaryDetailsVo> pv = finUncollectedReceivablesDetailedService.getCustomerBillList(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
+    public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<AppCustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.getCustomerBill2List(pq);
+        PagerVo<AppCustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.getCustomerBill2List(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
+    public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		AppCustomerBillDetailVo vo = finUncollectedReceivablesDetailedService.getCustomerBillDetail(paymentSid);
+        AppCustomerBillDetailVo vo = finUncollectedReceivablesDetailedService.getCustomerBillDetail(paymentSid);
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
+
+    @Override
+    public ResultBean saveUnCollection(UnCollectionDto dto) {
+        return finUncollectedReceivablesDetailedService.saveUnCollection(dto);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -27,14 +27,8 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
-import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationQuery;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
@@ -54,7 +48,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -477,4 +470,16 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         }
         return vo;
     }
+
+    public ResultBean saveUnCollection(UnCollectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        FinUncollectedReceivablesDetailed detailed = new FinUncollectedReceivablesDetailed();
+        BeanUtils.copyProperties(dto, detailed);
+        detailed.setVIN(dto.getVinNo());
+        if (StringUtils.isNotBlank(dto.getCurrentReceivableMoney())) {
+            detailed.setCurrentReceivableMoney(new BigDecimal(dto.getCurrentReceivableMoney()));
+        }
+        baseMapper.insert(detailed);
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java

@@ -143,11 +143,11 @@ public class BdMaterialService extends FinKingDeeService {
             draftFCategoryId(map_fEntityModel_);
             ResultBean<String> draft = draft(kingDeeData);
             String data = draft.getData();
-            ResultBean<String> submit = submit(KingDeeBillId.BD_MATERIAL.getID(),data);
+            String id = draftResultGetId(data);
+            ResultBean<String> submit = submit(KingDeeBillId.BD_MATERIAL.getID(),id);
             if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData());
-            ResultBean<String> audit = audit(KingDeeBillId.BD_MATERIAL.getID(),data);
+            ResultBean<String> audit = audit(KingDeeBillId.BD_MATERIAL.getID(),id);
             if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());
-            String id = draftResultGetId(draft.getData());
             ResultBean<String> allocate = allocate(KingDeeBillId.BD_MATERIAL.getID(),id, map_fEntityModel_.get("TOrgIds"));
             if (!allocate.getSuccess()) return rb.setCode(KingDeeCode.ALLOCATE.getCode()).setData(allocate.getData());
             return draft;

anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl

@@ -23,11 +23,9 @@
               pkg:contentType="application/vnd.openxmlformats-package.relationships+xml">
         <pkg:xmlData>
             <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-                <Relationship Id="rId5"
+                <Relationship Id="rId4"
                               Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"
                               Target="fontTable.xml"/>
-                <Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
-                              Target="media/image1.png"/>
                 <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"
                               Target="theme/theme1.xml"/>
                 <Relationship Id="rId2"
@@ -94,8 +92,7 @@
                                 <w:vertAlign w:val="baseline"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t>河北安瑞汽车租赁集团有限公司
+                            <w:t>河北安瑞汽车租赁集团有限公司 创建时间：${createTime!}</w:t>
-                                创建时间：${createTime!}</w:t>
                         </w:r>
                     </w:p>
                     <w:tbl>
@@ -200,6 +197,10 @@
                                     <w:insideH w:val="single" w:color="auto" w:sz="4" w:space="0"/>
                                     <w:insideV w:val="single" w:color="auto" w:sz="4" w:space="0"/>
                                 </w:tblBorders>
+                                <w:tblCellMar>
+                                    <w:left w:w="108" w:type="dxa"/>
+                                    <w:right w:w="108" w:type="dxa"/>
+                                </w:tblCellMar>
                             </w:tblPrEx>
                             <w:trPr>
                                 <w:trHeight w:val="454" w:hRule="atLeast"/>
@@ -239,7 +240,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -308,7 +309,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -377,7 +378,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -446,7 +447,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -495,6 +496,7 @@
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
                                     </w:pPr>
+                                    <w:bookmarkStart w:id="0" w:name="_GoBack"/>
                                     <w:r>
                                         <w:rPr>
                                             <w:rFonts w:hint="eastAsia"/>
@@ -515,7 +517,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -531,6 +533,7 @@
                                 </w:p>
                             </w:tc>
                         </w:tr>
+                        <w:bookmarkEnd w:id="0"/>
                         <w:tr>
                             <w:tblPrEx>
                                 <w:tblBorders>
@@ -584,11 +587,18 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
                                     </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:r>
                                 </w:p>
                             </w:tc>
                         </w:tr>
@@ -645,7 +655,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -714,7 +724,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -783,7 +793,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -796,8 +806,6 @@
                                         </w:rPr>
                                         <w:t>${payRemark!}</w:t>
                                     </w:r>
-                                    <w:bookmarkStart w:id="0" w:name="_GoBack"/>
-                                    <w:bookmarkEnd w:id="0"/>
                                 </w:p>
                             </w:tc>
                         </w:tr>
@@ -854,7 +862,7 @@
                                     <w:pPr>
                                         <w:jc w:val="both"/>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia"/>
+                                            <w:rFonts w:hint="default"/>
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
@@ -913,77 +921,45 @@
                                     </w:r>
                                 </w:p>
                             </w:tc>
-                            <#list lcList?sort_by("spsj") as lc>
+                            <w:tc>
-                                <w:tc>
+                                <w:tcPr>
-                                    <w:tcPr>
+                                    <w:tcW w:w="3864" w:type="pct"/>
-                                        <w:tcW w:w="3864" w:type="pct"/>
+                                </w:tcPr>
-                                        <w:noWrap w:val="0"/>
+                                <w:p>
-                                        <w:vAlign w:val="center"/>
+                                   <#list lcList as lc>
-                                    </w:tcPr>
+
-                                    <w:p>
+                                       <w:pPr>
-                                        <w:pPr>
+                                           <w:jc w:val="left"/>
-                                            <w:keepNext w:val="0"/>
+                                           <w:rPr>
-                                            <w:keepLines w:val="0"/>
+                                               <w:rFonts w:hint="default"/>
-                                            <w:pageBreakBefore w:val="0"/>
+                                               <w:vertAlign w:val="baseline"/>
-                                            <w:widowControl w:val="0"/>
+                                               <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
-                                            <w:kinsoku/>
+                                           </w:rPr>
-                                            <w:wordWrap/>
+                                       </w:pPr>
-                                            <w:overflowPunct/>
+                                            <w:r>
-                                            <w:topLinePunct w:val="0"/>
+                                        <w:rPr>
-                                            <w:autoSpaceDE/>
+                                            <w:rFonts w:hint="eastAsia"/>
-                                            <w:autoSpaceDN/>
+                                            <w:vertAlign w:val="baseline"/>
-                                            <w:bidi w:val="0"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
-                                            <w:adjustRightInd/>
+                                        </w:rPr>
-                                            <w:snapToGrid/>
+                                        <w:t >
-                                            <w:jc w:val="both"/>
+                                            ${lc.name!}|${lc.comment!}|${lc.spsj!}
-                                            <w:textAlignment w:val="auto"/>
+                                        </w:t>
-                                            <w:rPr>
+                                     </w:r>
-                                                <w:rFonts w:hint="default"/>
+
-                                                <w:vertAlign w:val="baseline"/>
+                                  </#list>
-                                                <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                </w:p>
-                                            </w:rPr>
+                            </w:tc>
-                                        </w:pPr>
-                                        <w:r>
-                                            <w:rPr>
-                                                <w:rFonts w:hint="eastAsia"/>
-                                                <w:vertAlign w:val="baseline"/>
-                                                <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
-                                            </w:rPr>
-                                            <w:t xml:space="preserve">${lc.name!}&nbsp;&nbsp;${lc.omment!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${lc.spsj!}</w:t>
-                                        </w:r>
-                                    </w:p>
-                                </w:tc>
-                            </#list>
                         </w:tr>
                     </w:tbl>
                     <w:p>
                         <w:pPr>
-                            <w:ind w:left="0" w:leftChars="0" w:firstLine="420" w:firstLineChars="200"/>
                             <w:jc w:val="both"/>
                             <w:rPr>
                                 <w:rFonts w:hint="default" w:eastAsia="宋体"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
                         </w:pPr>
-                        <w:r>
-                            <w:rPr>
-                                <w:rFonts w:hint="default" w:eastAsia="宋体"/>
-                                <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
-                            </w:rPr>
-                            <w:pict>
-                                <v:shape id="_x0000_i1025" o:spt="75" alt="1" type="#_x0000_t75"
-                                         style="height:320.1pt;width:374.8pt;" filled="f" o:preferrelative="t"
-                                         stroked="f" coordsize="21600,21600">
-                                    <v:path/>
-                                    <v:fill on="f" focussize="0,0"/>
-                                    <v:stroke on="f"/>
-                                    <v:imagedata r:id="rId4" o:title="1"/>
-                                    <o:lock v:ext="edit" aspectratio="t"/>
-                                    <w10:wrap type="none"/>
-                                    <w10:anchorlock/>
-                                </v:shape>
-                            </w:pict>
-                        </w:r>
                     </w:p>
                     <w:sectPr>
                         <w:pgSz w:w="11906" w:h="16838"/>
@@ -1002,15 +978,15 @@
             <Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
                         xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
                 <Template>Normal.dotm</Template>
-                <Pages>2</Pages>
+                <Pages>1</Pages>
-                <Words>84</Words>
+                <Words>73</Words>
-                <Characters>264</Characters>
+                <Characters>108</Characters>
                 <Lines>0</Lines>
                 <Paragraphs>0</Paragraphs>
                 <TotalTime>4</TotalTime>
                 <ScaleCrop>false</ScaleCrop>
                 <LinksUpToDate>false</LinksUpToDate>
-                <CharactersWithSpaces>309</CharactersWithSpaces>
+                <CharactersWithSpaces>122</CharactersWithSpaces>
                 <Application>WPS Office_11.1.0.12598_F1E327BC-269C-435d-A152-05C5408002CA</Application>
                 <DocSecurity>0</DocSecurity>
             </Properties>
@@ -1025,8 +1001,8 @@
                                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                 <dcterms:created xsi:type="dcterms:W3CDTF">2014-10-29T12:08:00Z</dcterms:created>
                 <dc:creator>God</dc:creator>
-                <cp:lastModifiedBy>God</cp:lastModifiedBy>
+                <cp:lastModifiedBy>功夫熊猫</cp:lastModifiedBy>
-                <dcterms:modified xsi:type="dcterms:W3CDTF">2022-10-31T01:05:50Z</dcterms:modified>
+                <dcterms:modified xsi:type="dcterms:W3CDTF">2022-11-02T08:31:00Z</dcterms:modified>
             </cp:coreProperties>
         </pkg:xmlData>
     </pkg:part>
@@ -1039,7 +1015,7 @@
                     <vt:lpwstr>2052-11.1.0.12598</vt:lpwstr>
                 </property>
                 <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="3" name="ICV">
-                    <vt:lpwstr>995D509E4C0348AABAC9EB9BB6072747</vt:lpwstr>
+                    <vt:lpwstr>046113D258F44AE9B09038F928168180</vt:lpwstr>
                 </property>
             </Properties>
         </pkg:xmlData>
@@ -1118,10 +1094,6 @@
             </w:fonts>
         </pkg:xmlData>
     </pkg:part>
-    <pkg:part pkg:name="/word/media/image1.png" pkg:contentType="image/png">
-        <pkg:binaryData>${photoPath64!}
-        </pkg:binaryData>
-    </pkg:part>
     <pkg:part pkg:name="/word/settings.xml"
               pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml">
         <pkg:xmlData>
@@ -1134,7 +1106,7 @@
                         xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
                         xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
                         xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData" mc:Ignorable="w14">
-                <w:zoom w:percent="100"/>
+                <w:zoom w:percent="90"/>
                 <w:bordersDoNotSurroundHeader w:val="0"/>
                 <w:bordersDoNotSurroundFooter w:val="0"/>
                 <w:documentProtection w:enforcement="0"/>
@@ -1173,16 +1145,13 @@
                                      w:val="11"/>
                 </w:compat>
                 <w:docVars>
-                    <w:docVar w:name="commondata" w:val="eyJoZGlkIjoiMTEzNjlmMDVlOTZjY2Q3MzUzYmU5YmI5NTJmOWQ0MWUifQ=="/>
+                    <w:docVar w:name="commondata" w:val="eyJoZGlkIjoiNzM2OTAxMDQ1MzNiYTkzMmViNTM5ZjkwMDRiNGFhMDIifQ=="/>
                 </w:docVars>
                 <w:rsids>
                     <w:rsidRoot w:val="00000000"/>
                     <w:rsid w:val="01875DDB"/>
-                    <w:rsid w:val="047F0FEB"/>
                     <w:rsid w:val="082F42A7"/>
                     <w:rsid w:val="0AAE113B"/>
-                    <w:rsid w:val="11877731"/>
-                    <w:rsid w:val="12B05686"/>
                     <w:rsid w:val="177B3894"/>
                     <w:rsid w:val="181D2B9D"/>
                     <w:rsid w:val="25116ADE"/>
@@ -1190,19 +1159,16 @@
                     <w:rsid w:val="284C7177"/>
                     <w:rsid w:val="32EB76C8"/>
                     <w:rsid w:val="35883105"/>
-                    <w:rsid w:val="3B077069"/>
+                    <w:rsid w:val="39893797"/>
                     <w:rsid w:val="41583789"/>
                     <w:rsid w:val="49773081"/>
+                    <w:rsid w:val="50B821E1"/>
                     <w:rsid w:val="53F113E8"/>
                     <w:rsid w:val="550F5041"/>
                     <w:rsid w:val="57113E86"/>
-                    <w:rsid w:val="5D380EAD"/>
-                    <w:rsid w:val="5E0F7E5F"/>
                     <w:rsid w:val="600A4D82"/>
-                    <w:rsid w:val="68386205"/>
-                    <w:rsid w:val="69AA4EE0"/>
                     <w:rsid w:val="6E1B63AC"/>
-                    <w:rsid w:val="7ECF2FC7"/>
+                    <w:rsid w:val="7CC141BB"/>
                     <w:rsid w:val="7F3930C9"/>
                 </w:rsids>
                 <m:mathPr>

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -217,8 +217,7 @@ public class FlowableRest implements FlowableFeign {
         String nextUserSid = dto.getNextNodeUserSids();
         if(StringUtils.isBlank(nextUserSid)){
             ResultBean<UserAndOrgPath> nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto);
-            if (!nextNodeUserSidsOfSubmit.getSuccess()|| nextNodeUserSidsOfSubmit.getData()==null
+            if (!nextNodeUserSidsOfSubmit.getSuccess()) {
-                    || StringUtils.isBlank(nextNodeUserSidsOfSubmit.getData().getUserSid())) {
                 return rb.setMsg("nextUserSid 不能为空！");
             }
             nextUserSid=nextNodeUserSidsOfSubmit.getData().getUserSid();
@@ -265,10 +264,10 @@ public class FlowableRest implements FlowableFeign {
             log.error("formVariables:{}",JSON.toJSONString(formVariables));
             taskService.setAssignee(taskId, userSid);
             //formVariables.remove("userSid");
-            for(Map.Entry<String, Object> entry:formVariables.entrySet()){
+            /*for(Map.Entry<String, Object> entry:formVariables.entrySet()){
                 taskService.setVariable(taskId,entry.getKey(),entry.getValue());
                 System.out.println(entry.getKey()+"--->"+entry.getValue());
-            }
+            }*/
             taskService.complete(taskId, formVariables);
             //根据流程实例的id取最新的待办环节，给环节设置上用户sid
             ResultBean<List<LatestTaskVo>> ll = flowtaskService.getLatestTasksNew(instanceId);
@@ -284,6 +283,7 @@ public class FlowableRest implements FlowableFeign {
                     System.out.println(entry.getKey()+"--->"+entry.getValue());
                 }*/
                // taskService.setVariables(id_,formVariables);
+                //在act_ru_variable表中增加环节上的业务参数的变量
                 taskService.setVariablesLocal(id_,formVariables);
                 nodeState = latestTaskVo.getName_();
                 taskDefKey = latestTaskVo.getTask_def_key_();
@@ -391,6 +391,7 @@ public class FlowableRest implements FlowableFeign {
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
+        String orgPath = resultBean.getData().get(0).getOrgPath();
         String nodeState = resultBean.getData().get(0).getName_();
         String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
         String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
@@ -402,6 +403,10 @@ public class FlowableRest implements FlowableFeign {
        /* if (incomingSourceRef.contains("start")) {
             vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode());
         }*/
+        Map<String, Object> formVariables=new HashMap<>();
+        formVariables.put("orgPath",orgPath);
+        //在act_ru_variable表中增加环节上的业务参数的变量
+        taskService.setVariablesLocal(taskId,formVariables);
         ResultBean resultBean1 = ResultBean.fireSuccess();
         return resultBean1.success().setData(vo);
     }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java

@@ -31,7 +31,7 @@ public class SysMobileMenu extends BaseEntity {
     private String path;
 
     @ApiModelProperty("排序")
-    private String sortNo;
+    private Integer sortNo;
 
     @ApiModelProperty("父级sid")
     private String psid;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java

@@ -37,6 +37,9 @@ public class SysMobileMenuService extends MybatisBaseService<SysMobileMenuMapper
                     sysMobileMenu.setIconUrl(sysMobileMenu.getIconUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
                 }
             }
+            if (StringUtils.isNotBlank(dto.getSortNo())) {
+                sysMobileMenu.setSortNo(Integer.valueOf(dto.getSortNo()));
+            }
             baseMapper.insert(sysMobileMenu);
             sid = sysMobileMenu.getSid();
         } else {
@@ -50,6 +53,9 @@ public class SysMobileMenuService extends MybatisBaseService<SysMobileMenuMapper
                     sysMobileMenu.setIconUrl(sysMobileMenu.getIconUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
                 }
             }
+            if (StringUtils.isNotBlank(dto.getSortNo())) {
+                sysMobileMenu.setSortNo(Integer.valueOf(dto.getSortNo()));
+            }
             baseMapper.updateById(sysMobileMenu);
 
         }

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,19 +177,19 @@ 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<ScmApplyInboundVehicleDto> vehicleList1 = dto.getVehicleList();
-        List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
+        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();
+        /*long disCount = vinNoList1.stream().distinct().count();
-        if (vinNoList.size() != disCount) {
+        if (vinNoList1.size() != disCount) {
             return new ResultBean().fail().setMsg("车架号不能重复");
         }*/
-
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             // 验证数据库是否重复
            /* for (int i = 0; i < vinNoList.size(); i++) {
@@ -252,13 +253,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             // 验证数据库是否重复
             for (int i = 0; i < vinNoList.size(); i++) {
-                int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), dto.getSid());
+                int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i));
                 BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
                 if (count != 0) {
-                    return new ResultBean().setMsg("车架号已经存在");
+                    return new ResultBean().setMsg(vinNoList.get(i) + "车架号已经存在");
                 }
                 if (data != null) {
-                    return new ResultBean().setMsg("车架号已经存在");
+                    return new ResultBean().setMsg(vinNoList.get(i) + "车架号已经存在");
                 }
             }
             ScmApplyInbound scmApplyInbound = fetchBySid(dto.getSid());
@@ -456,7 +457,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
             dto.setVehicleList(scmApplyInboundVehicleDtos2);
             dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
-            saveOrUpdateApplyInBound(dto);
+            ResultBean<String> stringResultBean = saveOrUpdateApplyInBound(dto);
+            if (!stringResultBean.getSuccess()){
+                return new ResultBean().setMsg(stringResultBean.getMsg());
+            }
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
@@ -603,6 +607,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             baseVehicleDto.setManufacturerSid(baseVehicleBrand.getManufacturerSid());
             //厂商code
             baseVehicleDto.setManufacturerCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());
+            //供应商名称
+            baseVehicleDto.setSupplierName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
             //供应商sid
             baseVehicleDto.setSupplierSid(baseVehicleBrand.getManufacturerSid());
             //供应商code

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.java

@@ -34,7 +34,7 @@ public interface ScmApplyInboundVehicleMapper extends BaseMapper<ScmApplyInbound
 	
 	IPage<ScmApplyInboundVehicleVo> selectPageVo(IPage<ScmApplyInboundVehicle> page, @Param(Constants.WRAPPER) Wrapper<ScmApplyInboundVehicle> qw);
 	
-	int checkVinNo(@Param("vinNo") String vinNo, @Param("applySid") String applySid);
+	int checkVinNo(@Param("vinNo") String vinNo);
 
 	List<ScmApplyInboundVehicleVo> selectListByAppSid(@Param("applySid") String applySid);
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml

@@ -9,9 +9,6 @@
 
 	<select id="checkVinNo" resultType="int">
 		SELECT count(1) FROM scm_apply_inbound_vehicle WHERE vinNo=#{vinNo}
-		<if test="applySid != null and applySid !='' ">
-			AND applySid != #{applySid}
-		</if>
 	</select>
 
 	<select id="selectListByAppSid" resultType="com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo">

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java

@@ -75,8 +75,8 @@ public class ScmApplyInboundVehicleService extends MybatisBaseService<ScmApplyIn
 	 * 验证车架号是否重复
 	 * @return
 	 */
-	public int checkVinNo(String vinNo, String applySid) {
+	public int checkVinNo(String vinNo) {
-		return baseMapper.checkVinNo(vinNo, applySid);
+		return baseMapper.checkVinNo(vinNo);
 	}
 
 	/**

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

@@ -448,6 +448,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                         //供应商code
                         BaseManufacturerAllVo baseManufacturerAllVo1 = baseManufacturerFeign.details(applicationDetailsVo.getPurchasingUnitSid()).getData();
                         baseVehicleDto.setSupplierCode(baseManufacturerAllVo1.getBaseManufacturerDto().getManufacturerCode());
+                        //供应商名称
+                        baseVehicleDto.setSupplierName(baseManufacturerAllVo1.getBaseManufacturerDto().getManufacturerName());
                         if (resultBeanBaseManu.getData() != null) {
                             BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(resultBeanBaseManu.getData().getManufacturerSid()).getData();
                             baseVehicleDto.setManufacturerSid(resultBeanBaseManu.getData().getManufacturerSid());
@@ -536,6 +538,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     //供应商code
                     SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(internalPurchaseDetailsVo.getSellerOrgSid()).getData();
                     baseVehicleDto.setSupplierCode(sysOrganizationVo2.getOtherCode());
+                    //供应商名称
+                    baseVehicleDto.setSupplierName(sysOrganizationVo2.getName());
                     //厂商sid 品牌 和 品牌 sid
                     BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(internalPurchaseDetailsVo.getBrandSid());
                     if (baseVehicleBrand != null) {

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