From 371e3830abe6cb03a9012155f65b3e1e1a5ba1c1 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Thu, 23 Mar 2023 11:03:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8F=8A=E5=85=B6?=
 =?UTF-8?q?=E5=AE=83=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/admin/components/LineChartA.vue | 32 ++++++++++++++--
 .../dashboard/admin/components/LineChartB.vue | 31 +++++++++++++--
 SC-web/src/views/dashboard/admin/index.vue    | 38 +------------------
 .../scm/basicInformation/natural/Form.vue     |  4 +-
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/SC-web/src/views/dashboard/admin/components/LineChartA.vue b/SC-web/src/views/dashboard/admin/components/LineChartA.vue
index 1c52249e..d85bf6f8 100644
--- a/SC-web/src/views/dashboard/admin/components/LineChartA.vue
+++ b/SC-web/src/views/dashboard/admin/components/LineChartA.vue
@@ -1,5 +1,12 @@
 <template>
-  <div id="charta" style="width:100%;height:400px;margin-top:30px;"></div>
+  <el-row style="background:#fff;padding:0 16px;margin-bottom:10px;border-radius: 4px;">
+    <div class="dateSelect">
+      <el-date-picker v-model="nowTime" type="date" placeholder="近7日" size="small" @change="fnDateChg">
+      </el-date-picker>
+    </div>
+    <div id="charta" style="width:100%;height:400px;margin-top:30px;"></div>
+  </el-row>
+  <!-- <div id="charta" style="width:100%;height:400px;margin-top:30px;"></div> -->
 </template>
 
 <script>
@@ -10,6 +17,7 @@ export default {
   mixins: [resize],
   data() {
     return {
+      nowTime: '',
       chart: null,
       option: {
         title: {
@@ -44,8 +52,8 @@ export default {
         xAxis: {
           type: 'category',
           boundaryGap: false,
-          data: ['2AM', '4AM', '6AM', '8AM', '10AM',
-            '12AM', '2PM', '4PM', '6PM', '8PM', '10PM', '12PM'],
+          data: ['2023-3-17', '2023-3-18', '2023-3-19', '2023-3-20', '2023-3-21',
+            '2023-3-22', '2023-3-23'],
           axisLine: {
             show: false, //是否显示x轴
             lineStyle: {
@@ -89,7 +97,7 @@ export default {
           },
         },
         series: [{
-          data: [0, 2820, 8932, 5700, 7901, 4934, 5000, 3000, 4090, 2330, 3820, 0],
+          data: [100, 200, 300, 400, 500, 600, 700],
           type: 'line',
           radius: '100%',
           center: ['100%', '50%'],
@@ -126,7 +134,23 @@ export default {
       this.chart = echarts.init(document.getElementById('charta'))
       this.chart.setOption(this.option);
       window.onresize = this.chart.resize()
+    },
+    fnDateChg(val) {
+      console.log(val.getTime())
     }
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.dateSelect {
+  position: absolute;
+  right: 67px;
+  top: 38px;
+  z-index: 100;
+
+  .el-date-editor {
+    width: 160px;
+  }
+}
+</style>
diff --git a/SC-web/src/views/dashboard/admin/components/LineChartB.vue b/SC-web/src/views/dashboard/admin/components/LineChartB.vue
index c546535e..eb6ab1ed 100644
--- a/SC-web/src/views/dashboard/admin/components/LineChartB.vue
+++ b/SC-web/src/views/dashboard/admin/components/LineChartB.vue
@@ -1,5 +1,11 @@
 <template>
-  <div id="chartb" style="width:100%;height:400px;margin-top:30px;"></div>
+  <el-row style="background:#fff;padding:0 16px;margin-bottom:10px;border-radius: 4px;">
+    <div class="dateSelect">
+      <el-date-picker v-model="nowTime" type="date" placeholder="近7日" size="small" @change="fnDateChg">
+      </el-date-picker>
+    </div>
+    <div id="chartb" style="width:100%;height:400px;margin-top:30px;"></div>
+  </el-row>
 </template>
 
 <script>
@@ -10,6 +16,7 @@ export default {
   mixins: [resize],
   data() {
     return {
+      nowTime: '',
       chart: null,
       option: {
         title: {
@@ -44,8 +51,8 @@ export default {
         xAxis: {
           type: 'category',
           boundaryGap: false,
-          data: ['2AM', '4AM', '6AM', '8AM', '10AM',
-            '12AM', '2PM', '4PM', '6PM', '8PM', '10PM', '12PM'],
+          data: ['2023-3-17', '2023-3-18', '2023-3-19', '2023-3-20', '2023-3-21',
+            '2023-3-22', '2023-3-23'],
           axisLine: {
             show: false, //是否显示x轴
             lineStyle: {
@@ -89,7 +96,7 @@ export default {
           },
         },
         series: [{
-          data: [0, 2820, 8932, 5700, 7901, 4934, 5000, 3000, 4090, 2330, 3820, 0],
+          data: [100, 200, 300, 400, 500, 600, 700],
           type: 'line',
           radius: '100%',
           center: ['100%', '50%'],
@@ -126,7 +133,23 @@ export default {
       this.chart = echarts.init(document.getElementById('chartb'))
       this.chart.setOption(this.option);
       window.onresize = this.chart.resize()
+    },
+    fnDateChg(val) {
+      console.log(val.getTime())
     }
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.dateSelect {
+  position: absolute;
+  right: 67px;
+  top: 38px;
+  z-index: 100;
+
+  .el-date-editor {
+    width: 160px;
+  }
+}
+</style>
diff --git a/SC-web/src/views/dashboard/admin/index.vue b/SC-web/src/views/dashboard/admin/index.vue
index c93b8c84..e13e4543 100644
--- a/SC-web/src/views/dashboard/admin/index.vue
+++ b/SC-web/src/views/dashboard/admin/index.vue
@@ -42,48 +42,14 @@
       </ul>
     </div>
     <panel-group />
-    <!-- <el-row style="background:#fff;padding:0 16px;margin-bottom:10px;border-radius: 4px;">
-      <div class="dateSelect">
-        <el-date-picker v-model="value1" type="date" placeholder="进7日" size="small">
-        </el-date-picker>
-      </div>
-      <line-chart-a />
-    </el-row>
-    <el-row style="background:#fff;padding:0 16px;margin-bottom:10px;border-radius: 4px;">
-      <div class="dateSelect">
-        <el-date-picker v-model="value1" type="date" placeholder="进7日" size="small">
-        </el-date-picker>
-      </div>
-      <line-chart-b />
-    </el-row> -->
     <el-row :gutter="12">
       <el-col :span="12">
-        <el-row style="background:#fff;padding:0 16px;margin-bottom:10px;border-radius: 4px;">
-          <div class="dateSelect">
-            <el-date-picker v-model="value1" type="date" placeholder="进7日" size="small">
-            </el-date-picker>
-          </div>
-          <line-chart-a />
-        </el-row>
+        <line-chart-a />
       </el-col>
       <el-col :span="12">
-        <el-row style="background:#fff;padding:0 16px;margin-bottom:10px;border-radius: 4px;">
-          <div class="dateSelect">
-            <el-date-picker v-model="value1" type="date" placeholder="进7日" size="small">
-            </el-date-picker>
-          </div>
-          <line-chart-b />
-        </el-row>
+        <line-chart-b />
       </el-col>
     </el-row>
-    <!-- <el-row style="background:#fff;padding:0 16px;margin-bottom:10px;border-radius: 4px;">
-      <div class="dateSelect">
-        <el-date-picker v-model="value1" type="date" placeholder="选择日期" size="small">
-        </el-date-picker>
-      </div>
-      <line-chart />
-    </el-row> -->
-    <!-- <PortalLayoutC :layout="layout" v-if="type === 0" /> -->
     <el-row :gutter="10" class="notice">
       <el-col :span="12">
         <div class="notice_left">
diff --git a/SC-web/src/views/scm/basicInformation/natural/Form.vue b/SC-web/src/views/scm/basicInformation/natural/Form.vue
index d70bd023..e1cddee2 100644
--- a/SC-web/src/views/scm/basicInformation/natural/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/natural/Form.vue
@@ -4,14 +4,14 @@
         <el-row :gutter="15" class="">
             <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="left">
                 <template v-if="!loading">
-                    <el-col :span="24">
+                    <!-- <el-col :span="24">
                         <el-form-item label-width="0">
                             <JNPF-Text :style='{ "width": "100%" }'
                                 :textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 18, "line-height": 32, "font-style": "normal", "text-align": "left" }'
                                 value="自然人档案">
                             </JNPF-Text>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="24">
                         <el-form-item label="姓名" prop="name">
                             <el-input v-model="dataForm.name" placeholder="请输入姓名" clearable :style='{ "width": "100%" }'>

From 0830425fae0c38b96ddd15b1f660e9f2b70bb5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Thu, 23 Mar 2023 13:23:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arinvoices/entity/ArinvoicesEntity.java   | 27 ++++---
 .../entity/Arinvoices_item0Entity.java        | 27 ++++---
 .../entity/Arinvoices_item1Entity.java        | 27 ++++---
 .../controller/CollectionController.java      | 30 ++++++--
 .../collection/entity/CollectionEntity.java   | 71 +++++++++----------
 .../entity/Collection_item0Entity.java        | 27 ++++---
 .../receiptout/entity/ReceiptoutEntity.java   | 27 ++++---
 .../entity/Receiptout_item0Entity.java        | 27 ++++---
 .../jnpf/saleback/entity/SalebackEntity.java  | 27 ++++---
 .../saleback/entity/Saleback_item0Entity.java | 29 ++++----
 .../entity/Arinvoices_item0soitemEntity.java  | 27 ++++---
 .../entity/CollectionsoitemEntity.java        | 27 ++++---
 .../saleorder/entity/PaymentsoitemEntity.java | 27 ++++---
 .../entity/ReceiptoutsoitemEntity.java        | 27 ++++---
 .../saleorder/entity/SaleorderitemEntity.java | 27 ++++---
 .../entity/SalesbacksoitemEntity.java         | 27 ++++---
 .../entity/Salesorder_item0Entity.java        | 27 ++++---
 .../mapper/arinvoices/ArinvoicesMapper.xml    |  1 +
 .../mapper/collection/CollectionMapper.xml    |  2 +
 .../mapper/receiptout/ReceiptoutMapper.xml    |  1 +
 .../mapper/saleback/SalebackMapper.xml        |  2 +
 SC-web/src/utils/jnpf.js                      |  4 +-
 .../scm/basicInformation/arinvoices/Form.vue  | 10 ++-
 .../scm/basicInformation/collection/Form.vue  |  8 +--
 .../basicInformation/poundlist/salesForm.vue  | 32 ++++-----
 .../scm/basicInformation/receiptout/Form.vue  |  2 +-
 .../scm/basicInformation/saleback/Form.vue    | 17 +++--
 .../scm/basicInformation/saleorder/Form.vue   | 43 ++++++-----
 .../saleorder/arinvoicesForm.vue              | 20 +++---
 .../saleorder/collectionForm.vue              |  8 +--
 .../saleorder/receiptoutForm.vue              |  4 +-
 .../saleorder/salebackForm.vue                | 11 ++-
 32 files changed, 342 insertions(+), 331 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java
index ae41460b..9a648e5f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java
@@ -1,9 +1,7 @@
 package jnpf.arinvoices.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -31,40 +29,41 @@ public class ArinvoicesEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENT_NO")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java
index be7f51bd..73a7799a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java
@@ -2,9 +2,7 @@ package jnpf.arinvoices.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -30,40 +28,41 @@ public class Arinvoices_item0Entity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @Excel(name = "发票代码")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java
index 5cfe5c00..12ff3d27 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java
@@ -1,9 +1,7 @@
 package jnpf.arinvoices.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -30,40 +28,41 @@ public class Arinvoices_item1Entity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("ARINVOICES_ID")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
index 6113e72c..5663a731 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
@@ -223,7 +223,7 @@ public class CollectionController {
                 return ActionResult.fail("请输入收款金额");
             }
             if (collectionItem0Entity.getSalesorderId() != null){
-                SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionCrForm.getCollection_item0List().get(0).getSalesorderId());
+                SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId());
                 if (saleorderitemEntity.getAmountCollected() == null){
                     saleorderitemEntity.setAmountCollected(new BigDecimal("0"));
                 }
@@ -515,13 +515,35 @@ public class CollectionController {
 
             List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class);
             for(Collection_item0Entity entitys : Collection_item0List){
-
+                if (entitys.getAmount() == null ){
+                    return ActionResult.fail("请输入收款金额");
+                }
+                if (entitys.getSalesorderId() != null){
+                    SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entitys.getSalesorderId());
+                    if (saleorderitemEntity.getAmountCollected() == null){
+                        saleorderitemEntity.setAmountCollected(new BigDecimal("0"));
+                    }
+                    if (saleorderitemEntity.getPrice() == null){
+                        saleorderitemEntity.setPrice(new BigDecimal("0"));
+                    }
+                    BigDecimal notAmount = new BigDecimal("0");
+                    notAmount = saleorderitemEntity.getPrice().subtract(saleorderitemEntity.getAmountCollected());
+                    if (entitys.getAmount().compareTo(notAmount) == 1){
+                        return ActionResult.fail("收款金额不能大于订单金额-已收款金额");
+                    }
+                    if (saleorderitemEntity.getAmountCollected().equals(saleorderitemEntity.getPrice()) ||
+                            saleorderitemEntity.getAmountCollected().compareTo(saleorderitemEntity.getPrice()) == 1){
+                        return ActionResult.fail("已回完款，无需回款");
+                    }
+                }else {
+                    return ActionResult.fail("销售订单不存在");
+                }
                 entitys.setId(RandomUtil.uuId());
                 entitys.setCollectionId(entity.getId());
                 collection_item0Service.save(entitys);
+                return ActionResult.success("更新成功");
             }
-
-        return ActionResult.success("更新成功");
+            return ActionResult.fail("请填写收款明细");
         }else{
             return ActionResult.fail("更新失败，数据不存在");
         }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
index 34efc4bc..d3312700 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
@@ -1,10 +1,7 @@
 package jnpf.collection.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -27,10 +24,41 @@ public class CollectionEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
+    private String creatorUserId;
+
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
+    private String creatorUserName;
+
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
+    private Date creatorTime;
+
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserName;
+
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
+    private String deleteUserId;
+
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
+    private String deleteUserName;
+
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
+    private Date deleteTime;
+
+    @TableField("DELETE_MARK")
+    @TableLogic
+    private String deleteMark;
+
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENT_NO")
@@ -81,37 +109,6 @@ public class CollectionEntity  {
     @TableField("COLLECTION_BANK")
     private String collectionBank;
 
-    @TableField("CREATOR_USER_ID")
-    private String creatorUserId;
-
-    @TableField("CREATOR_USER_NAME")
-    private String creatorUserName;
-
-    @TableField("CREATOR_TIME")
-    private Date creatorTime;
-
-    @TableField("LAST_MODIFY_USER_ID")
-    private String lastModifyUserId;
-
-    @TableField("LAST_MODIFY_USER_NAME")
-    private String lastModifyUserName;
-
-    @TableField("LAST_MODIFY_TIME")
-    private Date lastModifyTime;
-
-    @TableField("DELETE_USER_ID")
-    private String deleteUserId;
-
-    @TableField("DELETE_USER_NAME")
-    private String deleteUserName;
-
-    @TableField("DELETE_TIME")
-    private Date deleteTime;
-
-    @TableField("DELETE_MARK")
-    @TableLogic
-    private String deleteMark;
-
     @TableField("CUSTOMER_ID")
     private String customerId;
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java
index eca259d6..f4ce666e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java
@@ -1,10 +1,7 @@
 package jnpf.collection.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -27,41 +24,41 @@ public class Collection_item0Entity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
     @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("COLLECTION_ID")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
index 30937a96..59216ca7 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
@@ -1,10 +1,7 @@
 package jnpf.receiptout.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -28,41 +25,41 @@ public class ReceiptoutEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
     @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENT_NO")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
index dc946297..2036d94e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
@@ -1,10 +1,7 @@
 package jnpf.receiptout.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -30,41 +27,41 @@ public class Receiptout_item0Entity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
     @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("RECEIPTIN_ID")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java
index 2a797dfd..4e51f694 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java
@@ -1,9 +1,7 @@
 package jnpf.saleback.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -27,40 +25,41 @@ public class SalebackEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENT_NO")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
index b3c9879e..c3c9b352 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
@@ -1,10 +1,7 @@
 package jnpf.saleback.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -31,41 +28,41 @@ public class Saleback_item0Entity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
     @TableLogic
-    private String deletemark;
+    private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("POUNDLIST_ID")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java
index 1f8898cd..4c5760bf 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java
@@ -1,9 +1,7 @@
 package jnpf.saleorder.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -29,40 +27,41 @@ public class Arinvoices_item0soitemEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("INVOICE_CODE")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java
index 4bc75888..d779a570 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java
@@ -1,9 +1,7 @@
 package jnpf.saleorder.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -26,10 +24,10 @@ public class CollectionsoitemEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENT_NO")
@@ -80,34 +78,35 @@ public class CollectionsoitemEntity  {
     @TableField("COLLECTION_BANK")
     private String collectionBank;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
     @TableField("CUSTOMER_ID")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java
index 757262ae..ffc521f0 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java
@@ -1,9 +1,7 @@
 package jnpf.saleorder.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -27,40 +25,41 @@ public class PaymentsoitemEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENTNO")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java
index 78c9187c..25c6625a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java
@@ -1,9 +1,7 @@
 package jnpf.saleorder.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -27,40 +25,41 @@ public class ReceiptoutsoitemEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENT_NO")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java
index 3c271575..176c311d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java
@@ -1,9 +1,7 @@
 package jnpf.saleorder.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import jnpf.poundlist.entity.PoundlistEntity;
 import lombok.Data;
 
@@ -39,40 +37,41 @@ public class SaleorderitemEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENT_NO")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java
index 519179f4..32a06266 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java
@@ -1,9 +1,7 @@
 package jnpf.saleorder.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -27,40 +25,41 @@ public class SalesbacksoitemEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("DOCUMENT_NO")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
index 0aab90b1..c75f5c8f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
@@ -1,9 +1,7 @@
 package jnpf.saleorder.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import jnpf.poundlist.entity.PoundlistEntity;
 import lombok.Data;
 
@@ -33,40 +31,41 @@ public class Salesorder_item0Entity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
-    @TableField("ORGNIZE_ID")
+    @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
     private String orgnizeId;
 
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
     private String departmentId;
 
     @TableField("SALES_ORDER_ID")
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml
index 33829a02..971d9e15 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml
@@ -14,6 +14,7 @@
     	LEFT JOIN jg_contract c ON a.contract_id = c.id
     	LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id
     WHERE 1=1
+    and a.delete_mark = '0'
     <if test="arinvoicesPagination.documentNo != null and arinvoicesPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{arinvoicesPagination.documentNo},'%')
     </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml
index 65901a20..1a9fdc7d 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml
@@ -5,6 +5,7 @@
     <select id="queryPound" resultType="jnpf.poundlist.entity.PoundlistEntity">
         select * from jg_poundlist
         where id = #{poundlistId}
+        and delete_mark = '0'
     </select>
 
     <select id="queryCollection" resultType="jnpf.collection.entity.CollectionEntity">
@@ -17,6 +18,7 @@
 	    LEFT JOIN jg_customer b ON a.customer_id = b.id
 	    LEFT JOIN jg_contract c ON a.contract_id = c.id
 	    where 1=1
+        and a.delete_mark = '0'
         <if test="collectionPagination.documentNo != null and collectionPagination.documentNo != ''">
             and a.document_no  LIKE CONCAT('%',#{collectionPagination.documentNo},'%')
         </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml
index 2f08fb34..0ac6eeeb 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml
@@ -12,6 +12,7 @@
     LEFT JOIN jg_customer b on a.customer_id = b.id
     LEFT JOIN jg_salesorder c on a.source_no = c.id
     where 1=1
+    and a.delete_mark = '0'
     <if test="receiptoutPagination.documentNo != null and receiptoutPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{receiptoutPagination.documentNo},'%')
     </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml
index 8dffdd22..86be35fd 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml
@@ -13,6 +13,7 @@
         LEFT JOIN jg_contract c on b.contract_id = c.id
         LEFT JOIN jg_customer d on b.customer_id = d.id
         where 1 = 1
+        and a.delete_mark = '0'
         <if test="salebackPagination.documentNo != null and salebackPagination.documentNo != ''">
             and a.document_no  LIKE CONCAT('%',#{salebackPagination.documentNo},'%')
         </if>
@@ -55,5 +56,6 @@ FROM
 	LEFT JOIN jg_customer g ON c.customer_id = g.id
 WHERE
      a.sales_back_id = #{id}
+     and a.delete_mark = '0'
     </select>
 </mapper>
diff --git a/SC-web/src/utils/jnpf.js b/SC-web/src/utils/jnpf.js
index 691c52d5..d9412f81 100644
--- a/SC-web/src/utils/jnpf.js
+++ b/SC-web/src/utils/jnpf.js
@@ -447,7 +447,7 @@ const jnpf = {
       try {
           f = b.toString().split(".")[1].length;
       } catch (g) {}
-      return c = Number(a.toString().replace(".", "")), d = Number(b.toString().replace(".", "")), floatMul(c / d, Math.pow(10, f - e));
+      return c = Number(a.toString().replace(".", "")), d = Number(b.toString().replace(".", "")), this.floatMul(c / d, Math.pow(10, f - e));
   },
 }
-export default jnpf
\ No newline at end of file
+export default jnpf
diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
index 68672425..d1385a30 100644
--- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
@@ -366,18 +366,16 @@
         mounted() {},
         methods: {
           invoiceQuantitySum(){
-            debugger
             let sum = 0;
             for (let i =0;i<this.dataForm.arinvoices_item0List.length;i++){
-              sum = sum + parseFloat(this.dataForm.arinvoices_item0List[i].invoiceQuantity)
+              sum = this.jnpf.floatAdd(sum,this.dataForm.arinvoices_item0List[i].invoiceQuantity)
             }
             this.dataForm.invoiceQuantity = sum
-            debugger
           },
           involceAmountSum(){
             let sum = 0;
             for (let i =0;i<this.dataForm.arinvoices_item0List.length;i++){
-              sum = sum + parseFloat(this.dataForm.arinvoices_item0List[i].involceAmount)
+              sum = this.jnpf.floatAdd(sum,this.dataForm.arinvoices_item0List[i].involceAmount)
             }
             this.dataForm.invoiceAmount = sum
           },
@@ -418,7 +416,7 @@
                 sums[index] = values.reduce((prev, curr) => {
                   const value = Number(curr);
                   if (!isNaN(value)) {
-                    return prev + curr;
+                    return this.jnpf.floatAdd(prev, curr);
                   } else {
                     return prev;
                   }
@@ -442,7 +440,7 @@
                 sums[index] = values.reduce((prev, curr) => {
                   const value = Number(curr);
                   if (!isNaN(value)) {
-                    return prev + curr;
+                    return this.jnpf.floatAdd(prev, curr);
                   } else {
                     return prev;
                   }
diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index 91ead5c8..e0b7a645 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -435,7 +435,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev, curr);
               } else {
                 return prev;
               }
@@ -449,7 +449,7 @@
       amountSum(){
         let sum = 0;
         for (let i = 0; i<this.dataForm.collection_item0List.length;i++){
-          sum = sum + parseFloat(this.dataForm.collection_item0List[i].amount);
+          sum = this.jnpf.floatAdd(sum,this.dataForm.collection_item0List[i].amount);
         }
         this.dataForm.amountCollected = sum;
       },
@@ -475,9 +475,9 @@
             this.dataForm.collection_item0List[i].rate = b.rate;
             this.dataForm.collection_item0List[i].notPrice = b.not_price;
             this.dataForm.collection_item0List[i].creatorTime = b.creator_time;
-            this.dataForm.collection_item0List[i].amount = parseFloat(b.price) - parseFloat(b.amount_collected);
+            this.dataForm.collection_item0List[i].amount = this.jnpf.floatSub(b.price,b.amount_collected);
             this.dataForm.collection_item0List[i].creatorTime = new Date().getTime();
-            amountCollectedSum = amountCollectedSum + parseFloat(this.dataForm.collection_item0List[i].amount);
+            amountCollectedSum = this.jnpf.floatAdd(amountCollectedSum,this.dataForm.collection_item0List[i].amount);
           }
         }
         this.dataForm.amountCollected = amountCollectedSum;
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
index 43cf9d5a..c531dc68 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
@@ -773,8 +773,8 @@
             // }
             this.dataForm.salesorder_item0List.forEach((item, index)=>{
               if(row.vehicleId == item.vehicleId){
-                item.price = parseFloat(item.settlement) * parseFloat(item.unitPrice);//子表金额
-                item.notPrice = item.price * (100 - rate) / 100;//子表不含税金额
+                item.price = this.jnpf.floatMul(item.settlement,item.unitPrice);//子表金额
+                item.notPrice = this.jnpf.floatDiv(this.jnpf.floatMul(item.price,(this.jnpf.floatSub(100, rate))),100);//子表不含税金额
                 // request({
                 //   url: '/api/saleorder/Saleorderitem/updatePrice'+row.poundlistId,
                 //   method: 'post',
@@ -788,10 +788,10 @@
                 // })
               }
               if(item.advance == '1'){//垫资
-                advanceAmount = advanceAmount + item.price;//垫资金额
+                advanceAmount = this.jnpf.floatAdd(advanceAmount, item.price);//垫资金额
               }
-              price = price + item.price;//主表金额
-              notPrice = notPrice + parseFloat(item.notPrice);//主表不含税金额
+              price = this.jnpf.floatAdd(price, item.price);//主表金额
+              notPrice = this.jnpf.floatAdd(notPrice,item.notPrice);//主表不含税金额
             });
             this.dataForm.advanceAmount = advanceAmount;
             this.dataForm.price = price;
@@ -826,8 +826,8 @@
             for (let i = 0;i<this.dataForm.salesorder_item0List.length;i++) {
               this.rateOptions.find((item) => {
                 if (this.dataForm.salesorder_item0List[i].rate == item.id) {
-                  this.dataForm.salesorder_item0List[i].noPrice = this.dataForm.salesorder_item0List[i].price*(100-item.fullName)/100
-                  notPrice = notPrice + parseFloat(this.dataForm.salesorder_item0List[i].noPrice)
+                  this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.salesorder_item0List[i].price,(this.jnpf.floatSub(100,item.fullName))),100)
+                  notPrice = this.jnpf.floatAdd(notPrice,this.dataForm.salesorder_item0List[i].noPrice)
                 }
               })
               this.dataForm.notPrice = notPrice;
@@ -851,9 +851,9 @@
                 this.dataForm.salesorder_item0List[i].vehiclePictures = b.vehicle_pictures
                 this.dataForm.salesorder_item0List[i].poundType = b.pound_type
                 this.dataForm.salesorder_item0List[i].unitPrice = b.sales_price
-                this.dataForm.salesorder_item0List[i].price = b.salesPrice*b.settlement;
-                num = this.dataForm.num + parseFloat(b.settlement)
-                amount = this.dataForm.price + parseFloat(this.dataForm.salesorder_item0List[i].price)
+                this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(b.salesPrice,b.settlement);
+                num = this.jnpf.floatAdd(this.dataForm.num,b.settlement)
+                amount = this.jnpf.floatAdd(this.dataForm.price,this.dataForm.salesorder_item0List[i].price)
               }
             }
             this.dataForm.num = num
@@ -930,18 +930,18 @@
               for (let i = 0;i<list.length; i++){
                 // 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].salesPrice*list[i].settlement;
+                this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice,list[i].settlement);
                 this.rateOptions.find((item) => {
                   if (this.dataForm.salesorder_item0List[i].rate == item.id) {
-                    this.dataForm.salesorder_item0List[i].noPrice = this.dataForm.salesorder_item0List[i].price*(100-item.fullName)/100
-                    notPrice = notPrice + parseFloat(this.dataForm.salesorder_item0List[i].noPrice)
+                    this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.salesorder_item0List[i].price,(100-item.fullName)),100)
+                    notPrice = this.jnpf.floatAdd(notPrice,this.dataForm.salesorder_item0List[i].noPrice)
                   }
                 })
                 if (list[i].advance == 1){
-                  advance = advance + list[i].salesPrice*list[i].settlement;
+                  advance = this.jnpf.floatAdd(advance,this.jnpf.floatMul(list[i].salesPrice,list[i].settlement));
                 }
-                num = num + list[i].settlement;
-                amount = amount + list[i].price;
+                num = this.jnpf.floatAdd(num, list[i].settlement);
+                amount = this.jnpf.floatAdd(amount, list[i].price);
               }
               this.dataForm.notPrice = notPrice;
               this.dataForm.advanceAmount = advance;
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
index e87ea540..905156a6 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
@@ -316,7 +316,7 @@
                 sums[index] = values.reduce((prev, curr) => {
                   const value = Number(curr);
                   if (!isNaN(value)) {
-                    return prev + curr;
+                    return this.jnpf.floatAdd(prev, curr);
                   } else {
                     return prev;
                   }
diff --git a/SC-web/src/views/scm/basicInformation/saleback/Form.vue b/SC-web/src/views/scm/basicInformation/saleback/Form.vue
index d3a5a7f9..ec62dc02 100644
--- a/SC-web/src/views/scm/basicInformation/saleback/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleback/Form.vue
@@ -68,7 +68,7 @@
                         <template slot-scope="scope">
                           <popupSelect   v-model="scope.row.vehicleId"
                            placeholder="请选择"  clearable  :field="'vehicleId'+scope.$index"  interfaceId="400554150653457925"
-                                         :bissId="dataForm.salesOrderId" :columnOptions="salesback_item0vehicleIdcolumnOptions" propsValue="id"
+                                         :bissId="dataForm.salesOrderId" :columnOptions="salesback_item0vehicleIdcolumnOptions" propsValue="vehicleId"
                                          relationField="ticketno" popupType="dialog" @change="popupSelectChange2"
                            popupWidth="800px">
                           </popupSelect>
@@ -297,6 +297,7 @@
         jg_salesback_item0businessIdcolumnOptions:[ {"label":"人员名称","value":"F_RealName"}, {"label":"人员职位","value":"F_FullName"},],
 			}
 		},
+
 		computed: {},
 		watch: {},
 		created() {},
@@ -315,7 +316,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev, curr);
               } else {
                 return prev;
               }
@@ -330,6 +331,7 @@
         var sumPrice = 0;
         var sumNum = 0;
         var excludeFields = [];
+        var floatMul2 = 0;
 				for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
 				  debugger
           excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
@@ -341,18 +343,19 @@
             this.dataForm.saleback_item0List[i].unit = b.unit;
             this.dataForm.saleback_item0List[i].price = b.sales_price;
             this.dataForm.saleback_item0List[i].rate = b.rate;
-            this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement;
+            this.dataForm.saleback_item0List[i].amount = this.jnpf.floatMul(b.sales_price, b.settlement);
+            debugger
             this.dataForm.saleback_item0List[i].pountType = b.pound_type;
             this.dataForm.saleback_item0List[i].businessId = b.business_id;
             this.dataForm.saleback_item0List[i].salesorderItem0Id = b.saleitemId;
             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.dataForm.saleback_item0List[i].amount*item.fullName/100
+                this.dataForm.saleback_item0List[i].notAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.saleback_item0List[i].amount,item.fullName),100)
               }
             })
-            sumNum = sumNum + parseFloat(b.settlement);
-            sumPrice = sumPrice + parseFloat(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;
@@ -409,7 +412,7 @@
               for (let i = 0;i<res.data.saleback_item0List.length;i++){
                 this.dataForm.saleback_item0List[i].amount = res.data.saleback_item0List[i].price
                 this.dataForm.saleback_item0List[i].price = res.data.saleback_item0List[i].salesPrice
-                this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount - res.data.saleback_item0List[i].noPrice
+                this.dataForm.saleback_item0List[i].notAmount = this.jnpf.floatSub(this.dataForm.saleback_item0List[i].amount, res.data.saleback_item0List[i].noPrice)
               }
 							this.loading = false
 						});
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index e4573e94..eb7deb55 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -137,11 +137,20 @@
                       <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="vehicleId" label="车号" align="center" width="130">
                         <template slot-scope="scope">
+<!--                          <popupSelect v-model="scope.row.vehicleId"-->
+<!--                                       placeholder="请选择" clearable :field="'vehicleId'+scope.$index"-->
+<!--                                       interfaceId="391151974030035653"  398732963950472005-->
+<!--                                       :bissId="dataForm.contractId"-->
+<!--                                       :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="vehicle_id"-->
+<!--                                       relationField="ticketno"-->
+<!--                                       popupType="dialog" :excludeFields="excludeFields"-->
+<!--                                       popupWidth="800px" @change="poundInfoSelect" disabled>-->
+<!--                          </popupSelect>-->
                           <popupSelect v-model="scope.row.vehicleId"
                                        placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
-                                       interfaceId="391151974030035653"
+                                       interfaceId="398732963950472005"
                                        :bissId="dataForm.contractId"
-                                       :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="vehicle_id"
+                                       :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="id"
                                        relationField="ticketno"
                                        popupType="dialog" :excludeFields="excludeFields"
                                        popupWidth="800px" @change="poundInfoSelect" disabled>
@@ -655,6 +664,7 @@
   import request from '@/utils/request'
   import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
   import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+  import jnpf from '@/utils/jnpf'
 
   export default {
     components: {},
@@ -785,15 +795,12 @@
     },
     methods: {
       editUnitPrice(row) {
-        debugger
         var advanceAmount = 0;
         var price = 0;
         var notPrice = 0;
         this.dataForm.salesorder_item0List.forEach((item, index) => {
           if (row.vehicleId == item.vehicleId) {
-            debugger
             if (item.remark == null || item.remark === "") {
-              debugger
               this.$message({
                 type: 'warning',
                 message: '请在备注说明修改单价原因',
@@ -801,10 +808,11 @@
               })
               return
             }
-            item.price = parseFloat(item.settlement) * parseFloat(item.unitPrice);//子表金额
+            item.price = this.jnpf.floatMul(item.unitPrice,item.settlement);//子表金额
+            debugger
             this.taxRateOptions.forEach((item2) => {
               if (item2.id == row.rate) {
-                item.noPrice = item.price * (100 - item2.fullName) / 100;//子表不含税金额
+                item.noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(item.price,(this.jnpf.floatSub(100,item2.fullName))), 100);//子表不含税金额
               }
             });
             // let params = {}
@@ -823,24 +831,23 @@
             // })
           }
           if (item.advance == '1') {//垫资
-            advanceAmount = advanceAmount + parseFloat(item.price);//垫资金额
+            advanceAmount = this.jnpf.floatAdd(advanceAmount,item.price);//垫资金额
           }
-          price = price + parseFloat(item.price);//主表金额
-          notPrice = notPrice + parseFloat(item.noPrice);//主表不含税金额
+          price = this.jnpf.floatAdd(price,item.price);//主表金额
+          notPrice = this.jnpf.floatAdd(notPrice,item.noPrice);//主表不含税金额
         });
         this.dataForm.advanceAmount = advanceAmount;
         this.dataForm.price = price;
         this.dataForm.notPrice = notPrice;
-        this.dataForm.rate = price - notPrice;
-        debugger
+        this.dataForm.rate = this.jnpf.floatSub(price,notPrice);
       },
       computeNoPrice() {
         let notPrice = 0;
         for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
           this.rateOptions.find((item) => {
             if (this.dataForm.salesorder_item0List[i].rate == item.id) {
-              this.dataForm.salesorder_item0List[i].noPrice = this.dataForm.salesorder_item0List[i].price * (100 - item.fullName) / 100
-              notPrice = notPrice + this.dataForm.salesorder_item0List[i].noPrice
+              this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.salesorder_item0List[i].price,(this.jnpf.floatSub(100, item.fullName))),100)
+              notPrice =this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice)
             }
           })
           this.dataForm.notPrice = notPrice;
@@ -859,7 +866,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev, curr);
               } else {
                 return prev;
               }
@@ -879,6 +886,7 @@
           excludeFields.push(this.dataForm.salesorder_item0List[i].vehicleId)
           debugger
           if (a == this.dataForm.salesorder_item0List[i].vehicleId) {
+            debugger
             this.dataForm.salesorder_item0List[i].poundlistId = b.id
             this.dataForm.salesorder_item0List[i].materialId = b.material_id
             this.dataForm.salesorder_item0List[i].settlement = b.settlement
@@ -890,10 +898,10 @@
             this.dataForm.salesorder_item0List[i].vehiclePictures = b.vehicle_pictures
             this.dataForm.salesorder_item0List[i].poundType = b.pound_type
             this.dataForm.salesorder_item0List[i].unitPrice = b.sales_price
-            this.dataForm.salesorder_item0List[i].price = b.sales_price * b.settlement
+            this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(b.sales_price, b.settlement)
           }
           if (this.dataForm.salesorder_item0List[i].advance == 1) {
-            advanceAmountSum = advanceAmountSum + this.dataForm.salesorder_item0List[i].price
+            advanceAmountSum = this.jnpf.floatAdd(advanceAmountSum, this.dataForm.salesorder_item0List[i].price)
           }
         }
         this.dataForm.advanceAmount = advanceAmountSum
@@ -1056,6 +1064,7 @@
       },
       delsalesorder_item0List(index) {
         this.dataForm.salesorder_item0List.splice(index, 1);
+        this.computeNoPrice();
       },
       addreceiptoutsoitemList() {
         let item = {
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
index bf1e57d7..6dac51d7 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
@@ -419,7 +419,7 @@
                 sums[index] = values.reduce((prev, curr) => {
                   const value = Number(curr);
                   if (!isNaN(value)) {
-                    return prev + curr;
+                    return this.jnpf.floatAdd(prev, curr);
                   } else {
                     return prev;
                   }
@@ -443,7 +443,7 @@
                 sums[index] = values.reduce((prev, curr) => {
                   const value = Number(curr);
                   if (!isNaN(value)) {
-                    return prev + curr;
+                    return this.jnpf.floatAdd(prev, curr);
                   } else {
                     return prev;
                   }
@@ -458,7 +458,7 @@
             debugger
             let sum = 0;
             for (let i =0;i<this.dataForm.arinvoices_item0List.length;i++){
-              sum = sum + parseFloat(this.dataForm.arinvoices_item0List[i].invoiceQuantity)
+              sum = this.jnpf.floatAdd(sum,this.dataForm.arinvoices_item0List[i].invoiceQuantity)
             }
             this.dataForm.invoiceQuantity = sum
             debugger
@@ -466,7 +466,7 @@
           involceAmountSum(){
             let sum = 0;
             for (let i =0;i<this.dataForm.arinvoices_item0List.length;i++){
-              sum = sum + parseFloat(this.dataForm.arinvoices_item0List[i].involceAmount)
+              sum = this.jnpf.floatAdd(sum,this.dataForm.arinvoices_item0List[i].involceAmount)
             }
             this.dataForm.invoiceAmount = sum
           },
@@ -474,8 +474,8 @@
             for (let i = 0;i<this.dataForm.arinvoices_item0List.length;i++) {
               this.taxRateOptions.find((item) => {
                 if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) {
-                  this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100
-                  this.dataForm.arinvoices_item0List[i].amountNotTax = this.dataForm.arinvoices_item0List[i].involceAmount - this.dataForm.arinvoices_item0List[i].taxAmount
+                  this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100)
+                  this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount)
                 }
               })
             }
@@ -484,7 +484,7 @@
             for (let i = 0;i<this.dataForm.arinvoices_item1List.length;i++) {
               this.taxRateOptions.find((item) => {
                 if (this.dataForm.arinvoices_item1List[i].taxRate == item.id) {
-                  this.dataForm.arinvoices_item1List[i].taxAmount = this.dataForm.arinvoices_item1List[i].amount*item.fullName/100
+                  this.dataForm.arinvoices_item1List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item1List[i].amount,item.fullName),100)
                 }
               })
             }
@@ -532,12 +532,12 @@
                   this.dataForm.arinvoices_item1List[i].taxRate = list[0].list[i].rate;
                   this.dataForm.arinvoices_item1List[i].amountNotTax = list[0].list[i].noPrice;
                   this.dataForm.arinvoices_item1List[i].unit = list[0].list[i].poundEntity.unit;
-                  amount = amount + list[0].list[i].price;
-                  num = num + list[0].list[i].quantity;
+                  amount = this.jnpf.floatAdd(amount, list[0].list[i].price);
+                  num = this.jnpf.floatAdd(num, list[0].list[i].quantity);
                   // this.dataForm.arinvoices_item1List[i].taxAmount = list[0].list[i].price*list[0].list[i].rate
                   this.taxRateOptions.find((item) => {
                     if (this.dataForm.arinvoices_item1List[i].taxRate == item.id) {
-                      this.dataForm.arinvoices_item1List[i].taxAmount = this.dataForm.arinvoices_item1List[i].amount*item.fullName/100
+                      this.dataForm.arinvoices_item1List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item1List[i].amount,item.fullName),100)
                     }
                   })
                 }
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
index 4d8988c6..df33e2cb 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
@@ -295,7 +295,7 @@
                 sums[index] = values.reduce((prev, curr) => {
                   const value = Number(curr);
                   if (!isNaN(value)) {
-                    return prev + curr;
+                    return this.jnpf.floatAdd(prev, curr);
                   } else {
                     return prev;
                   }
@@ -309,7 +309,7 @@
           amountSum(){
             let sum = 0;
             for (let i = 0;i<this.dataForm.collection_item0List.length;i++){
-              sum = sum + parseFloat(this.dataForm.collection_item0List[i].amount);
+              sum = this.jnpf.floatAdd(sum,this.dataForm.collection_item0List[i].amount);
             }
             this.dataForm.amountCollected = sum;
           },
@@ -342,9 +342,9 @@
                 debugger
                 for (let i = 0;i<list.length;i++){
                   this.dataForm.collection_item0List[i].salesorderId = list[i].id;
-                  this.dataForm.collection_item0List[i].rate = list[i].price - list[i].notPrice;
+                  this.dataForm.collection_item0List[i].rate = this.jnpf.floatSub(list[i].price,list[i].notPrice);
                   // this.dataForm.collection_item0List[i].amount = list[i].price - list[i].amountCollected;
-                  amountCollected = amountCollected + this.dataForm.collection_item0List[i].amount;
+                  amountCollected = this.jnpf.floatAdd(amountCollected, this.dataForm.collection_item0List[i].amount);
                   debugger
                 }
                 this.dataForm.amountCollected = amountCollected;
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
index 27b8a63c..e51f17e6 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
@@ -358,7 +358,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev, curr);
               } else {
                 return prev;
               }
@@ -412,7 +412,7 @@
           debugger
           this.rateOptions.find((item) => {
             if (this.dataForm.receiptout_item0List[i].rate == item.id) {
-              this.dataForm.receiptout_item0List[i].rateAmount = this.dataForm.receiptout_item0List[i].amount * item.fullName / 100
+              this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.receiptout_item0List[i].amount, item.fullName),100)
               debugger
             }
           })
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
index bd5146f9..ec18053e 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
@@ -319,7 +319,7 @@
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr;
+                return this.jnpf.floatAdd(prev, curr);
               } else {
                 return prev;
               }
@@ -335,7 +335,6 @@
         var sumNum = 0;
         var excludeFields = [];
 				for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
-				  debugger
           // excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
 					if(a == this.dataForm.saleback_item0List[i].vehicleId){
 					  debugger
@@ -345,18 +344,18 @@
 						this.dataForm.saleback_item0List[i].unit = b.unit;
 						this.dataForm.saleback_item0List[i].price = b.sales_price;
 						this.dataForm.saleback_item0List[i].rate = b.rate;
-						this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement;
+						this.dataForm.saleback_item0List[i].amount = this.jnpf.floatMul(b.sales_price, b.settlement);
 						this.dataForm.saleback_item0List[i].pountType = b.pound_type;
 						this.dataForm.saleback_item0List[i].businessId = b.business_id;
 						this.dataForm.saleback_item0List[i].salesorderItem0Id = b.saleitemId;
 						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.dataForm.saleback_item0List[i].amount*item.fullName/100
+                this.dataForm.saleback_item0List[i].notAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.saleback_item0List[i].amount,item.fullName),100)
               }
             })
-            sumNum = sumNum + parseFloat(b.settlement);
-            sumPrice = sumPrice + parseFloat(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;