From e97cca4d8ec3afa91388e09ede44b3a29c63763d Mon Sep 17 00:00:00 2001
From: Vayne <vayne0702@163.com>
Date: Tue, 11 Apr 2023 20:18:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PoundlistServiceImpl.java         |  8 ++++++--
 .../scm/basicInformation/poundlist/salesForm.vue   | 14 +++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
index 00ab3552..003387ae 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
@@ -476,8 +476,12 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
                                     poundlistEntity.setMaterialName(materialEntity.getItemName());
                                 }
                                 poundlistEntity.setRate("0");
-                                poundlistEntity.setUnitPrice(new BigDecimal(model.getSalesPrice()));
-                                poundlistEntity.setPrice(new BigDecimal(model.getSalesAmount()));
+                                if (StringUtils.isNotEmpty(model.getSalesPrice())){
+                                    poundlistEntity.setUnitPrice(new BigDecimal(model.getSalesPrice()));
+                                }
+                                if (StringUtils.isNotEmpty(model.getSalesAmount())){
+                                    poundlistEntity.setPrice(new BigDecimal(model.getSalesAmount()));
+                                }
                                 poundlistEntityList.add(poundlistEntity);
                                 sum++;
                             }else{
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
index 97410a00..191cd07d 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
@@ -1072,9 +1072,17 @@
         var advance = 0
         var notPrice = 0
         for (let i = 0; i < list.length; i++) {
-          // this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
+          if(list[i].salesPrice != null){
+            this.dataForm.salesorder_item0List[i].unitPrice = list[i].unitPrice;
+          }else{
+            this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
+          }
           this.dataForm.salesorder_item0List[i].poundlistId = list[i].id
-          this.dataForm.salesorder_item0List[i].price = list[i].price.toFixed(2)
+          if(list[i].price != null){
+            this.dataForm.salesorder_item0List[i].price = list[i].price.toFixed(2)
+          }else{
+            this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].unitPrice, list[i].settlement).toFixed(2)
+          }
           this.rateOptions.find((item) => {
             if (this.dataForm.salesorder_item0List[i].rate == item.id) {
               this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.dataForm.salesorder_item0List[i].price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.fullName,100))).toFixed(2)
@@ -1082,7 +1090,7 @@
             }
           })
           if (list[i].advance == 1) {
-            advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].salesPrice, list[i].settlement)).toFixed(2)
+            advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].unitPrice, list[i].settlement)).toFixed(2)
           }
           num = this.jnpf.floatAdd(num, list[i].settlement)
           amount = this.jnpf.floatAdd(amount, list[i].price)