From 6114792706ef856afcdb7efe2be927fdfb14d855 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 30 Sep 2022 17:08:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=AF=B9=E6=8E=A5=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/busvehicleapply/BusApplyVo.java | 1 + .../BaseManufacturerBankMapper.java | 2 + .../BaseManufacturerBankMapper.xml | 5 ++ .../BaseManufacturerBankService.java | 4 ++ .../BusVehicleApplyService.java | 10 +++- .../finpaymentrecord/FinPaymentrecord.java | 3 ++ .../finpaymentrecord/FinPaymentrecordDto.java | 3 ++ .../FinPaymentrecordService.java | 54 +++++++++++++------ .../sysorganization/SysOrganizationFeign.java | 5 ++ .../SysOrganizationFeignFallback.java | 5 ++ .../SysOrganizationMapper.java | 2 + .../sysorganization/SysOrganizationMapper.xml | 4 ++ .../sysorganization/SysOrganizationRest.java | 5 ++ .../SysOrganizationService.java | 6 +++ 14 files changed, 92 insertions(+), 17 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java index 5db9f35883..b3b61ceb87 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java @@ -13,4 +13,5 @@ public class BusApplyVo implements Vo { private static final long serialVersionUID = -4976630638474677681L; private String name; private String num; + private String code; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java index b24e63ebb0..3da867f9eb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java @@ -62,4 +62,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper selectByApplySid(String modelSid); List actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code); + + List selectBankByApplySid(String createOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index 98b26a65d6..6b114f7579 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -79,4 +79,9 @@ AND bm.useOrg = #{useOrgSid} and bmb.dueBankKey = #{code} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java index 8392392bc5..bfe248a796 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java @@ -73,4 +73,8 @@ public class BaseManufacturerBankService extends MybatisBaseService actualList(String useOrgSid, String code) { return baseMapper.actualList(useOrgSid,code); } + + public List selectBankByApplySid(String createOrgSid) { + return baseMapper.selectBankByApplySid(createOrgSid); + } } \ No newline at end of file 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 a1276bb737..3c057c123f 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 @@ -60,7 +60,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -518,7 +517,7 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); + /* List busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid(); //根据车型sid查询账户名称和银行账号 List busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid); @@ -526,6 +525,13 @@ public class BusVehicleApplyService extends MybatisBaseService busApplyVo = baseManufacturerBankService.selectBankByApplySid(busVehicleApply.getCreateOrgSid()); + busApplyVo.removeAll(Collections.singleton(null)); + if (!busApplyVo.isEmpty()) { + finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum()); + finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName()); + finPaymentrecordDto.setPayCode(busApplyVo.get(0).getCode()); } finPaymentrecordDto.setBusSid(r.getData()); finPaymentrecordFeign.save(finPaymentrecordDto); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java index 5f1730e2b7..1e5ca7b161 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java @@ -98,4 +98,7 @@ public class FinPaymentrecord extends BaseEntity { @ApiModelProperty(value = "业务编号") private String busSid; + @ApiModelProperty("供应商编码") + private String payCode; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java index 67bc3f2276..129c903aa8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java @@ -77,4 +77,7 @@ public class FinPaymentrecordDto implements Dto { @ApiModelProperty(value = "业务编号") private String busSid; + @ApiModelProperty("供应商编码") + private String payCode; + } \ No newline at end of file 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 875a90f50a..a555e06047 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,13 +34,14 @@ import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscript import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; import com.yxt.anrui.base.common.enums.DictCommonEnum; -import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply; import com.yxt.anrui.fin.api.finpaymentrecord.*; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -84,6 +85,8 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -182,20 +185,36 @@ 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"); //采购部门 - apPayBill.setFPURCHASEDEPTID("05.04"); + ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部"); + if (resultBean1.getSuccess()) { + SysOrganizationVo vo = resultBean1.getData(); + if (vo != null) { + apPayBill.setFPURCHASEDEPTID(vo.getOrgCode()); + } + } + // apPayBill.setFPURCHASEDEPTID("05.04"); //应付类别默认005定金 - apPayBill.setF_PAEZ_AssistantKey("005"); - apPayBill.setF_PAEZ_AssistantType("005"); - - + if ("排产".equals(finPaymentrecord.getCostTitleValue())) { + apPayBill.setF_PAEZ_AssistantKey("005"); + apPayBill.setF_PAEZ_AssistantType("定金"); + } List FPAYBILLENTRYs = new ArrayList<>(); if (finPaymentrecord.getCost() != null && finPaymentrecord.getCost() > 0) { @@ -205,9 +224,15 @@ public class FinPaymentrecordService extends MybatisBaseService 0) { diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index ffd6fa92bb..1ba697296e 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -144,4 +144,9 @@ public interface SysOrganizationFeign { @ResponseBody @ApiOperation("当前分公司下所有部门") ResultBean> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query); + + @GetMapping("/selectByPSid") + @ResponseBody + @ApiOperation("查询分公司下的销售支持部") + ResultBean selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index 2c64662f4d..8d4a8a4a4c 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -147,4 +147,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean> selectOrgLists(SysOrganizationListQuery query) { return null; } + + @Override + public ResultBean selectByPSid(String sid, String name) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 40a43556b5..42ab950f2b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -109,4 +109,6 @@ public interface SysOrganizationMapper extends BaseMapper { List selectOrgLists(String orgSid); List selectByOrgDeptSid(String orgDeptSid); + + SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index b6a16a4e9b..69d5a18ec4 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -193,4 +193,8 @@ left join sys_staffinfo si on so.staffSid = si.sid where so.orgSid = #{orgDeptSid} + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 0e6a71822d..420af12785 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -366,4 +366,9 @@ public class SysOrganizationRest implements SysOrganizationFeign { public ResultBean> selectOrgLists(SysOrganizationListQuery query) { return sysOrganizationService.selectOrgLists(query); } + + @Override + public ResultBean selectByPSid(String sid, String name) { + return sysOrganizationService.selectByPSid(sid,name); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 114f94ca94..ee71c6df3a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -507,4 +507,10 @@ public class SysOrganizationService extends MybatisBaseService selectByPSid(String sid, String name) { + ResultBean rb = ResultBean.fireFail(); + SysOrganizationVo vo = baseMapper.selectByPSid(sid,name); + return rb.success().setData(vo); + } } \ No newline at end of file