From 3082edac11d913ec5973d1379ec5dd6f04930cb3 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Wed, 15 Jan 2025 10:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E8=BD=A6=E9=A2=84?=
 =?UTF-8?q?=E6=8F=90=E6=8E=A8=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/kingdee/voucher/GeneralVoucher.java   |  2 ++
 .../fin/biz/kingdee/FinKingDeeFeignRest.java  |  4 +---
 .../ScmVehRebateWithApplyService.java         | 23 +++++++++++--------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java
index 107a51d067..54302d8981 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java
@@ -56,5 +56,7 @@ public class GeneralVoucher {
         public String material;
         @ApiModelProperty("备注")
         public String remarks;
+        @ApiModelProperty("采购系统sid")
+        public String purchaseSystemSid;
     }
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
index 67c8ba1128..bf9ccc8d03 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
@@ -254,7 +254,6 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         BigDecimal total = BigDecimal.ZERO;//合计
         String deptNo = "";
         String manufacturer = "";
-        String customer = "";
         String timeFlag = "";
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
@@ -267,7 +266,6 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 total = total.add(amount);
                 deptNo = voucherDetail.getDeptCode();
                 manufacturer = voucherDetail.getManufacturer();
-                customer = voucherDetail.getCustomerCode();
                 timeFlag = voucherDetail.getTimeFlag();
             }
             if (shangnian.compareTo(BigDecimal.ZERO) != 0) {
@@ -291,7 +289,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
             dto2.setSummary(timeFlag + "单车返利预提预留费用");
             dto2.setSubjectNo("2181.07.00");
-            dto2.setDimensionCustom(customer);
+            dto2.setDimensionCustom("DZFCJFL");
             dto2.setCredit(String.valueOf(total));
             resultDetails.add(dto2);
             newVoucher.setResultDetails(resultDetails);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
index b68e6fc05a..cd52dee00d 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
@@ -38,7 +38,6 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill;
@@ -61,7 +60,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
-import com.yxt.anrui.scm.api.scmvehrebatewith.*;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWith;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithPdfVo;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.*;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
@@ -499,8 +501,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
             String finalSummaryTag = summaryTag;
             String[] split = finalSummaryTag.split("年");
             String y1 = split[0]; //预提申请标题年份
-            map.forEach((k, v) -> {
-                List<ScmVehRebate> rebates = v;
+            // 方法一：在日常开发中使用比较多的，一般在键值对都需要使用
+            for (Map.Entry<String, List<ScmVehRebate>> entry : map.entrySet()) {
+                List<ScmVehRebate> v = entry.getValue();
                 GeneralVoucher generalVoucher = new GeneralVoucher();
                 generalVoucher.setBussDate(format);
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
@@ -611,7 +614,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                                 BigDecimal esRebate = new BigDecimal(rebate.getEstimateRebate());
                                 if (esRebate.compareTo(BigDecimal.ZERO) != 0) {
                                     voucherDetail.setAmount(esRebate);
-                                    voucherDetails.add(voucherDetail);
+                                    voucherDetailsJR.add(voucherDetail);
                                 }
                             }
 
@@ -621,16 +624,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                         generalVoucher.setVoucherDetails(voucherDetails);
                         finKingDeeFeign.saveRebatePrepareVoucher(generalVoucher);
                     }
-                    if (!voucherDetailsJR.isEmpty()) {
-                        generalVoucher.setVoucherDetails(voucherDetailsJR);
-                        finKingDeeFeign.saveJRRebatePrepareVoucher(generalVoucher);
-                    }
+//                    if (!voucherDetailsJR.isEmpty()) {
+//                        generalVoucher.setVoucherDetails(voucherDetailsJR);
+//                        finKingDeeFeign.saveJRRebatePrepareVoucher(generalVoucher);
+//                    }
                     if (!resultDetails.isEmpty()) {
                         costAdjustmentsBill.setResultDetails(resultDetails);
                         finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill);
                     }
                 }
-            });
+            }
         }
     }