Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@@ -228,7 +228,7 @@ public interface CommonContractFeign {
     @ApiOperation("查询合同编号")
     @GetMapping("/selectContractNo")
     @ResponseBody
-    ResultBean<String> selectContractNo(@RequestParam("userSid")String userSid,@RequestParam("modelSid")String modelSid);
+    ResultBean<String> selectContractNo(@RequestParam("orgSid")String orgSid,@RequestParam("modelSid")String modelSid);
 
     @ApiOperation("生成合同")
     @PostMapping("/saveContract")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@@ -239,7 +239,7 @@ public class CommonContractFeignFallback implements CommonContractFeign {
     }
 
     @Override
-    public ResultBean<String> selectContractNo(String userSid, String modelSid) {
+    public ResultBean<String> selectContractNo(String orgSid, String modelSid) {
         return null;
     }
 

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

@@ -242,7 +242,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             baseInternalPurchase.setSid(sid);
             //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
             //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
-            String billNo = getApplyCode(dto.getCreateBySid());
+            String billNo = getApplyCode(orgSidPath);
             baseInternalPurchase.setNodeState("待提交");
             baseInternalPurchase.setApplyNo(billNo);
             baseInternalPurchase.setOrgSidPath(orgSidPath);
@@ -288,9 +288,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         return rb.success().setMsg("修改成功").setData(dtoSid);
     }
 
-    public String getApplyCode(String userSid) {
+    public String getApplyCode(String orgSidPath) {
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -273,7 +273,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
                     ScmApplyInboundDto scmApplyInbound = new ScmApplyInboundDto();
                     //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
                     //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
-                    String billNo = getApplyCode(dto.getUserSid());
+                    String billNo = getApplyCode(busVehicleApplyDetailsVo.getCreateOrgSid());
                     scmApplyInbound.setApplicationCode(billNo);
                     scmApplyInbound.setOrgPriceDate(DateUtil.formatDate(new Date()));
                     scmApplyInbound.setModelSid(vo.getVehicleSid());
@@ -306,10 +306,9 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         return rb.success().setMsg("操作成功");
     }
 
-    public String getApplyCode(String userSid) {
+    public String getApplyCode(String orgSid) {
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@@ -147,7 +147,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
             baseManufacturerRetware.setSid(sid);
             //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
             //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
-            String billNo = getApplyCode(dto);
+            String billNo = getApplyCode(baseManufacturerRetware.getUseOrgSid());
             baseManufacturerRetware.setApplyNo(billNo);
             baseManufacturerRetware.setAppluDate(DateUtil.today());
             baseManufacturerRetware.setState(0);
@@ -181,11 +181,9 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         return rb.success().setMsg("修改成功");
     }
 
-    public String getApplyCode(BaseManufacturerRetwareDto dto) {
+    public String getApplyCode(String useOrgSid) {
-        String userSid = dto.getCreateBySid();
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);

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

@@ -198,7 +198,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         }
         if (StringUtils.isBlank(sid)) {//新增
             BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
-            String billNo = getApplyCode(dto.getUserSid());
+            String billNo = getApplyCode(orgPath);
             dto.setApplicationCode(billNo);
             BeanUtil.copyProperties(dto, entity,"sid");
             entity.setApplicationCode(billNo);
@@ -367,9 +367,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
     }
 
-    public String getApplyCode(String userSid) {
+    public String getApplyCode(String orgPath) {
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgPath);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -283,7 +283,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             BeanUtil.copyProperties(dto, entity, "sid");
             //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号
             //获取单据名称大写首字母+分公司编码+年份+月份
-            String billNo = getApplyCode(dto);
+            String billNo = getApplyCode(orgSidPath);
             entity.setApplicationCode(billNo);
             entity.setApplicationDate(DateUtil.today());
             entity.setOrgSidPath(orgSidPath);
@@ -369,10 +369,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         return rb.success().setData(sid);
     }
 
-    public String getApplyCode(BusVehicleApplyDto dto) {
+    public String getApplyCode(String orgSidPath) {
-        String userSid = dto.getCreateBySid();
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -250,7 +250,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
                 ScmApplyInboundDto scmApplyInbound = new ScmApplyInboundDto();
                 //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
                 //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
-                String billNo = getApplyCode(dto.getUserSid());
+                String billNo = getApplyCode(vehicleOrder.getUseOrgSid());
                 scmApplyInbound.setApplicationCode(billNo);
                 String purchaseApplyMediumModelSid = dto.getPurchaseApplyMediumModelSid();
                 BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(purchaseApplyMediumModelSid);
@@ -287,10 +287,9 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
        /* }*/
     }
 
-    public String getApplyCode(String userSid) {
+    public String getApplyCode(String orgSid) {
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);

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

@@ -605,8 +605,8 @@ public class CommonContractRest implements CommonContractFeign {
     }
 
     @Override
-    public ResultBean<String> selectContractNo(String userSid, String modelSid) {
+    public ResultBean<String> selectContractNo(String orgSid, String modelSid) {
-        return commonContractService.selectContractNo(userSid,modelSid);
+        return commonContractService.selectContractNo(orgSid,modelSid);
     }
 
     @Override

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

@@ -1889,7 +1889,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String contractNo = "";
         CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());
         if (commonContractBuscenterVo == null) {
-            contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
+            contractNo = getApplyCode(appOrderDetailsVo.getUseOrgSid(), appOrderModelInfoVo.getModelSid());
         }else{
             contractNo = commonContractBuscenterVo.getContractNo();
         }
@@ -2239,10 +2239,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return rb.success().setData(list);
     }
 
-    public String getApplyCode(String userSid, String modelSid) {
+    public String getApplyCode(String orgSid, String modelSid) {
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgAbbre();
         //根据车型sid查询品牌简称
         String brandCode = baseVehicleBrandService.selectShortName(modelSid);
@@ -2601,9 +2600,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return rb.success().setData(String.valueOf(count));
     }
 
-    public ResultBean<String> selectContractNo(String userSid, String modelSid) {
+    public ResultBean<String> selectContractNo(String orgSid, String modelSid) {
         ResultBean<String> rb = ResultBean.fireFail();
-        String contractNo = getApplyCode(userSid,modelSid);
+        String contractNo = getApplyCode(orgSid,modelSid);
         return rb.success().setData(contractNo);
     }
 

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

@@ -763,7 +763,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         //判断订单sid是否有值(无值 新增 有值 修改)
         if (StringUtils.isBlank(dto.getVirtualOrderSid())) { //新增
             BusMainDeposit busMainDeposit = new BusMainDeposit();
-            busMainDeposit.setBillNo(getApplyCode1(dto));
+            busMainDeposit.setBillNo(getApplyCode1(useOrgSid));
             busMainDeposit.setStaffSid(data.getStaffSid());
             busMainDeposit.setStaffName(dto.getStaffName());
             busMainDeposit.setOrgSid(useOrgSid);
@@ -805,11 +805,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
     }
 
-    public String getApplyCode1(AppBusDepositBuscenterDto dto) {
+    public String getApplyCode1(String orgSid) {
-        String userSid = dto.getUserSid();
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
@@ -825,11 +823,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return billNo;
     }
 
-    public String getApplyCode2(AppBusDepositVehicleDto dto) {
+    public String getApplyCode2(String orgSid) {
-        String userSid = dto.getUserSid();
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
@@ -1219,7 +1215,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         if (StringUtils.isBlank(dto.getVirtualOrderSid())) {//新增
             BusMainDeposit busMainDeposit = new BusMainDeposit();
-            busMainDeposit.setBillNo(getApplyCode2(dto));
+            busMainDeposit.setBillNo(getApplyCode2(useOrgSid));
             busMainDeposit.setCreateBySid(dto.getUserSid());
             busMainDeposit.setStaffSid(data.getStaffSid());
             busMainDeposit.setStaffName(dto.getStaffName());

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

@@ -118,6 +118,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -1642,8 +1643,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto());
                 busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType());
                 busSalesOrder.setCustomerClassKey(customerTempInfoVo.getCustomerTypeKey());
-                String billNo = getApplyCode(dto.getUserSid());
+
-                busSalesOrder.setBillNo(billNo);
                 busSalesOrder.setCreateDate(new Date());
                 if ("0".equals(affiliatedType)) {
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
@@ -1676,6 +1676,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrder.setOrgSid(orgSid);
                 busSalesOrder.setOrgSidPath(orgSidPath);
                 busSalesOrder.setUseOrgSid(useOrgSid);
+                String billNo = getApplyCode(useOrgSid);
+                busSalesOrder.setBillNo(billNo);
                 boolean isSave = save(busSalesOrder);
                 if (!isSave) {
                     return rb.setMsg("保存失败");
@@ -1740,10 +1742,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setData(sid);
     }
 
-    public String getApplyCode(String userSid) {
+    public String getApplyCode(String orgSid) {
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
@@ -3257,7 +3258,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
         AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo();
         String modelSid = appOrderModelInfoVo.getModelSid();
-        String finalContractNo = commonContractFeign.selectContractNo(userSid,modelSid).getData();
+        String finalContractNo = commonContractFeign.selectContractNo(appOrderDetailsVo.getUseOrgSid(),modelSid).getData();
         //甲方
         String createOrgName = appOrderDetailsVo.getSalesOrg();
         //乙方
@@ -3325,7 +3326,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
         commonContractFeign.saveContract(commonContract);
         baseMapper.updateContractNoBySid(commonContract.getContractNo(),sid);
-        saveFinSelect(appOrderDetailsVo,commonContract,userSid);
+        ResultBean<List<FinUncollectedReceivablesDetailed>> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo());
+        List<FinUncollectedReceivablesDetailed> finUncollectedReceivablesDetailedList = listResultBean.getData();
+        if(finUncollectedReceivablesDetailedList.size() == 0){
+            saveFinSelect(appOrderDetailsVo,commonContract,userSid);
+        }
+
     }
 
     public void saveFinSelect(AppOrderDetailsVo appOrderDetailsVo,CommonContract commonContract,String userSid){
@@ -3340,7 +3346,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
         //单台成交价与单台订金相等
-        if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
+       /* if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
             String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
             List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
             for (int i = 0; i < vinList.size(); i++) {
@@ -3373,7 +3379,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
             }
-        }
+        }*/
         //添加推送至款项确认的应收未收明细中
         List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
         //更新销售订单的临时号
@@ -3486,6 +3492,55 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         busSalesOrderVehicleService.insert(busSalesOrderVehicle);
                     }
                 }*/
+                //推送款项车款=====================================
+                AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
+                AppOrderPriceInfoVo priceInfo = vo.getPriceInfo();
+                AppOrderDepositInfoVo depositInfo = vo.getDepositInfo();
+                //查询销售订单的单台订金与单台成交价是否相等，若不相等，则推送车款为成交价减去订金的，推送订金的为单台订金的
+                String singleFinalPrice = priceInfo.getSingleFinalPrice();
+                String deposit = depositInfo.getDeposit();
+                //查询台数
+                String num = priceInfo.getNumber();
+                //单台成交价
+                String transactionPrice = priceInfo.getSingleFinalPrice();
+                ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
+                CommonContract commonContract = commonContractResultBean.getData();
+                //单台成交价与单台订金相等
+                if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
+                    String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
+                    List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
+                    for (int i = 0; i < vinList.size(); i++) {
+                        UnCollectionDto unCollectionDto = new UnCollectionDto();
+                        //合同sid
+                        unCollectionDto.setContractSid(commonContract.getSid());
+                        //合同编号
+                        unCollectionDto.setContractNo(commonContract.getContractNo());
+                        //客户名称
+                        unCollectionDto.setCustomerName(vo.getName());
+                        //客户sid
+                        unCollectionDto.setCustomerSid(vo.getCustomerSid());
+                        //客户类型
+                        unCollectionDto.setCustomerClass(vo.getCustomerKey());
+                        //客户类型
+                        unCollectionDto.setCustomerClassKey(vo.getCustomerType());
+                        //客户头像
+                        unCollectionDto.setCustomerImage(vo.getCustomerImage());
+                        unCollectionDto.setReceivablesName("车款");
+                        unCollectionDto.setCustomerPhone(vo.getPhone());
+                        unCollectionDto.setUseOrgSid(vo.getUseOrgSid());
+                        unCollectionDto.setVinNo(vinList.get(i).getVinNo());
+                        unCollectionDto.setCurrentReceivableMoney(money);
+                        unCollectionDto.setUserSid(busSalesOrder.getCreateBySid());
+                        unCollectionDto.setReveivableMoney(money);
+                        unCollectionDto.setBusVinSid(vinList.get(i).getSid());
+                        unCollectionDto.setPayType(vo.getPayType());
+                        unCollectionDto.setPayTypeKey(vo.getPayTypeKey());
+                        unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
+                        unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
+                        finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                    }
+                }
+                //-----------------推送车款款项结束
                 //推送采购渠道待选择
                 BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();
                 busPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
@@ -4015,12 +4070,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 updatePurchaseSystem(purchaseSystemName, purchaseSystemSid, salesOrderSid);
             }
             //销售订单在销售支持部经理审核后，自动生成应收，此时也可以生成合同，生成合同的同时生成合同审核待办。
+            //查询应收是否已生成
             if("Activity_10w0sy1".equals(bv.getTaskDefKey())){
                 //保存合同
                 OrderContractQuery orderContractQuery = new OrderContractQuery();
                 orderContractQuery.setSid(bv.getBusinessSid());
                 orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
-                saveContract(orderContractQuery);
+                if(StringUtils.isBlank(busSalesOrder.getContractNo())){
+                    saveContract(orderContractQuery);
+                }
             }
         } else {
             return rb.setMsg(resultBean.getMsg());

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

@@ -31,10 +31,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -95,4 +92,8 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @PostMapping("/saveUnCollection")
     ResultBean saveUnCollection(@RequestBody UnCollectionDto dto);
 
+    @ApiOperation("根据合同编号查询应收是否存在")
+    @GetMapping("/selectByContractNo")
+    ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(@RequestParam("contractNo") String contractNo);
+
 }

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

@@ -95,4 +95,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 	public ResultBean saveUnCollection(UnCollectionDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {
+		return null;
+	}
 }

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

@@ -1610,13 +1610,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (finSelectedReceivablesDetailedVos1_1.size() > 0) {
             for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) {
                 FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i);
-                String customerNum = "";
+                String contractNo = vvvv.getContractNo();
-                if (vvvv.getVIN().length() < 8) {
+                String vinNo = vvvv.getVIN();
-                    customerNum = vvvv.getContractNo() + vvvv.getVIN();
+                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid,vinNo);
-                } else {
-                    customerNum = vvvv.getVIN();
-                }
-                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), customerNum, sid);
                 //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
                 if (data != null) {
                     bdCustomer.setTOrgIds(data.getOrgCode());
@@ -1671,13 +1667,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             for (int i = 0; i < finSelectedReceivablesDetailedVos2_1.size(); i++) {
                 FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos2_1.get(i);
                 //先推送客户
-                String customerNum = "";
+                String contractNo = vvvv.getContractNo();
-                if (vvvv.getVIN().length() < 8) {
+                String vinNo = vvvv.getVIN();
-                    customerNum = vvvv.getContractNo() + vvvv.getVIN();
+                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid,vinNo);
-                } else {
-                    customerNum = vvvv.getVIN();
-                }
-                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), customerNum, sid);
                 //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
                 if (data != null) {
                     bdCustomer.setTOrgIds(data.getOrgCode());
@@ -1885,7 +1877,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return bdCustomer;
     }
 
-    private BdCustomer createBdCustomer1(String useOrgSid, String name, String vin, String collSid) {
+    private BdCustomer createBdCustomer1(String useOrgSid, String name, String contractNo, String collSid,String vinNo) {
         BdCustomer bdCustomer = new BdCustomer();
         ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
         if (resultBean.getSuccess()) {
@@ -1894,9 +1886,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 bdCustomer.setTOrgIds(vo.getOrgCode());
             }
         }
-        String fname = name + vin;
+        String customerNum = "";
+        String code = "";
+        if (vinNo.length() < 8) {//无车架号
+            customerNum = contractNo + vinNo;
+            code = customerNum;
+        } else {//有车架号
+            customerNum = vinNo;
+            code = HanZiConverterPinYin.getPinYinFirst(name) + customerNum;
+        }
+        String fname = name + customerNum;
         bdCustomer.setFName(fname);
-        String code = HanZiConverterPinYin.getPinYinFirst(name) + vin;
         bdCustomer.setFNumber(code);
         return bdCustomer;
     }
@@ -2376,13 +2376,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (finSelectedReceivablesDetailedVos1_1.size() > 0) {
             for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) {
                 FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i);
-                String customerNum = "";
+                /*String customerNum = "";
                 if (vvvv.getVIN().length() < 8) {
                     customerNum = vvvv.getContractNo() + vvvv.getVIN();
                 } else {
                     customerNum = vvvv.getVIN();
-                }
+                }*/
-                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), customerNum, sid);
+                String contractNo = vvvv.getContractNo();
+                String vinNo = vvvv.getVIN();
+                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid,vinNo);
                 //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
                 if (data != null) {
                     bdCustomer.setTOrgIds(data.getOrgCode());
@@ -2437,13 +2439,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             for (int i = 0; i < finSelectedReceivablesDetailedVos2_1.size(); i++) {
                 FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos2_1.get(i);
                 //先推送客户
-                String customerNum = "";
+                /*String customerNum = "";
                 if (vvvv.getVIN().length() < 8) {
                     customerNum = vvvv.getContractNo() + vvvv.getVIN();
                 } else {
                     customerNum = vvvv.getVIN();
-                }
+                }*/
-                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), customerNum, sid);
+                String contractNo = vvvv.getContractNo();
+                String vinNo = vvvv.getVIN();
+                BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid,vinNo);
                 //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
                 if (data != null) {
                     bdCustomer.setTOrgIds(data.getOrgCode());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -173,7 +173,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
             FinCostapply finCostapply = new FinCostapply();
             BeanUtil.copyProperties(dto, finCostapply, "sid");
             finCostapply.setOrgSidPath(orgSidPath);
-            String billNo = getApplyCode(dto);
+            String billNo = getApplyCode(orgSidPath);
             if (finCostapply.getIsVeh() == 1) {
                 if (finCostapply.getIsOutDoor() == null) {
                     return rb.setMsg("请选择是否需要出门");
@@ -192,6 +192,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
                     finCostapplyVehicleService.insert(finCostapplyVehicle);
                 }
             }
+            finCostapply.setBillNo(billNo);
             baseMapper.insert(finCostapply);
             dtoSid = finCostapply.getSid();
         } else {
@@ -224,10 +225,9 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         return rb.success().setData(dtoSid);
     }
 
-    public String getApplyCode(FinCostapplyDto dto) {
+    public String getApplyCode(String orgSidPath) {
-        String userSid = dto.getCreateBySid();
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -196,7 +196,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
             FinPaymentapply finPaymentapply = new FinPaymentapply();
             BeanUtil.copyProperties(dto, finPaymentapply, "sid");
-            String billNo = getApplyCode(dto);
+            String billNo = getApplyCode(createOrgSid);
             finPaymentapply.setBillNo(billNo);
             finPaymentapply.setOrgSidPath(orgSidPath);
             finPaymentapply.setCreateOrgSid(createOrgSid);
@@ -247,11 +247,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         return rb.success().setData(dtoSid);
     }
 
-    public String getApplyCode(FinPaymentapplyDto dto) {
+    public String getApplyCode(String orgSid) {
-        String userSid = dto.getCreateBySid();
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);

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

@@ -170,7 +170,7 @@
 
     <select id="fetchByAuditState1_1"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
-        select *, sum(subscriptionMoney) as sumAll
+        select *
         from fin_selected_receivables_detailed
         where collSid = #{sid}
           and auditState = #{state}

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

@@ -81,4 +81,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     IPage<AppCustomerBillSummaryVo> getCustomerBill2List(IPage<FinUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
 
     AppCustomerBillDetailVo selectBySid(@Param("paymentSid") String paymentSid);
+
+    List<FinUncollectedReceivablesDetailed> selectByContractNo(String contractNo);
 }

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

@@ -5,17 +5,17 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
-        SELECT
+        SELECT furd.`customerName`,
-        furd.`customerName`,
+               furd.`contractSid`,
-        furd.`contractSid`,
+               furd.`contractNo`,
-        furd.`contractNo`,
+               furd.`paymentTypeValue`,
-        furd.`paymentTypeValue`,
+               furd.`receivablesName`,
-        furd.`receivablesName`,
+               furd.`createTime`,
-        furd.`createTime`,
+               furd.`remarks`
-        furd.`remarks`
+        FROM fin_uncollected_receivables_detailed furd
-        FROM
+        <where>
-        fin_uncollected_receivables_detailed furd
+            ${ew.sqlSegment}
-        <where>${ew.sqlSegment}</where>
+        </where>
     </select>
 
 
@@ -32,7 +32,8 @@
         SELECT *
         FROM fin_uncollected_receivables_detailed
         WHERE VIN = #{vin}
-        AND receivablesName = #{receivablesName} and useOrgSid = #{useOrgSid}
+          AND receivablesName = #{receivablesName}
+          and useOrgSid = #{useOrgSid}
     </select>
 
     <select id="selectGroupConAndRecAndPay"
@@ -46,37 +47,40 @@
 
     <select id="selectListAllVo"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.DetailsOfReceivablesAndUncollectedItemsVo">
-        SELECT * FROM fin_uncollected_receivables_detailed
+        SELECT *
-        <where>${ew.sqlSegment} and length(busVinSid)>0
+        FROM fin_uncollected_receivables_detailed
+        <where>
+            ${ew.sqlSegment}
+              and length(busVinSid) > 0
         </where>
     </select>
 
     <select id="getCustomerBillList"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryDetailsVo">
-        SELECT
+        SELECT contractSid,
-        contractSid,
+               contractNo             AS contractId,
-        contractNo AS contractId,
+               customerSid,
-        customerSid,
+               customerName,
-        customerName,
+               customerClassKey       AS customerKey,
-        customerClassKey AS customerKey,
+               customerImage,
-        customerImage,
+               receivablesName,
-        receivablesName,
+               currentReceivableMoney AS receivable
-        currentReceivableMoney AS receivable
+        FROM fin_uncollected_receivables_detailed furd
-        FROM
+        <where>
-        fin_uncollected_receivables_detailed furd
+            ${ew.sqlSegment}
-        <where>${ew.sqlSegment}</where>
+        </where>
     </select>
 
     <select id="getCustomerBill2List"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryVo">
-        SELECT
+        SELECT sid                    AS paymentSid,
-        sid AS paymentSid,
+               paymentTypeValue       AS payType,
-        paymentTypeValue AS payType,
+               receivablesName,
-        receivablesName,
+               currentReceivableMoney AS receivable
-        currentReceivableMoney AS receivable
+        FROM fin_uncollected_receivables_detailed furd
-        FROM
+        <where>
-        fin_uncollected_receivables_detailed furd
+            ${ew.sqlSegment}
-        <where>${ew.sqlSegment}</where>
+        </where>
     </select>
 
     <select id="selectBySid"
@@ -94,4 +98,11 @@
         FROM fin_uncollected_receivables_detailed furd
         WHERE furd.sid = #{paymentSid}
     </select>
+
+    <select id="selectByContractNo"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
+        select *
+        from fin_uncollected_receivables_detailed
+        where contractNo = #{contractNo}
+    </select>
 </mapper>

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

@@ -121,4 +121,9 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
     public ResultBean saveUnCollection(UnCollectionDto dto) {
         return finUncollectedReceivablesDetailedService.saveUnCollection(dto);
     }
+
+    @Override
+    public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {
+        return finUncollectedReceivablesDetailedService.selectByContractNo(contractNo);
+    }
 }

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

@@ -145,19 +145,19 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        if(StringUtils.isNotBlank(query.getPurchaseSystemSid())){
+        if (StringUtils.isNotBlank(query.getPurchaseSystemSid())) {
-            qw.eq("purchaseSystemSid",query.getPurchaseSystemSid());
+            qw.eq("purchaseSystemSid", query.getPurchaseSystemSid());
-        }else{
+        } else {
-            qw.eq("purchaseSystemSid","0");
+            qw.eq("purchaseSystemSid", "0");
         }
         return qw;
     }
 
     public List<DetailsOfReceivablesAndUncollectedItemsVo> listAllVo(FinUncollectedReceivablesDetailedQuery query) {
-        if(StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             query.setUseOrgSid(useOrgSid);
-        }else{
+        } else {
             String createBySid = query.getCreateBySid();
             String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
         }
@@ -173,18 +173,18 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                     String vinSid = resultBean.getData().getLinkSid();
                     String temporaryNo = resultBean.getData().getTemporaryNo();
                     v.setVIN(vinNo);
-                    if(StringUtils.isNotBlank(vinNo)){
+                    if (StringUtils.isNotBlank(vinNo)) {
-                        v.setVIN(vinNo.substring(vinNo.length()-8));
+                        v.setVIN(vinNo.substring(vinNo.length() - 8));
-                    }else{
+                    } else {
-                        if("2".equals(v.getPayTypeKey())){
+                        if ("2".equals(v.getPayTypeKey())) {
-                            v.setVIN(temporaryNo.substring(temporaryNo.length()-2));
+                            v.setVIN(temporaryNo.substring(temporaryNo.length() - 2));
                         }
                     }
                 }
             }
         }
-        if(StringUtils.isNotBlank(query.getVinNo())){
+        if (StringUtils.isNotBlank(query.getVinNo())) {
-            list = list.stream().filter(v->v.getVIN().contains(query.getVinNo())).collect(Collectors.toList());
+            list = list.stream().filter(v -> v.getVIN().contains(query.getVinNo())).collect(Collectors.toList());
         }
         return list;
     }
@@ -536,4 +536,11 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         baseMapper.insert(detailed);
         return rb.success();
     }
+
+    public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {
+        ResultBean<List<FinUncollectedReceivablesDetailed>> rb = ResultBean.fireFail();
+        List<FinUncollectedReceivablesDetailed> list = baseMapper.selectByContractNo(contractNo);
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }

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

@@ -213,7 +213,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             ScmApplyInbound inboundVehicle = new ScmApplyInbound();
             BeanUtil.copyProperties(dto, inboundVehicle);
-            String billNo = getRZSQApplyCode(dto.getUserSid());
+            String billNo = getRZSQApplyCode(orgPath);
             inboundVehicle.setApplicationCode(billNo);
             inboundVehicle.setSid(UUID.randomUUID().toString());
             inboundVehicle.setOrgSidPath(orgPath);
@@ -497,23 +497,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         }
     }
 
-    public String getApplyCode(String userSid) {
+    public String getRZSQApplyCode(String orgPath) {
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgPath);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
-        String orgCode = resultBean1.getData().getOrgCode();
-        BillNo b = new BillNo();
-        b.setOrgCode(orgCode);
-        b.setBillType(BillTypeEnum.NGSQ.getBillType());
-        String bill = Rule.getBill(b);
-        int i = baseMapper.selectNum(bill);
-        String billNo = Rule.getBillNo(bill, i);
-        return billNo;
-    }
-
-    public String getRZSQApplyCode(String userSid) {
-        //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
@@ -560,7 +546,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                         confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
                     }
                 }
-                name = confirmSid + "-" +confirmName + "-" + confirmDate;
+                name = confirmSid + "-" + confirmName + "-" + confirmDate;
                 newBaseVehicleDto(booad, scmApplyInboundVehicleDtos, name);
                 //入账审批通关修改采购订单状态 state = 1
                 if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) {

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

@@ -450,7 +450,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             //1待办 2已办
             scmVehicleGression.setHandleState("1");
             //申请编号
-            String billNo = getApplyCode(dto);
+            String billNo = getApplyCode(useOrgSid);
             scmVehicleGression.setApplicantNo(billNo);
             scmVehicleGression.setOrgSidPath(orgSidPath);
             int i = baseMapper.insert(scmVehicleGression);
@@ -688,11 +688,9 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         return rb.success().setMsg("保存成功");
     }
 
-    public String getApplyCode(AppScmVehicleGressionDto dto) {
+    public String getApplyCode(String orgSid) {
-        String userSid = dto.getUserSid();
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -113,7 +113,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 return rb.setMsg("请选择需要退库的车辆");
             }
             ScmVehicleReturn scmVehicleReturn = new ScmVehicleReturn();
-            String billNo = getApplyCode(scmVehicleReturnDto);
+            String billNo = getApplyCode(orgPath);
             BeanUtils.copyProperties(scmVehicleReturnDto, scmVehicleReturn, "sid");
             scmVehicleReturn.setApplicationCode(billNo);
             String money = scmVehicleReturnDto.getMoney();
@@ -674,10 +674,9 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         return rb.success().setData(vo);
     }
 
-    public String getApplyCode(ScmVehicleReturnDto dto) {
+    public String getApplyCode(String orgPath) {
-        String userSid = dto.getCreateBySid();
         //获取分公司sid
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgPath);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();