From bd4fe57291288ad59c760eb31c53429f20c255b8 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 18 Jan 2023 13:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseOutsourcingApplicationService.java                   | 3 ++-
 .../base/biz/busvehicleapply/BusVehicleApplyService.java     | 2 ++
 .../yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java | 5 ++++-
 .../fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java  | 5 ++++-
 .../anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java  | 5 +++++
 .../fin/biz/finpaymentrecord/FinPaymentrecordService.java    | 5 ++---
 6 files changed, 19 insertions(+), 6 deletions(-)

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 8b083de20c..ff795ce744 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
@@ -576,7 +576,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             String taskDefKey = rb.getData().getTaskDefKey();
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(rb.getData());
             updateFlowFiled(stringObjectMap);
-
             if ("Event_end".equals(taskDefKey)) {
                 BigDecimal deposit = booad.getDeposit();
                 if ("1".equals(booad.getIsBeforePayment())) {
@@ -698,6 +697,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     public void sendFinPaymentrecord(BusinessVariables bv, BaseOutsourcingApplication booad, String costTitleKey, String costTitleValue) {
         FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
         finPaymentrecordDto.setApplySid(bv.getBusinessSid());
+        finPaymentrecordDto.setPurchaseSystemSid(booad.getPurchaseSystemSid());
+        finPaymentrecordDto.setPurchaseSystemName(booad.getPurchaseSystemName());
         finPaymentrecordDto.setCreateBySid(booad.getCreateBySid());
         finPaymentrecordDto.setUpdateBySid(booad.getCreateBySid());
         //付款单位sid
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 7a06509a9c..f1117c090d 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
@@ -584,6 +584,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 //推送到财务出纳
                 if (busVehicleApply.getCurrentAmount() > 0) {
                     FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                    finPaymentrecordDto.setPurchaseSystemSid(busVehicleApply.getOrgDeptSid());
+                    finPaymentrecordDto.setPurchaseSystemName(busVehicleApply.getOrgDeptName());
                     finPaymentrecordDto.setApplySid(busVehicleApply.getSid());
                     finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid());
                     finPaymentrecordDto.setPayType(1);
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 0f66f3efda..0d91bbb815 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
@@ -102,5 +102,8 @@ public class FinPaymentrecord extends BaseEntity {
 
     @ApiModelProperty("供应商编码")
     private String payCode;
-
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java
index 04a28ac5ab..846ace5332 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java
@@ -81,5 +81,8 @@ public class FinPaymentrecordDetailsVo implements Vo {
     private String createOrgSid;
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid;
-
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
 }
\ No newline at end of file
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 397708ccd1..c3c58cfa78 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
@@ -89,4 +89,9 @@ public class FinPaymentrecordDto implements Dto {
     private String updateBySid;
     @ApiModelProperty("备注信息")
     private String remarks;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid; // 采购系统sid
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName; // 采购系统名称
 }
\ 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 c5ed429ae5..dba3f54738 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
@@ -255,16 +255,15 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         apPayBill.setFREMARK(finPaymentrecord.getPayRemark());
 //        apPayBill.setFPURCHASEORGID("101");
         //采购部门
-        SysOrganizationVo vo = new SysOrganizationVo();
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部");
         if (resultBean1.getSuccess()) {
-            vo = resultBean1.getData();
+            SysOrganizationVo vo = resultBean1.getData();
             if (vo != null) {
                 apPayBill.setFPURCHASEDEPTID(vo.getOrgCode());
             }
         }
         //采购组织
-        BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(vo.getSid()).getData();
+        BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(finPaymentrecord.getPurchaseSystemSid()).getData();
         if (data != null) {
             apPayBill.setFPURCHASEORGID(data.getOrgCode());
         } else {