From b8bf256ddd3329088cd3cffeb7641abafd64385e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 10 Mar 2023 17:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractFeign.java | 2 +- .../CommonContractFeignFallback.java | 2 +- .../BaseInternalPurchaseService.java | 6 +- .../BaseManufactorSubscriptionService.java | 7 +- .../BaseManufacturerRetwareService.java | 8 +- .../BaseOutsourcingApplicationService.java | 6 +- .../BusVehicleApplyService.java | 7 +- .../BusVehicleOrderService.java | 7 +- .../commoncontract/CommonContractRest.java | 4 +- .../commoncontract/CommonContractService.java | 11 ++- .../busmaindeposit/BusMainDepositService.java | 16 ++-- .../bussalesorder/BusSalesOrderService.java | 78 +++++++++++++++--- ...inUncollectedReceivablesDetailedFeign.java | 9 ++- ...ectedReceivablesDetailedFeignFallback.java | 5 ++ .../FinCollectionConfirmationService.java | 50 ++++++------ .../biz/fincostapply/FinCostapplyService.java | 8 +- .../FinPaymentapplyService.java | 8 +- .../FinSelectedReceivablesDetailedMapper.xml | 2 +- ...nUncollectedReceivablesDetailedMapper.java | 2 + ...inUncollectedReceivablesDetailedMapper.xml | 79 +++++++++++-------- ...FinUncollectedReceivablesDetailedRest.java | 5 ++ ...UncollectedReceivablesDetailedService.java | 33 +++++--- .../ScmApplyInboundService.java | 22 +----- .../ScmVehicleGressionService.java | 8 +- .../ScmVehicleReturnService.java | 7 +- 25 files changed, 228 insertions(+), 164 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index 653e4f90e3..1221edd3e3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/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 selectContractNo(@RequestParam("userSid")String userSid,@RequestParam("modelSid")String modelSid); + ResultBean selectContractNo(@RequestParam("orgSid")String orgSid,@RequestParam("modelSid")String modelSid); @ApiOperation("生成合同") @PostMapping("/saveContract") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index ddcddc9b6b..58bed48e4f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/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 selectContractNo(String userSid, String modelSid) { + public ResultBean selectContractNo(String orgSid, String modelSid) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 04d69123c0..93e6d04f5d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath); ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index 48c7aeb352..cdc2b5fe8a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java index 8dad6fbb56..b577c4567d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 475ad00764..cd154154a0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean = sysStaffOrgFeign.getOrgSidByPath(orgPath); ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 3176cf1b40..a8d8f1cd94 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath); ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index dfa4141271..1b23d1d0d7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index a1b55141a3..073dedc3b6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/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 selectContractNo(String userSid, String modelSid) { - return commonContractService.selectContractNo(userSid,modelSid); + public ResultBean selectContractNo(String orgSid, String modelSid) { + return commonContractService.selectContractNo(orgSid,modelSid); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 06d4bcbb63..b0ed609c6a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); String orgCode = resultBean1.getData().getOrgAbbre(); //根据车型sid查询品牌简称 String brandCode = baseVehicleBrandService.selectShortName(modelSid); @@ -2601,9 +2600,9 @@ public class CommonContractService extends MybatisBaseService selectContractNo(String userSid, String modelSid) { + public ResultBean selectContractNo(String orgSid, String modelSid) { ResultBean rb = ResultBean.fireFail(); - String contractNo = getApplyCode(userSid,modelSid); + String contractNo = getApplyCode(orgSid,modelSid); return rb.success().setData(contractNo); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 6f83d8772c..5935f3c842 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); @@ -825,11 +823,9 @@ public class BusMainDepositService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); @@ -1219,7 +1215,7 @@ public class BusMainDepositService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); @@ -3257,7 +3258,7 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo()); + List 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 vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { @@ -3373,7 +3379,7 @@ public class BusSalesOrderService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos(); //更新销售订单的临时号 @@ -3486,6 +3492,55 @@ public class BusSalesOrderService extends MybatisBaseService 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 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> selectByContractNo(@RequestParam("contractNo") String contractNo); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 0964cd1dcb..ec414874ba 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/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> selectByContractNo(String contractNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 730b56f4ea..f3d8196a10 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/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 0) { for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) { FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i); - 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()); @@ -1671,13 +1667,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(useOrgSid); if (resultBean.getSuccess()) { @@ -1894,9 +1886,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService 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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath); ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 0a27f932e2..f8f1e223c7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 42f2e7e861..e700160487 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -170,7 +170,7 @@ - SELECT - furd.`customerName`, - furd.`contractSid`, - furd.`contractNo`, - furd.`paymentTypeValue`, - furd.`receivablesName`, - furd.`createTime`, - furd.`remarks` - FROM - fin_uncollected_receivables_detailed furd - ${ew.sqlSegment} + SELECT furd.`customerName`, + furd.`contractSid`, + furd.`contractNo`, + furd.`paymentTypeValue`, + furd.`receivablesName`, + furd.`createTime`, + furd.`remarks` + FROM fin_uncollected_receivables_detailed furd + + ${ew.sqlSegment} + @@ -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 * + from fin_uncollected_receivables_detailed + where contractNo = #{contractNo} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index a3484c6a84..6c8f7b2fc9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/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> selectByContractNo(String contractNo) { + return finUncollectedReceivablesDetailedService.selectByContractNo(contractNo); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index c71cb059a0..e8f1cc9213 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/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())){ - qw.eq("purchaseSystemSid",query.getPurchaseSystemSid()); - }else{ - qw.eq("purchaseSystemSid","0"); + if (StringUtils.isNotBlank(query.getPurchaseSystemSid())) { + qw.eq("purchaseSystemSid", query.getPurchaseSystemSid()); + } else { + qw.eq("purchaseSystemSid", "0"); } return qw; } public List 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)){ - v.setVIN(vinNo.substring(vinNo.length()-8)); - }else{ - if("2".equals(v.getPayTypeKey())){ - v.setVIN(temporaryNo.substring(temporaryNo.length()-2)); + if (StringUtils.isNotBlank(vinNo)) { + v.setVIN(vinNo.substring(vinNo.length() - 8)); + } else { + if ("2".equals(v.getPayTypeKey())) { + v.setVIN(temporaryNo.substring(temporaryNo.length() - 2)); } } } } } - if(StringUtils.isNotBlank(query.getVinNo())){ - list = list.stream().filter(v->v.getVIN().contains(query.getVinNo())).collect(Collectors.toList()); + if (StringUtils.isNotBlank(query.getVinNo())) { + 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> selectByContractNo(String contractNo) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.selectByContractNo(contractNo); + list.removeAll(Collections.singleton(null)); + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 6ca8e797a6..39dabc449a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -213,7 +213,7 @@ public class ScmApplyInboundService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean 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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean = sysStaffOrgFeign.getOrgSidByPath(orgPath); ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); @@ -560,7 +546,7 @@ public class ScmApplyInboundService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 033d166e52..7705ead735 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/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 resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + ResultBean resultBean = sysStaffOrgFeign.getOrgSidByPath(orgPath); ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); String orgCode = resultBean1.getData().getOrgCode(); BillNo b = new BillNo();