Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -1299,6 +1299,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                     //上传返利金额
                     BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceItureCost())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
@@ -1324,6 +1325,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                     excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
                 }
             }
+        }
         StringBuffer sbcheck1 = new StringBuffer();
         if (!checkWord.isEmpty()) {
             for (String s : checkWord) {
@@ -1826,6 +1828,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
+                if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                     //上传返利金额
                     BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getMoney())).subtract(new BigDecimal(excelInfo.getSecondItureCost())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));
@@ -1851,6 +1854,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                     excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
                 }
             }
+        }
         StringBuffer sbcheck1 = new StringBuffer();
         if (!checkWord.isEmpty()) {
             for (String s : checkWord) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -1606,6 +1606,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){
                     int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                     //上传返利金额
                     BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
@@ -1631,6 +1632,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
                 }
             }
+        }
         StringBuffer sbcheck1 = new StringBuffer();
         if (!checkWord.isEmpty()) {
             for (String s : checkWord) {
@@ -2097,6 +2099,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
+                if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){
                     int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                     //上传返利金额
                     BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));
@@ -2122,6 +2125,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
                 }
             }
+        }
         StringBuffer sbcheck1 = new StringBuffer();
         if (!checkWord.isEmpty()) {
             for (String s : checkWord) {

yxt-as-ui/src/views/goods/goods/index.vue

@@ -367,15 +367,12 @@
       toAdd() {
         this.viewState = 2
         var orgSid = ''
-        getOrgSidByPath({
+        getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath')
-        }).then((res) => {
           if (res.success) {
             orgSid = res.data
+            this.$refs['divadd'].showAdd(window.sessionStorage.getItem('userSid'), orgSid, window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1))
           }
         })
-        this.$refs['divadd'].showAdd(window.sessionStorage.getItem('userSid'), orgSid, window.sessionStorage.getItem(
-          'defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1))
       },
       toEdit() {