From 266443f369a2744daa3a69c23e8ef810fc57de09 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Fri, 7 Feb 2025 13:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=88=A9=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81=E4=B8=9A=E5=8A=A1=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScmCollectionrebateCheckapplyService.java                | 2 +-
 .../ScmCollectionRebateWithApplyService.java                 | 5 +----
 .../scmfinanceadjustapply/ScmFinanceAdjustApplyService.java  | 2 +-
 .../ScmSpecialrebateCheckapplyService.java                   | 2 +-
 .../ScmSpecialRebateWithApplyService.java                    | 4 +---
 .../ScmVehrebateCheckapplyService.java                       | 4 +---
 .../scmvehrebatewithapply/ScmVehRebateWithApplyService.java  | 2 +-
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
index 07ee8fbe98..549fa71974 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
@@ -365,9 +365,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
      * @param sid
      */
     public void pusCollectionRebateWithVoucher(String sid) {
-        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmCollectionrebateCheckapply entity = fetchBySid(sid);
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
index 4e22c8f622..01d8404267 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
@@ -45,11 +45,8 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 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.scmcollectionrebate.ScmCollectionRebate;
 import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution;
@@ -383,9 +380,9 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
      * @param sid
      */
     public void pushCollectionRebateWithVoucher(String sid) {
-        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String  summaryTag = "";//摘要前缀
         ScmCollectionRebateWithApply entity = fetchBySid(sid);
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCollectionApply())) {
                 summaryTag = entity.getCollectionApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
index 34691c9e8a..010aaca67e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
@@ -713,7 +713,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
         ScmFinanceAdjustApply adjustApply = fetchBySid(sid);
         String adjustWay = adjustApply.getAdjustWay();
         List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(sid);
-        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
+        String format = scmVehRebateWithApplyService.returnBusDate(adjustApply.getCreateTime());
         if (!details.isEmpty() && details.size() > 0) {
             if (adjustWay.equals("客户交纳")) {
                 //按照采购系统分组
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
index 1f3dbdc5c2..6e042378ff 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
@@ -438,9 +438,9 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
      *
      */
     public void pushSpecialRebateWithVoucher(String sid) {
-        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmSpecialrebateCheckapply entity = fetchBySid(sid);
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
index 040361c6b2..9df8ed5254 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
@@ -49,11 +49,9 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 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.scmspecialrebate.ScmSpecialRebate;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith;
@@ -431,9 +429,9 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
      * @param sid
      */
     public void pushSpecialRebateWithVoucher(String sid) {
-        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String  summaryTag = "";//摘要前缀
         ScmSpecialRebateWithApply entity = fetchBySid(sid);
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getWithApply())) {
                 summaryTag = entity.getWithApply();
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
index ecc22e0ef0..3f238e9d5c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
@@ -53,11 +53,9 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 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.scmvehrebatecheckapply.*;
@@ -519,9 +517,9 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
      * @param sid,tag (0代表核对申请通过推送，1代表重推功能)
      */
     public void pushVehRebateWithVoucher(String sid) {
-        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmVehrebateCheckapply entity = fetchBySid(sid);
+        String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getCheckApply())) {
                 summaryTag = entity.getCheckApply();
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 c7cd233a11..07c90c47c9 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
@@ -482,9 +482,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
      * @param sid
      */
     public void pushVehRebateWithVoucher(String sid) {
-        String format = returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmVehRebateWithApply entity = fetchBySid(sid);
+        String format = returnBusDate(entity.getCreateTime());
         if (null != entity) {
             if (StringUtils.isNotBlank(entity.getWithApply())) {
                 summaryTag = entity.getWithApply();