Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6116,8 +6116,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 dto.setFinSourceKey(busSalesOrder.getFinancePlan());
                 SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
                 if (loanSolutions != null) {
-                    //2三方金融、3自营非担保
+                    if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
-                    dto.setFinSourceKey(StringUtils.isNotBlank(loanSolutions.getTypeKey()) ? "3" : "2");
+                        if ("02".equals(loanSolutions.getTypeKey())) {
+                            dto.setFinSourceKey("2");//三方金融
+                        } else {
+                            dto.setFinSourceKey("3");//自营非担保
+                        }
+                    }
                 }
             } else {
                 dto.setFinSourceKey(busSalesOrder.getFinancePlan());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@@ -27,15 +27,11 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.*;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.*;
-import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.VehRebateCheckExcelVo;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath;
 import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -50,7 +46,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Api(tags = "专项返利核对申请表")
 @RestController
@@ -67,7 +65,8 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
     @Override
     public ResultBean rePushVoucher(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1");
+        Map<String,Integer> mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交，1代表二次提交
+        scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1",mapCheckState);
         return rb.success();
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -64,10 +64,6 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialReb
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplyDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
 import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
 import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
@@ -452,7 +448,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
      *
      * @param sid,tag (0代表核对申请通过推送，1代表重推功能)
      */
-    public void pushSpecialRebateWithVoucher(String sid, String tag) {
+    public void pushSpecialRebateWithVoucher(String sid, String tag, Map<String,Integer> mapCheckState) {
         String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmSpecialrebateCheckapply entity = fetchBySid(sid);
@@ -484,6 +480,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                 if (!v.isEmpty()) {
                     for (ScmSpecialRebate rebate : v) {
+                        Integer onceState = 0;
+                        if (tag.equals("0") && mapCheckState.size() > 0) {
+                            onceState = mapCheckState.get(rebate.getSid());
+                        }
                         if (StringUtils.isNotBlank(rebate.getUseOrgSid())) {
                             String useOrgSid = rebate.getUseOrgSid();
                             SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
@@ -512,7 +512,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             }
                         }
                         if (!rebate.getRebateTypeValue().equals("行销活动")) {
-                            if (rebate.getOnceCheckState().intValue() == 0 || tag.equals("1")) {
+                            if (onceState.intValue() == 2 || tag.equals("1")) {
                                 //没有进行过核对申请
                                 BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
                                 BigDecimal yicifanli = BigDecimal.ZERO;//一次应收返利返利
@@ -687,7 +687,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 }
                             }
                         } else {
-                            if (rebate.getOnceCheckState().intValue() == 0 || tag.equals("1")) {
+                            if (onceState.intValue() == 2 || tag.equals("1")) {
                                 //没有进行过核对申请
                                 BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
                                 BigDecimal yicidaizhifu = BigDecimal.ZERO;//一次待支付金额
@@ -906,8 +906,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
+                Map<String,Integer> mapCheckState = new HashMap<>();
                 for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
                     ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
+                    mapCheckState.put(scmSpecialRebate.getSid(),scmSpecialRebate.getOnceCheckState());
                     if ("是".equals(scmSpecialRebate.getIsAdjustment())) {
                         scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
                         scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
@@ -917,7 +919,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                     scmSpecialRebateService.updateOnceCheckState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
                 }
 
-                pushSpecialRebateWithVoucher(bv.getBusinessSid(),"0");
+                pushSpecialRebateWithVoucher(bv.getBusinessSid(),"0",mapCheckState);
             }
             return rb.success().setData(resultBean.getData());
         } else {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java

@@ -27,14 +27,11 @@ package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapply.*;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.*;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ExcelVo;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath;
 import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -49,7 +46,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(单车返利核对) <br/>
@@ -79,7 +78,8 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
     @Override
     public ResultBean rePushVoucher(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        scmVehrebateCheckapplyService.pushVehRebateWithVoucher(sid,"1");
+        Map<String,Integer> map = new HashMap<>();
+        scmVehrebateCheckapplyService.pushVehRebateWithVoucher(sid,"1",map);
         return rb.success();
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -486,8 +486,10 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
-                for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
+                Map<String,Integer> mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交，1代表二次提交
+                 for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
                     ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(scmVehrebateCheckapplydetailVo.getVehRebateSid());
+                    mapCheckState.put(scmVehRebate.getSid(),scmVehRebate.getOnceCheckState());
                     if ("是".equals(scmVehRebate.getIsAdjustment())) {
                         scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 4);
                         scmVehRebateService.updateAdjustmentState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
@@ -496,8 +498,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                     }
                     scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
                 }
-
+                pushVehRebateWithVoucher(bv.getBusinessSid(), "0",mapCheckState); //推送返利核对凭证
-                pushVehRebateWithVoucher(bv.getBusinessSid(), "0"); //推送返利核对凭证
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -510,7 +511,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
      *
      * @param sid,tag (0代表核对申请通过推送，1代表重推功能)
      */
-    public void pushVehRebateWithVoucher(String sid, String tag) {
+    public void pushVehRebateWithVoucher(String sid, String tag,Map<String,Integer> mapCheckState) {
         String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmVehrebateCheckapply entity = fetchBySid(sid);
@@ -551,6 +552,10 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                         String customerCode = ""; //出库单客户编码
                         String vinCode = ""; //物料
                         String gysCode = ""; //供应商
+                        Integer checkState = 0;
+                        if (tag.equals("0") && mapCheckState.size() > 0) {
+                            checkState = mapCheckState.get(rebate.getSid());
+                        }
                         SysOrganizationVo data = sysOrganizationFeign.fetchBySid(rebate.getPurchaseSystemSid()).getData();
                         if (null != data) {
                             deptCode = data.getOrgCode();
@@ -587,7 +592,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                         }
 
                         if (!rebate.getRebateTypeValue().equals("金融贴息")) {
-                            if (rebate.getOnceCheckState().intValue() == 0 || tag.equals("1")) {
+                            if (checkState.intValue() == 2 || tag.equals("1")) {
                                 //没有进行过核对申请
                                 BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
                                 BigDecimal yicifanli = BigDecimal.ZERO;//一次应收返利返利
@@ -744,7 +749,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
 
 
                         } else {
-                            if (rebate.getOnceCheckState().intValue() == 0 || tag.equals("1")) {
+                            if (checkState.intValue() == 2 || tag.equals("1")) {
                                 //没有进行过核对申请
                                 BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
                                 if (StringUtils.isNotBlank(rebate.getUploadMoney())) {