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 97d5afd36..a6d979f90 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 @@ -301,6 +301,7 @@ public class StructivtServiceImpl implements StructivtService { String is_virtual = MapUtil.getStr(whereJson, "is_virtual"); String sub_type = MapUtil.getStr(whereJson, "sub_type"); String quality_scode = MapUtil.getStr(whereJson, "quality_scode"); + String control = MapUtil.getStr(whereJson, "control"); JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("stor_id", stor_id); @@ -309,6 +310,7 @@ public class StructivtServiceImpl implements StructivtService { map.put("is_virtual", is_virtual); map.put("sub_type", sub_type); map.put("quality_scode", quality_scode); + map.put("control", control); if (StrUtil.isNotEmpty(material)) { map.put("material", "%" + material + "%"); } @@ -408,6 +410,7 @@ public class StructivtServiceImpl implements StructivtService { } else { mp.put("超期原因", ""); } + mp.put("是否管控", json.getString("lock_type").equals("88") ? "是" : "否"); mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel")); mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox")); mp.put("客户要求规格幅宽", json.getString("width_standard")); 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 b088b13ca..5e92b94fc 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 @@ -437,6 +437,7 @@ attr.sect_code, attr.sect_name, attr.stor_name, + attr.lock_type, attr.storagevehicle_code, mater.material_code, mater.material_name, @@ -490,6 +491,12 @@ OPTION 输入.ivt_status = "frozen_qty" StructIvt.frozen_qty > 0 ENDOPTION + OPTION 输入.control = "0" + attr.lock_type <> '88' + ENDOPTION + OPTION 输入.control = "1" + attr.lock_type = '88' + ENDOPTION ) ivt LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND ivt.storagevehicle_code = sub.package_box_sn LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name diff --git a/lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue b/lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue index e5e6c1519..c3d23a2ce 100644 --- a/lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue @@ -293,6 +293,12 @@ export default { return } this.form.open_type = this.openType + if (this.openType === '0' || this.openType === '1') { + if (this.form.remark === '') { + this.crud.notify('备注不能为空!', CRUD.NOTIFICATION_TYPE.INFO) + return + } + } crudControl.addSubmit(this.form).then(res => { this.crud.notify('操作成功!', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery()