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 e8e4958f2..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
@@ -165,7 +165,10 @@ 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"));//库位*/
+
// 明细
JSONObject jsonMater = materTab.query("material_code = '" + json.getString("MATNR") + "'").uniqueResult(0);
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 @@
-
-
-
- {{ scope.row.plan_qty }}
-
-
+
+
+
+
+
+
@@ -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 替换数据 触发视图更新
},