From 66fda491f2de2d0e19af67edd0be58df62c8d676 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 17 Jan 2023 10:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=8E=A8=E9=80=81=E9=87=91?= =?UTF-8?q?=E8=9D=B6=E8=B4=A2=E5=8A=A1=E5=88=86=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasePurchaseSystemFeign.java | 5 ++ .../BasePurchaseSystemFeignFallback.java | 5 ++ .../BaseAccadjApplyService.java | 48 +++++++---- .../BaseManufacturerService.java | 84 +++++++++++++++---- .../BaseManufacturerRetwareService.java | 14 +++- .../BaseOutsourcingApplicationService.java | 4 +- .../BasePurchaseSystemMapper.java | 2 + .../BasePurchaseSystemMapper.xml | 31 +++++-- .../BasePurchaseSystemRest.java | 5 ++ .../BasePurchaseSystemService.java | 6 ++ .../crmcustomertemp/CrmCustomerTempFeign.java | 2 +- .../CrmCustomerTempFeignFallback.java | 2 +- .../crmcustomertemp/CrmCustomerTempRest.java | 4 +- .../CrmCustomerTempService.java | 20 ++++- .../FinCollectionConfirmationService.java | 17 +++- .../FinManufacturerBankService.java | 66 +++++++++++---- .../FinPaymentrecordService.java | 44 ++++++---- .../biz/scmwarehouse/ScmWarehouseService.java | 64 +++++++++----- 18 files changed, 311 insertions(+), 112 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java index d8fb04592d..5fd1d322dc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java @@ -81,6 +81,11 @@ public interface BasePurchaseSystemFeign { @ResponseBody public ResultBean> fetchDetailsByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid); + @ApiOperation("根据分公司sid查询采购系统财务分公司编码") + @GetMapping("/fetchOrgCodeByUseOrgSid/{useOrgSid}") + @ResponseBody + public ResultBean> fetchOrgCodeByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid); + @ApiOperation("根据部门sid查询采购系统名称") @GetMapping("/fetchDetailsByDeptSid/{deptSid}") @ResponseBody diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java index 1404a07d25..9ea3185e0c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java @@ -75,6 +75,11 @@ public class BasePurchaseSystemFeignFallback implements BasePurchaseSystemFeign return null; } + @Override + public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) { + return null; + } + @Override public ResultBean fetchDetailsByDeptSid(String deptSid) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index dd3268901b..b5ba963dcf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -446,7 +446,7 @@ public class BaseAccadjApplyService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid()); - if (data2 != null){ + if (data2 != null) { stkInStock.setFPurchaseOrgId(data2.getOrgCode()); //分配目标组织:TOrgId (必填项) stkInStock.setTOrgId(data2.getOrgCode()); - }else { + } else { if (sysOrganizationVoResultBean.getSuccess()) { SysOrganizationVo vo = sysOrganizationVoResultBean.getData(); if (vo != null) { @@ -544,18 +544,32 @@ public class BaseAccadjApplyService extends MybatisBaseService sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()); - if (sysOrganizationVoResultBean1.getSuccess()) { + List data1 = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(baseAccadjApply.getCallOutOrgSid()).getData(); + if (data1 != null){ + for (BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo : data1) { + BdSupplier bdSupplier = new BdSupplier(); + ResultBean sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()); + SysOrganizationVo vo = sysOrganizationVoResultBean1.getData(); + if (vo != null) { + bdSupplier.setFName(vo.getName()); + bdSupplier.setFLocMobile("13333333333"); + bdSupplier.setFNumber(vo.getOtherCode()); + } + bdSupplier.setFUseOrgId(basePurchaseSystemDetailsVo.getOrgCode()); + finKingDeeFeign.draftBdSupplier(bdSupplier); + } + }else { + BdSupplier bdSupplier = new BdSupplier(); + ResultBean sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()); SysOrganizationVo vo = sysOrganizationVoResultBean1.getData(); if (vo != null) { bdSupplier.setFName(vo.getName()); bdSupplier.setFLocMobile("13333333333"); bdSupplier.setFNumber(vo.getOtherCode()); } + bdSupplier.setFUseOrgId(sysOrganizationVoResultBean.getData().getOrgCode()); + finKingDeeFeign.draftBdSupplier(bdSupplier); } - bdSupplier.setFUseOrgId(sysOrganizationVoResultBean.getData().getOrgCode()); - finKingDeeFeign.draftBdSupplier(bdSupplier); } } catch (Exception e) { e.printStackTrace(); @@ -571,7 +585,7 @@ public class BaseAccadjApplyService extends MybatisBaseService stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(),baseAccadjApply.getCallOutOrgSid()); + List stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(), baseAccadjApply.getCallOutOrgSid()); List baseAccadjApplyToJDRus = new ArrayList<>(); for (String s : stringList) { List baseVehicles = baseInternalPurchaseVehicleService.fetchByAccSidAndPurchaseSystemSid(baseAccadjApply.getSid(), s); @@ -583,7 +597,7 @@ public class BaseAccadjApplyService extends MybatisBaseService baseVehicles = accadjApplyToJDRus.getBaseVehicles(); - //日期:FDate (必填项) + //日期:FDate (必填项) salOutStock.setFDate(DateUtil.today()); //项目类别:F_PAEZ_Assistant (必填项) 集团内部调车 034 @@ -603,9 +617,9 @@ public class BaseAccadjApplyService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()); if (resultBean.getSuccess()) { SysOrganizationVo vo1 = resultBean.getData(); @@ -630,10 +644,10 @@ public class BaseAccadjApplyService extends MybatisBaseService 30){ - FNumber1 = FNumber1.substring(0,30); + if (FNumber1.length() > 30) { + FNumber1 = FNumber1.substring(0, 30); bdCustomer.setFNumber(FNumber1); - }else { + } else { bdCustomer.setFNumber(FNumber1); } bdCustomers.add(bdCustomer); @@ -670,7 +684,7 @@ public class BaseAccadjApplyService extends MybatisBaseService baseInternalPurchaseVehicles) { + public ResultBean InitiatorToAnswer(BusinessVariables bv, List baseInternalPurchaseVehicles) { ResultBean rb = ResultBean.fireFail(); BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid()); List purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); @@ -776,7 +790,7 @@ public class BaseAccadjApplyService extends MybatisBaseService baseInternalPurchaseVehicles) { + public ResultBean companyToFinancialCenter(BusinessVariables bv, List baseInternalPurchaseVehicles) { ResultBean rb = ResultBean.fireFail(); BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid()); List purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 3f39139e1f..a47fd76595 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -11,9 +11,11 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinance; import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceDto; import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService; +import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; @@ -65,6 +67,8 @@ public class BaseManufacturerService extends MybatisBaseService> orgList = sysOrganizationFeign.selectOrgSidList(); List list = orgList.getData(); for (SysOrganizationVo sysOrganizationVo : list) { + List data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData(); + if (data != null){ + for (BasePurchaseSystemDetailsVo datum : data) { + BdSupplier bdSupplier = new BdSupplier(); + bdSupplier.setFName(baseManufacturerDto.getManufacturerName()); + bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile()); + bdSupplier.setFUseOrgId(datum.getOrgCode()); + bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode()); + finKingDeeFeign.draftBdSupplier(bdSupplier); + } + }else { + BdSupplier bdSupplier = new BdSupplier(); + bdSupplier.setFName(baseManufacturerDto.getManufacturerName()); + bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile()); + bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode()); + bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode()); + finKingDeeFeign.draftBdSupplier(bdSupplier); + } + } + }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){ + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData(); + List data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData(); + if (data != null){ + for (BasePurchaseSystemDetailsVo datum : data) { + BdSupplier bdSupplier = new BdSupplier(); + bdSupplier.setFName(baseManufacturerDto.getManufacturerName()); + bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile()); + bdSupplier.setFUseOrgId(datum.getOrgCode()); + bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode()); + finKingDeeFeign.draftBdSupplier(bdSupplier); + } + }else { BdSupplier bdSupplier = new BdSupplier(); bdSupplier.setFName(baseManufacturerDto.getManufacturerName()); bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile()); @@ -343,14 +379,6 @@ public class BaseManufacturerService extends MybatisBaseService> orgList = sysOrganizationFeign.selectOrgSidList(); List list = orgList.getData(); for (SysOrganizationVo sysOrganizationVo : list) { + List data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData(); + if (data != null){ + for (BasePurchaseSystemDetailsVo datum : data) { + BdSupplier bdSupplier = new BdSupplier(); + bdSupplier.setFName(baseManufacturerDto.getManufacturerName()); + bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile()); + bdSupplier.setFUseOrgId(datum.getOrgCode()); + bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode()); + finKingDeeFeign.updateBdSupplier(bdSupplier); + } + }else { + BdSupplier bdSupplier = new BdSupplier(); + bdSupplier.setFName(baseManufacturerDto.getManufacturerName()); + bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile()); + bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode()); + bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode()); + finKingDeeFeign.updateBdSupplier(bdSupplier); + } + } + }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){ + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData(); + List data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData(); + if (data != null){ + for (BasePurchaseSystemDetailsVo datum : data) { + BdSupplier bdSupplier = new BdSupplier(); + bdSupplier.setFName(baseManufacturerDto.getManufacturerName()); + bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile()); + bdSupplier.setFUseOrgId(datum.getOrgCode()); + bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode()); + finKingDeeFeign.updateBdSupplier(bdSupplier); + } + }else { BdSupplier bdSupplier = new BdSupplier(); bdSupplier.setFName(baseManufacturerDto.getManufacturerName()); bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile()); @@ -471,14 +531,6 @@ public class BaseManufacturerService extends MybatisBaseService createQueryWrapper(BaseManufacturerRetwareQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -282,8 +287,13 @@ public class BaseManufacturerRetwareService extends MybatisBaseService @Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}") BasePurchaseSystemDetailsVo fetchDetailsByDeptSidAndSid(@Param("deptSid") String deptSid,@Param("sid") String sid); + + List fetchOrgCodeByUseOrgSid(String useOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml index 7745c293b1..2953ed131e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml @@ -1,13 +1,26 @@ - - - - - + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java index 90668d8066..877472db05 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java @@ -101,6 +101,11 @@ public class BasePurchaseSystemRest implements BasePurchaseSystemFeign { return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid); } + @Override + public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) { + return basePurchaseSystemService.fetchOrgCodeByUseOrgSid(useOrgSid); + } + @Override public ResultBean fetchDetailsByDeptSid(String deptSid) { return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java index 09c5da621e..e6faccd64c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java @@ -140,4 +140,10 @@ public class BasePurchaseSystemService extends MybatisBaseService> fetchOrgCodeByUseOrgSid(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List basePurchaseSystemDetailsVos = baseMapper.fetchOrgCodeByUseOrgSid(useOrgSid); + return rb.success().setData(basePurchaseSystemDetailsVos); + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index ec6394e135..743af0e405 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -57,7 +57,7 @@ public interface CrmCustomerTempFeign { @ApiOperation("推送财务客户-否") @PostMapping("/sendFinCustomer") - public ResultBean sendFinCustomer(@RequestBody String[] customerSids); + public ResultBean sendFinCustomer(@RequestBody String[] customerSids,@RequestParam("orgCode") String orgCode); @ApiOperation("推送财务客户-是") @PostMapping("/sendFinCustomerTrue") diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 7872b5fcf9..dcd57b8f79 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -37,7 +37,7 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { } @Override - public ResultBean sendFinCustomer(String[] customerSids) { + public ResultBean sendFinCustomer(String[] customerSids,String orgCode) { return null; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index 68e8427bda..33ecff6120 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -73,8 +73,8 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { } @Override - public ResultBean sendFinCustomer(String[] customerSids) { - return crmCustomerTempService.sendFinCustomer(customerSids); + public ResultBean sendFinCustomer(String[] customerSids,String orgCode) { + return crmCustomerTempService.sendFinCustomer(customerSids,orgCode); } @Override diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index e61962dd91..737ed9b14f 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -3,6 +3,10 @@ package com.yxt.anrui.crm.biz.crmcustomertemp; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.crm.api.crmbusiness.AppCrmBusinessInfoVo; import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto; @@ -104,6 +108,10 @@ public class CrmCustomerTempService extends MybatisBaseService listPage(PagerQuery pq) { @@ -1137,7 +1145,7 @@ public class CrmCustomerTempService extends MybatisBaseService bdCustomers = new ArrayList<>(); for (String customerSid : customerSids) { @@ -1145,7 +1153,7 @@ public class CrmCustomerTempService extends MybatisBaseService 30) { 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 28d84f9d77..19a2154e76 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 @@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; @@ -142,6 +144,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -1292,10 +1296,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid()); - if (resultBean.getSuccess()) { - SysOrganizationVo vo = resultBean.getData(); - if (vo != null) { - arReceivebill.setFPAYORGID(vo.getOrgCode()); + BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getCreateDeptSid()).getData(); + if (data != null){ + arReceivebill.setFPAYORGID(data.getOrgCode()); + }else { + if (resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + arReceivebill.setFPAYORGID(vo.getOrgCode()); + } } } //销售部门 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java index dc3865e2a7..89d433766c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java @@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finmanufacturerbank; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery; import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo; import com.yxt.anrui.fin.api.finmanufacturerbank.*; @@ -74,6 +76,8 @@ public class FinManufacturerBankService extends MybatisBaseService listPageVo(PagerQuery pq) { FinManufacturerBankQuery query = pq.getParams(); @@ -118,15 +122,28 @@ public class FinManufacturerBankService extends MybatisBaseService data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData(); + if (data != null){ + for (BasePurchaseSystemDetailsVo datum : data) { + CNBankacnt cnBankacnt = new CNBankacnt(); + cnBankacnt.setFCreateOrgId(datum.getOrgCode()); + cnBankacnt.setBankName(finManufacturerBank.getDepositBank()); + cnBankacnt.setFNumber(finManufacturerBank.getBankAccount()); + cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey()); + cnBankacnt.setFName(finManufacturerBank.getAccountName()); + cnBankcntService.draftCNBankcnt(cnBankacnt); + } + }else { + CNBankacnt cnBankacnt = new CNBankacnt(); + String useOrgSid = finManufacturerBank.getUseOrgSid(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + cnBankacnt.setFCreateOrgId(sysOrganizationVo.getOrgCode()); + cnBankacnt.setBankName(finManufacturerBank.getDepositBank()); + cnBankacnt.setFNumber(finManufacturerBank.getBankAccount()); + cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey()); + cnBankacnt.setFName(finManufacturerBank.getAccountName()); + cnBankcntService.draftCNBankcnt(cnBankacnt); + } return rb.success().setMsg("保存成功"); } else { FinManufacturerBank finManufacturerBank = fetchBySid(sid); @@ -139,15 +156,28 @@ public class FinManufacturerBankService extends MybatisBaseService data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData(); + if (data != null){ + for (BasePurchaseSystemDetailsVo datum : data) { + CNBankacnt cnBankacnt = new CNBankacnt(); + cnBankacnt.setFCreateOrgId(datum.getOrgCode()); + cnBankacnt.setBankName(finManufacturerBank.getDepositBank()); + cnBankacnt.setFNumber(finManufacturerBank.getBankAccount()); + cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey()); + cnBankacnt.setFName(finManufacturerBank.getAccountName()); + cnBankcntService.updateCNBankacnt(cnBankacnt); + } + }else { + CNBankacnt cnBankacnt = new CNBankacnt(); + String useOrgSid = finManufacturerBank.getUseOrgSid(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + cnBankacnt.setFCreateOrgId(sysOrganizationVo.getOrgCode()); + cnBankacnt.setBankName(finManufacturerBank.getDepositBank()); + cnBankacnt.setFNumber(finManufacturerBank.getBankAccount()); + cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey()); + cnBankacnt.setFName(finManufacturerBank.getAccountName()); + cnBankcntService.updateCNBankacnt(cnBankacnt); + } return rb.success().setMsg("修改成功"); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index c85a8e86b4..0a1aa76d6e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -34,6 +34,8 @@ import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; @@ -118,7 +120,7 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -152,14 +154,14 @@ public class FinPaymentrecordService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); List list = pagging.getRecords(); list.removeAll(Collections.singleton(null)); - if(!list.isEmpty()){ - for (FinPaymentrecordVo vv : list){ + if (!list.isEmpty()) { + for (FinPaymentrecordVo vv : list) { String payFile = vv.getPayFile(); - if(StringUtils.isNotBlank(payFile)){ + if (StringUtils.isNotBlank(payFile)) { List strings = Arrays.asList(payFile.split(",")); - for (int i =0;i payFiles = dto.getPayFiles(); - if(payFiles.size()>0){ + if (payFiles.size() > 0) { String payFile = payFiles.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); finPaymentrecord.setPayFile(payFile); } @@ -245,24 +247,30 @@ public class FinPaymentrecordService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid()); - if (resultBean.getSuccess()) { - SysOrganizationVo vo = resultBean.getData(); - if (vo != null) { - apPayBill.setFPURCHASEORGID(vo.getOrgCode()); - } - } // apPayBill.setFPURCHASEORGID("101"); //采购部门 + SysOrganizationVo vo = new SysOrganizationVo(); ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部"); if (resultBean1.getSuccess()) { - SysOrganizationVo vo = resultBean1.getData(); + vo = resultBean1.getData(); if (vo != null) { apPayBill.setFPURCHASEDEPTID(vo.getOrgCode()); } } + //采购组织 + BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(vo.getSid()).getData(); + if (data != null) { + apPayBill.setFPURCHASEORGID(data.getOrgCode()); + } else { + //根据使用组织查询采购组织的编码 + ResultBean resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid()); + if (resultBean.getSuccess()) { + SysOrganizationVo vo1 = resultBean.getData(); + if (vo1 != null) { + apPayBill.setFPURCHASEORGID(vo1.getOrgCode()); + } + } + } // apPayBill.setFPURCHASEDEPTID("05.04"); //应付类别默认005定金 /* 001整车、002外采、005定金、010牵引系列、011自卸系列、012载货系列、013搅拌车系列、014起重机系列、015专用车系列、016欧马可系列、017LNG系列 022大客户系列 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index da83664490..b7d145b1d2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -3,6 +3,8 @@ package com.yxt.anrui.scm.biz.scmwarehouse; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; @@ -45,6 +47,8 @@ public class ScmWarehouseService extends MybatisBaseService listPage(PagerQuery pq) { ScmWarehouseQuery query = pq.getParams(); @@ -114,23 +118,45 @@ public class ScmWarehouseService extends MybatisBaseService data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(dto.getUseOrgSid()).getData(); + if (data != null) { + for (BasePurchaseSystemDetailsVo datum : data) { + BDStock bdStock1 = new BDStock(); + //推送在途仓库 + bdStock1.setFCreateOrgId(datum.getOrgCode()); + bdStock1.setFName("在途仓库"); + bdStock1.setFNumber("ARZTCK"); + BDStock bdStock2 = new BDStock(); + //推送正式仓库 + bdStock2.setFCreateOrgId(datum.getOrgCode()); + bdStock2.setFName("正式仓库"); + bdStock2.setFNumber("ARZSCK"); + try { + finKingDeeFeign.drafBDtStock(bdStock1); + finKingDeeFeign.drafBDtStock(bdStock2); + } catch (Exception e) { + e.printStackTrace(); + } + } + } else { + BDStock bdStock1 = new BDStock(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); + //推送在途仓库 + bdStock1.setFCreateOrgId(sysOrganizationVo.getOrgCode()); + bdStock1.setFName("在途仓库"); + bdStock1.setFNumber("ARZTCK"); + BDStock bdStock2 = new BDStock(); + //推送正式仓库 + bdStock2.setFCreateOrgId(sysOrganizationVo.getOrgCode()); + bdStock2.setFName("正式仓库"); + bdStock2.setFNumber("ARZSCK"); + try { + finKingDeeFeign.drafBDtStock(bdStock1); + finKingDeeFeign.drafBDtStock(bdStock2); + } catch (Exception e) { + e.printStackTrace(); + } } } } @@ -173,9 +199,9 @@ public class ScmWarehouseService extends MybatisBaseService> rb = ResultBean.fireFail(); String orgPath = appScmWarehouseQuery.getOrgPath(); String userSid = appScmWarehouseQuery.getUserSid(); - if(StringUtils.isBlank(orgPath)){ + if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - }else{ + } else { orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } List list = baseMapper.selectWarehouseByUserSid(orgPath);