From a4a31a7d785b2de47e552fe3a75296936c65fb77 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Sat, 3 Dec 2022 09:37:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/service/impl/StructivtServiceImpl.java | 8 +++++++ .../wms/basedata/st/wql/QST_STRUCTIVT001.wql | 14 ++++++++++++- .../service/impl/CheckOutBillServiceImpl.java | 2 +- .../org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql | 2 +- .../src/views/wms/basedata/st/ivt/index.vue | 21 +++++++++++++++++++ lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 8 +++---- .../views/wms/st/inStor/change/AddDialog.vue | 19 +++++++++++++---- .../src/views/wms/st/inStor/change/AddDtl.vue | 8 +++++-- 8 files changed, 69 insertions(+), 13 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index cd2d201f3..714f07831 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -45,6 +45,8 @@ public class StructivtServiceImpl implements StructivtService { String stor_id = MapUtil.getStr(whereJson, "stor_id"); String pcsn = MapUtil.getStr(whereJson, "pcsn"); String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn"); + String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); + String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name"); JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("stor_id", stor_id); @@ -60,6 +62,12 @@ public class StructivtServiceImpl implements StructivtService { if (StrUtil.isNotEmpty(sap_pcsn)) { map.put("sap_pcsn", "%" + sap_pcsn + "%"); } + if (StrUtil.isNotEmpty(package_box_sn)) { + map.put("package_box_sn", "%" + package_box_sn + "%"); + } + if (StrUtil.isNotEmpty(sale_order_name)) { + map.put("sale_order_name", "%" + sale_order_name + "%"); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql index 502a122e7..fde0ca6e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql @@ -19,6 +19,8 @@ 输入.stor_id TYPEAS s_string 输入.pcsn TYPEAS s_string 输入.sap_pcsn TYPEAS s_string + 输入.sale_order_name TYPEAS s_string + 输入.package_box_sn TYPEAS s_string 输入.in_stor_id TYPEAS f_string [临时表] @@ -55,7 +57,9 @@ mater.material_name, unit.unit_name, region.region_name, - sub.sap_pcsn + sub.sap_pcsn, + sub.package_box_sn, + sub.sale_order_name FROM ST_IVT_StructIvt ivt LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id @@ -91,6 +95,14 @@ attr.stor_id = 输入.stor_id ENDOPTION + OPTION 输入.package_box_sn <> "" + sub.package_box_sn like 输入.package_box_sn + ENDOPTION + + OPTION 输入.sale_order_name <> "" + sub.sale_order_name like 输入.sale_order_name + ENDOPTION + ENDSELECT ENDPAGEQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 7ecc4d13d..912056d35 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -761,7 +761,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { double canuse_qty = ivt.getDoubleValue("canuse_qty"); if (unassign_qty >= canuse_qty) { - unassign_qty = unassign_qty - canuse_qty; + unassign_qty = NumberUtil.sub(unassign_qty,canuse_qty); // ivt.put("change_qty", canuse_qty + ""); } else { // ivt.put("change_qty", unassign_qty + ""); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql index 0148fd1fc..272b81076 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql @@ -62,7 +62,7 @@ FROM ST_IVT_StructIvt ivt LEFT JOIN ST_IVT_StructAttr attr ON attr.struct_id = ivt.struct_id - LEFT JOIN PDM_BI_SubPackageRelation sub ON attr.storagevehicle_code = sub.package_box_SN + LEFT JOIN PDM_BI_SubPackageRelation sub ON attr.storagevehicle_code = sub.package_box_SN AND sub.container_name = ivt.pcsn WHERE ivt.quality_scode = '01' AND attr.lock_type = '1' diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index b95e4d71a..1dae6d6cc 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -48,6 +48,16 @@ class="filter-item" /> + + + + + + @@ -88,6 +108,7 @@ {{ dict.label.ST_QUALITY_SCODE[scope.row.quality_scode] }} + diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue index 95158ba31..bda6e6629 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue @@ -352,17 +352,17 @@ - + - + - + - + diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue index 6f3760320..a9fd1f9c6 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue @@ -468,10 +468,21 @@ export default { } }, deleteRow(index, rows) { - rows.splice(index, 1) - this.nowindex = '' - this.nowrow = {} - this.form.detail_count = this.form.tableData.length + const storagevehicle_code = rows[index].storagevehicle_code + let len = rows.length + while (len--) { + const obj = rows[len] + if (storagevehicle_code === obj.storagevehicle_code) { + const index = rows.indexOf(obj) + if (index > -1) { // 移除找到的指定元素 + this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].qty) + rows.splice(index, 1) + this.nowindex = '' + this.nowrow = {} + this.form.detail_count = this.form.tableData.length + } + } + } }, [CRUD.HOOK.beforeSubmit]() { if (this.form.tableData.length === 0) { diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue index 3162edb38..a7a9ddb4e 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue @@ -96,6 +96,7 @@ import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' import crudSectattr from '@/views/wms/basedata/st/sect/sectattr' import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' +import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor' export default { name: 'AddDtl', @@ -188,8 +189,11 @@ export default { return } this.crud.resetQuery(false) - this.$emit('update:dialogShow', false) - this.$emit('tableChanged', this.rows) + handmovestor.getBoxIvt(this.rows).then(res => { + this.rows = res + this.$emit('update:dialogShow', false) + this.$emit('tableChanged', this.rows) + }) } } }