From be38e5f99b3abaff22a2fe28116bd657e6db8a7c Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 30 Jan 2024 16:33:03 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=90=88=E5=90=8C=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/basedata/master/constant/MaterOptTypeEnum.java | 3 ++- .../pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java | 4 ++++ .../java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java index 620ddfa0..cb69783d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/constant/MaterOptTypeEnum.java @@ -36,7 +36,8 @@ public enum MaterOptTypeEnum { BJID(25, "26", "备品备件", "1503644361789935616", ""), THW_AND_GF_AND_TJJ(26, "27", "碳化钨、钴粉、添加剂", "('1503644361664106496','1503644362192588800','1503644361697660928')", ""), BCP_AND_YL_AND_FL(27, "28", "半成品、原辅料、合金制品", "('1503644359155912704','1503644353019645952','1503644353116114944','1503644349995552768')", ""), - YYJS(28, "29", "有色金属中除了焊条", "('1503644361664106496','1503644361697660928','1503644362192588800','1503644362234531840','1503644362788179968','1503644362838511616')", ""); + YYJS(28, "29", "有色金属中除了焊条", "('1503644361664106496','1503644361697660928','1503644362192588800','1503644362234531840','1503644362788179968','1503644362838511616')", ""), + ZLFL(29, "30", "主要材料辅料材料", "('1503644353019645952','1503644353116114944')", ""); //顺序号 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java index d287762d..23a2a872 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java @@ -203,6 +203,10 @@ public class PcsIfPurchaseorderprocServiceImpl implements PcsIfPurchaseorderproc if (!ObjectUtil.isEmpty(vbillcode)) { map.put("vbillcode", "%" + vbillcode + "%"); } + + String classIds = classstandardService.getAllChildIdStr(MaterOptTypeEnum.ZLFL.getClass_idStr()); + map.put("classIds",classIds); + JSONObject json = WQL.getWO("QPCS_IF_PURCHASEORDERPROC02").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "oder.VBILLCODE"); List content = json.getJSONArray("content").toJavaList(JSONObject.class); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql index e3052749..76e8c2f7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql @@ -18,6 +18,7 @@ 输入.end_time TYPEAS s_string 输入.material_code TYPEAS s_string 输入.vbillcode TYPEAS s_string + 输入.classIds TYPEAS f_string [临时表] @@ -183,6 +184,10 @@ oder.vbillcode like 输入.vbillcode ENDOPTION + OPTION 输入.classIds <> "" + mater.material_type_id in 输入.classIds + ENDOPTION + OPTION 输入.material_code <> "" (mater.material_code like 输入.material_code or mater.material_name like 输入.material_code )