From 67f89c963c9f45317f9e5f992312a8d8339ac4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Fri, 2 Jun 2023 10:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../poundlist/service/impl/PoundlistServiceImpl.java |  6 ++----
 .../scm/basicInformation/poundlist/ImportForm.vue    | 12 ++++++------
 .../scm/basicInformation/poundlist/salesForm.vue     | 11 ++++++++---
 3 files changed, 16 insertions(+), 13 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 2be7ef0f..8ee75b9d 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
@@ -278,7 +278,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
                 PoundlistEntity model = personList.get(i);
                 if (StringUtils.isBlank(model.getCustomerName()) && StringUtils.isBlank(model.getVehicleName()) && model.getGrossWeight() == null
                         && model.getTareWeight() == null && model.getSettlement() == null && StringUtils.isBlank(model.getUnit())
-                        && model.getSalesPrice()==null && StringUtils.isBlank(model.getSalesAmount())) {
+                        && StringUtils.isBlank(model.getSalesAmount())) {
                 }else{
                     dataRowMap.put("customerName", model.getCustomerName());
                     dataRowMap.put("vehicleName", model.getVehicleName());
@@ -286,7 +286,6 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
                     dataRowMap.put("tareWeight", model.getTareWeight());
                     dataRowMap.put("settlement", model.getSettlement());
                     dataRowMap.put("unit", model.getUnit());
-                    dataRowMap.put("salesPrice", model.getSalesPrice());
                     dataRowMap.put("salesAmount", model.getSalesAmount());
                     dataRow.add(dataRowMap);
                 }
@@ -331,8 +330,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
         map.put(4, "皮重");
         map.put(5, "结算重量");
         map.put(6, "单位");
-        map.put(7, "销售单价");
-        map.put(8, "销售金额");
+        map.put(7, "销售金额");
         return map.get(key);
     }
 
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/ImportForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/ImportForm.vue
index 0972876e..2f3d3b44 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/ImportForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/ImportForm.vue
@@ -66,11 +66,11 @@
             <el-input v-model="scope.row.unit" />
           </template>
         </el-table-column>
-        <el-table-column prop="salesPrice" label="销售单价" width="150">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.salesPrice" />
-          </template>
-        </el-table-column>
+<!--        <el-table-column prop="salesPrice" label="销售单价" width="150">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-input v-model="scope.row.salesPrice" />-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column prop="salesAmount" label="销售金额" width="150">
           <template slot-scope="scope">
             <el-input v-model="scope.row.salesAmount" />
@@ -113,7 +113,7 @@
           <el-table-column prop="tareWeight" label="皮重" width="120" />
           <el-table-column prop="settlement" label="结算重量" width="120" />
           <el-table-column prop="unit" label="单位" width="100" />
-          <el-table-column prop="salesPrice" label="销售单价" width="150" />
+<!--          <el-table-column prop="salesPrice" label="销售单价" width="150" />-->
           <el-table-column prop="salesAmount" label="销售金额" width="150" />
           <el-table-column prop="causeError" label="错误原因" width="100" />
         </JNPF-table>
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
index c9b84e3c..37adaf47 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
@@ -1071,13 +1071,18 @@
         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].settlement == null){
+            list[i].settlement == 0
+          }
+          // this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
           this.dataForm.salesorder_item0List[i].poundlistId = list[i].id
           if(list[i].price != null){
+            this.dataForm.salesorder_item0List[i].unitPrice = this.jnpf.floatDiv(list[i].price, list[i].settlement).toFixed(6)
             this.dataForm.salesorder_item0List[i].price = list[i].price.toFixed(2)
-          }else{
-            this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, list[i].settlement).toFixed(2)
           }
+          // else{
+          //   this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, 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)