From a87e451ee2628df1b1fec7cd5124331a2d23a396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Fri, 7 Apr 2023 15:39:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=8E=E7=8E=87=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SaleorderitemController.java | 4 ++-- .../basicInformation/purchaseorder/receiptinForm.vue | 3 +-- .../src/views/scm/basicInformation/saleback/Form.vue | 12 +++++++----- .../basicInformation/saleorder/receiptoutForm.vue | 2 +- .../scm/basicInformation/saleorder/salebackForm.vue | 12 +++++++----- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index e868d4cc..5fa76304 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -553,8 +553,8 @@ public class SaleorderitemController { if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){ JSONArray array = JSON.parseArray(saleorderitemCrForm.getPurchaseOrderId()); for (Object purchaseId : array) { - if (StringUtils.isNotEmpty(purchaseId.toString())) { - PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getInfo(purchaseId.toString()); + if (StringUtils.isNotEmpty(String.valueOf(purchaseId))) { + PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getInfo(String.valueOf(purchaseId)); if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) { purchaseorderitemEntity.setIsTransfer("1"); purchaseorderitemService.updateById(purchaseorderitemEntity); diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue index 847425c8..713740c4 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue @@ -595,7 +595,7 @@ this.dataForm.receiptin_item0List[i].poundType = b.pound_type; this.rateOptions.forEach((column, index) => { if (column.id == b.rate) { - this.dataForm.receiptin_item0List[i].rateamount = b.amount * column.fullName; + // this.dataForm.receiptin_item0List[i].rateamount = b.amount * column.fullName; } }); } @@ -660,7 +660,6 @@ this.rateOptions.find((item2) => { if (item.rate == item2.id) { item.rateamount =this.jnpf.floatDiv(item.amount,this.jnpf.floatAdd(1, this.jnpf.floatDiv(item2.fullName,100))).toFixed(2) - debugger } }) item.id = ''; diff --git a/SC-web/src/views/scm/basicInformation/saleback/Form.vue b/SC-web/src/views/scm/basicInformation/saleback/Form.vue index 7036ffaa..d0b5eab2 100644 --- a/SC-web/src/views/scm/basicInformation/saleback/Form.vue +++ b/SC-web/src/views/scm/basicInformation/saleback/Form.vue @@ -326,6 +326,8 @@ sums[index] = ''; } }); + this.dataForm.refundAmount = sums[7]; + this.dataForm.refundNum = sums[3]; return sums; }, popupSelectChange2(a, b){ @@ -348,15 +350,15 @@ this.dataForm.saleback_item0List[i].poundlistId = b.poundlistId; this.rateOptions.find((item) => { if (this.dataForm.saleback_item0List[i].rate == item.id) { - this.dataForm.saleback_item0List[i].notAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.saleback_item0List[i].amount,item.fullName),100) + this.dataForm.saleback_item0List[i].notAmount = this.jnpf.floatMul(this.jnpf.floatDiv(this.dataForm.saleback_item0List[i].amount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))),this.jnpf.floatDiv(item.fullName,100)).toFixed(2) } }) - sumNum = this.jnpf.floatAdd(sumNum,b.settlement); - sumPrice = this.jnpf.floatAdd(sumPrice,this.dataForm.saleback_item0List[i].amount); + // sumNum = this.jnpf.floatAdd(sumNum,b.settlement); + // sumPrice = this.jnpf.floatAdd(sumPrice,this.dataForm.saleback_item0List[i].amount); } } - this.dataForm.refundNum = sumNum; - this.dataForm.refundAmount = sumPrice; + // this.dataForm.refundNum = sumNum; + // this.dataForm.refundAmount = sumPrice; this.excludeFields = excludeFields; }, popupSelectChange(e,d){ diff --git a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue index a4511e70..f2e56577 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue @@ -445,7 +445,7 @@ this.dataForm.receiptout_item0List[i].deliveryNum = list[0].list[i].settlement; this.rateOptions.find((item) => { if (this.dataForm.receiptout_item0List[i].rate == item.id) { - this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.receiptout_item0List[i].amount, item.fullName),100) + this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatMul(this.jnpf.floatDiv(this.dataForm.receiptout_item0List[i].amount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))),this.jnpf.floatDiv(item.fullName,100)).toFixed(2) } }) this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit; diff --git a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue index 0bedd402..40321178 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue @@ -329,6 +329,8 @@ sums[index] = ''; } }); + this.dataForm.refundAmount = sums[7]; + this.dataForm.refundNum = sums[3]; return sums; }, popupSelectChange2(a, b){ @@ -350,15 +352,15 @@ this.dataForm.saleback_item0List[i].poundlistId = b.poundlistId; this.rateOptions.find((item) => { if (this.dataForm.saleback_item0List[i].rate == item.id) { - this.dataForm.saleback_item0List[i].notAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.saleback_item0List[i].amount,item.fullName),100) + this.dataForm.saleback_item0List[i].notAmount = this.jnpf.floatMul(this.jnpf.floatDiv(this.dataForm.saleback_item0List[i].amount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))),this.jnpf.floatDiv(item.fullName,100)).toFixed(2) } }) - sumNum = this.jnpf.floatAdd(sumNum,b.settlement); - sumPrice = this.jnpf.floatAdd(sumPrice,this.dataForm.saleback_item0List[i].amount); + // sumNum = this.jnpf.floatAdd(sumNum,b.settlement); + // sumPrice = this.jnpf.floatAdd(sumPrice,this.dataForm.saleback_item0List[i].amount); } } - this.dataForm.refundNum = sumNum; - this.dataForm.refundAmount = sumPrice; + // this.dataForm.refundNum = sumNum; + // this.dataForm.refundAmount = sumPrice; this.excludeFields = excludeFields; }, popupSelectChange(e,d){