Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -5626,6 +5626,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     } else {
                         vinNo = linkNo;
                     }
+                    importSleepData.setVinNo(vinNo);
                     LoanRepaymentSchedule mainSchedule = baseMapper.selByBankContractNoForSleepData(bankContractNo, vinNo);
                     if (null != mainSchedule) {
                         List<LoanRepaymentPlanDetails> p = loanRepaymentPlanDetailsService.selByMainSid(mainSchedule.getSid());

yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@@ -359,7 +359,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.count === null ? '0' : e.count !== '' ? e.count : '0')) * 100) / 100
           }
         })
       }
@@ -371,7 +371,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
+            cg = Math.round((parseFloat(cg) + parseFloat(e.amount === null ? '0' : e.amount !== '' ? e.amount : '0')) * 100) / 100
           }
         })
       }

yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue

@@ -262,7 +262,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.count === null ? '0' : e.count !== '' ? e.count : '0')) * 100) / 100
           }
         })
       }
@@ -274,7 +274,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
+            cg = Math.round((parseFloat(cg) + parseFloat(e.amount === null ? '0' : e.amount !== '' ? e.amount : '0')) * 100) / 100
           }
         })
       }

yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue

@@ -368,7 +368,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.count === null ? '0' : e.count !== '' ? e.count : '0')) * 100) / 100
           }
         })
       }
@@ -380,7 +380,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
+            cg = Math.round((parseFloat(cg) + parseFloat(e.amount === null ? '0' : e.amount !== '' ? e.amount : '0')) * 100) / 100
           }
         })
       }

yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@@ -375,7 +375,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.count === null ? '0' : e.count !== '' ? e.count : '0')) * 100) / 100
           }
         })
       }
@@ -387,7 +387,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
+            cg = Math.round((parseFloat(cg) + parseFloat(e.amount === null ? '0' : e.amount !== '' ? e.amount : '0')) * 100) / 100
           }
         })
       }

yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue

@@ -297,7 +297,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.count === null ? '0' : e.count !== '' ? e.count : '0')) * 100) / 100
           }
         })
       }
@@ -309,7 +309,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
+            cg = Math.round((parseFloat(cg) + parseFloat(e.amount === null ? '0' : e.amount !== '' ? e.amount : '0')) * 100) / 100
           }
         })
       }