diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
index 3463f5bf..49fd63ec 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
@@ -1652,7 +1652,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
                         lowCell2.setCellStyle(lineStyle);
 //                        lowCell10.setCellValue(priceSum.toString());
 //                        合计
-                        lowCell10.setCellValue(amount.toString());
+                        lowCell10.setCellValue(priceSum.toString());
                         lowCell10.setCellStyle(lineStyle);
                         lowRow.createCell(1).setCellStyle(lineStyle);
                         lowRow.createCell(2).setCellStyle(lineStyle);
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
index d7a34190..4edf1f01 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
@@ -1037,6 +1037,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         yunguanSaleSettlementModel.setSLIT_FLAG("0");
         yunguanSaleSettlementModel.setREAD_FLAG("N");
         yunguanSaleSettlementModel.setESB_STATUS("N");
+        yunguanSaleSettlementModel.setLINE_SUM(cwsettlementForm.getCwsettlementsummaryList().size());
         JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
         if (ObjectUtil.isNotEmpty(purchaseCode)){
             if (purchaseCode.get("code").equals("200")) {
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java
index 09c90a0a..90d13a46 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java
@@ -116,4 +116,7 @@ public class YunguanSaleSettlementModel {
     /** ESB错误信息 **/
     @JSONField(name = "ESB_MESSAGE")
     private String ESB_MESSAGE;
+    /** 关联行数量 **/
+    @JSONField(name = "LINE_SUM")
+    private int LINE_SUM;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
index 1271603e..f8ba0c40 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
@@ -1368,7 +1368,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
                       @change="changeData('cwsettlementsummary-spec',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -1470,8 +1470,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.settlementSubtotalNo"
                       @change="changeData('cwsettlementsummary-settlementSubtotalNo',scope.$index)"
-                      placeholder="请输入" addonBefore="¥" :disabled="true" clearable
-                      :style='{"width":"100%"}'>
+                      placeholder="请输入" addonBefore="¥" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -1512,8 +1511,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.settlementTotalNo"
                       @change="changeData('cwsettlementsummary-settlementTotalNo',scope.$index)"
-                      placeholder="请输入" addonBefore="¥" :disabled="true" clearable
-                      :style='{"width":"100%"}'>
+                      placeholder="请输入" addonBefore="¥" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -2954,25 +2952,26 @@ export default {
         this.dataForm.overdueAmount = overdueAmount;
 
         // debugger
-        var data = JSON.parse(JSON.stringify(this.dataForm.cwsettlementaccountList))
-        var order = this.dataForm.cwsettlementaccountList[0].code
-        console.log(order);
-        var dataProduct = JSON.parse(JSON.stringify(res.data))
-        console.log(dataProduct);
-        var productid = res.data[0].productId
-        data.forEach(item => {
-          dataProduct.forEach(item1 => {
-            // debugger
-            if (item.code == order && item1.productId == productid) {
-              this.dataForm.cwsettlementsummaryList = this.sameReduce(res.data);
-            } else {
-              this.dataForm.cwsettlementsummaryList = res.data;
-              return
-            }
-          })
-        })
+        // var data = JSON.parse(JSON.stringify(this.dataForm.cwsettlementaccountList))
+        // var order = this.dataForm.cwsettlementaccountList[0].code
+        // console.log(order);
+        // var dataProduct = JSON.parse(JSON.stringify(res.data))
+        // console.log(dataProduct);
+        // var productid = res.data[0].productId
+        // data.forEach(item => {
+        //   dataProduct.forEach(item1 => {
+        //     // debugger
+        //     if (item.code == order && item1.productId == productid) {
+        //       this.dataForm.cwsettlementsummaryList = this.sameReduce(res.data);
+        //     } else {
+        //       this.dataForm.cwsettlementsummaryList = res.data;
+        //       return
+        //     }
+        //   })
+        // })
 
 
+        this.dataForm.cwsettlementsummaryList = res.data;
 
         this.dataForm.cwsettlementsummaryList.forEach(item => {
           item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);//汇总结算含税单价
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
index bb1a72d4..b7db36dd 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
@@ -136,9 +136,9 @@
                   @change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
                   :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadPoundsImg> -->
-                <JnpfUploadImgB v-model="dataForm.voucherPictures"
-                  @change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
-                  :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
+                <JnpfUploadImgB v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
+                  :disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="1"
+                  pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImgB>
               </jnpf-form-tip-item>
             </el-col>
@@ -196,6 +196,14 @@
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
             </el-col>
+            <el-col :span="8" v-if="judgeShow('orderNo')">
+              <jnpf-form-tip-item label="订单序号" v-if="judgeShow('orderNo')" prop="orderNo">
+                <JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
+                  placeholder="请输入" :disabled="judgeWrite('orderNo')" clearable
+                  :style='{ "width": "100%" }'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
             <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
               <jnpf-form-tip-item label-width="0">
                 <div class="JNPF-common-title">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
index 5af51186..6a194b19 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
@@ -137,9 +137,9 @@
                   :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadPoundImg> -->
 
-                <JnpfUploadImgB v-model="dataForm.voucherPictures"
-                  @change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
-                  :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
+                <JnpfUploadImgB v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
+                  :disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="1"
+                  pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImgB>
               </jnpf-form-tip-item>
             </el-col>
@@ -197,6 +197,16 @@
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
             </el-col>
+
+            <el-col :span="8" v-if="judgeShow('orderNo')">
+              <jnpf-form-tip-item label="订单序号" v-if="judgeShow('orderNo')" prop="orderNo">
+                <JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
+                  placeholder="请输入" :disabled="judgeWrite('orderNo')" clearable
+                  :style='{ "width": "100%" }'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+
             <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
               <jnpf-form-tip-item label-width="0">
                 <div class="JNPF-common-title">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
index 6bb859f0..3d5033c2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
@@ -123,11 +123,11 @@
                   :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadPoundsImg> -->
 
-                <JnpfUploadImgB v-model="dataForm.voucherPictures"
-                  @change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
-                  :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
+                <JnpfUploadImgB v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
+                  :disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="1"
+                  pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImgB>
-                
+
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8" v-if="judgeShow('poundCode')">
@@ -184,6 +184,14 @@
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
             </el-col>
+            <el-col :span="8" v-if="judgeShow('orderNo')">
+              <jnpf-form-tip-item label="订单序号" v-if="judgeShow('orderNo')" prop="orderNo">
+                <JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
+                  placeholder="请输入" :disabled="judgeWrite('orderNo')" clearable
+                  :style='{ "width": "100%" }'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
             <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
               <jnpf-form-tip-item label-width="0">
                 <div class="JNPF-common-title">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
index d3e41aae..653633b0 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
@@ -121,9 +121,9 @@
                   @change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
                   :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
                 </JnpfUploadPoundImg> -->
-                <JnpfUploadImgB v-model="dataForm.voucherPictures"
-                  @change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
-                  :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
+                <JnpfUploadImgB v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
+                  :disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="1"
+                  pathType="defaultPath" :isAccount="0">
                 </JnpfUploadImgB>
               </jnpf-form-tip-item>
             </el-col>
@@ -181,6 +181,14 @@
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
             </el-col>
+            <el-col :span="8" v-if="judgeShow('orderNo')">
+              <jnpf-form-tip-item label="订单序号" v-if="judgeShow('orderNo')" prop="orderNo">
+                <JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
+                  placeholder="请输入" :disabled="judgeWrite('orderNo')" clearable
+                  :style='{ "width": "100%" }'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
             <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
               <jnpf-form-tip-item label-width="0">
                 <div class="JNPF-common-title">