From 7477125799b7ab98e94011e462b721f8add51551 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 26 Dec 2022 14:38:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
index 3aad950f7..1cdab2c81 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
@@ -165,6 +165,8 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                         jsonMst.put("receiptphone", json.getString("TEL_NUMBER")); // 联系电话
                         jsonMst.put("contractno", json.getString("BSTNK")); // 合同号
                         jsonMst.put("cust_code", json.getString("KUNNR")); // 客户
+                        jsonMst.put("consignee", json.getString("NAMEM")); // 收货单位
+                        jsonMst.put("receiptaddress", json.getString("ADRNRS")); // 收货地址
                         /*jsonMst.put("remark",json.getString("LGORT"));//库位*/
 
                         // 明细

From c45532ac3244c6af893eec8604707a5a8c9ba74c Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 26 Dec 2022 14:38:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
index ab996b8f8..47aa611dc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
@@ -168,6 +168,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                         jsonMst.put("consignee", json.getString("NAMEM")); // 收货单位
                         jsonMst.put("receiptaddress", json.getString("ADRNRS")); // 收货地址
                         /*jsonMst.put("remark",json.getString("LGORT"));//库位*/
+                        
 
                         // 明细
                         JSONObject jsonMater = materTab.query("material_code = '" + json.getString("MATNR") + "'").uniqueResult(0);

From 90eb62000a5de3955411ec7cc4424a2a8940a182 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 26 Dec 2022 18:37:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/st/outbill/StructIvt.vue    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
index b29a5fe0b..33b18401f 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
@@ -105,12 +105,12 @@
       <el-table-column show-overflow-tooltip sortable prop="pcsn" label="子卷批次号" align="center" />
       <el-table-column show-overflow-tooltip sortable prop="sap_pcsn" label="sap批次" align="center" />
       <el-table-column show-overflow-tooltip prop="canuse_qty" label="可出重量" :formatter="crud.formatNum3" align="center" />
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" width="160" align="center">
-        <template scope="scope">
-          <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :max="100000000" />
-          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" width="160" align="center">-->
+<!--        <template scope="scope">-->
+<!--          <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :max="100000000" />-->
+<!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
       <el-table-column align="center" label="操作" width="160" fixed="right">
         <template scope="scope">
@@ -215,22 +215,22 @@ export default {
           this.crud.notify('出库重量不能超过未分配数', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }*/
-        if (row.plan_qty > row.canuse_qty) {
+      /*  if (row.plan_qty > row.canuse_qty) {
           this.crud.notify('出库重量不能超过库存可出重量', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
         if (row.plan_qty === 0) {
           this.crud.notify('出库重量为0不能保存', CRUD.NOTIFICATION_TYPE.INFO)
           return false
-        }
+        }*/
       }
       row.edit = !row.edit
       if (row.edit) {
-        this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) - row.plan_qty
-        this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) + row.plan_qty
+        this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) - parseFloat(row.canuse_qty)
+        this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) + parseFloat(row.canuse_qty)
       } else {
-        this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + row.plan_qty
-        this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) - row.plan_qty
+        this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(row.canuse_qty)
+        this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) - parseFloat(row.canuse_qty)
       }
       this.tableDtl.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
     },