From 6f4da11950e55072b5c0650fd6602a2494a88cc7 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Thu, 16 Jan 2025 11:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/scmspecialrebatewith/ScmSpecialRebateWithService.java  | 3 ++-
 .../scm/biz/scmvehrebatewith/ScmVehRebateWithService.java      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java
index f74cd2fa31..62b835e0b1 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java
@@ -88,8 +88,9 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
             ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(s);
             ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo();
             BeanUtil.copyProperties(scmSpecialRebate, scmSpecialRebateDetailsVo);
-            scmSpecialRebateDetailsVo.setExpectCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
+            scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
             scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
+            scmSpecialRebateDetailsVo.setSpecialRebateSid(s);
             scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
         }
         return rb.success().setData(scmSpecialRebateDetailsVos);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
index 3e50366926..61e9da0e2b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
@@ -148,6 +148,7 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
             ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(s);
             ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();
             BeanUtil.copyProperties(scmVehRebate, scmVehRebateDetailsVo);
+            scmVehRebateDetailsVo.setWithholdCost(scmVehRebateDetailsVo.getExpectTreatCost().add(scmVehRebateDetailsVo.getExpectSuppCost()));
             scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString());
             scmVehRebateDetailsVo.setVehRebateSid(scmVehRebate.getSid());
             scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);