From 6fef005d539cd72e752c8a30a12dbcbbacbd599d Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 21 Oct 2024 09:48:53 +0800
Subject: [PATCH 1/2] 1

---
 .../yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index 3b6f1792c9..4a2b913841 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -627,6 +627,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 scmVehRebate.setCalculationStandard(info.getCalculationStandard());
                 scmVehRebate.setEstimateRebate(info.getEstimateRebate());
                 scmVehRebate.setPalceGenDate(info.getPalceGenDate());
+                scmVehRebate.setExpectTreatCost(new BigDecimal(info.getExpectTreatCost()));
+                scmVehRebate.setExpectSuppCost(new BigDecimal(info.getExpectSuppCost()));
+                scmVehRebate.setExpectSuppRemark(info.getExpectSuppRemark());
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
                 scmVehRebate.setCreateOrgSid(useOrgSid);

From 5947b64d54df9422a4c07cb294b9df06137e9194 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 21 Oct 2024 10:20:17 +0800
Subject: [PATCH 2/2] 1

---
 .../com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index 4a2b913841..ad40df3e28 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -630,6 +630,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 scmVehRebate.setExpectTreatCost(new BigDecimal(info.getExpectTreatCost()));
                 scmVehRebate.setExpectSuppCost(new BigDecimal(info.getExpectSuppCost()));
                 scmVehRebate.setExpectSuppRemark(info.getExpectSuppRemark());
+                scmVehRebate.setRemarks(info.getRemarks());
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
                 scmVehRebate.setCreateOrgSid(useOrgSid);