修改返利凭证业务日期

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();

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();

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("客户交纳")) {
                 //按照采购系统分组

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();

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();

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();

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();