From 5f4e1f6cc2a3e53ab41fc51ed9623f65198f1e25 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 21 Oct 2022 11:25:21 +0800 Subject: [PATCH] =?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 --- .../java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 3ffcee91..bc040c54 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -725,6 +725,7 @@ public class FormulaServiceImpl implements FormulaService { WQLObject paraTab = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct"); // 工艺参数表 WQLObject workTaskTab = WQLObject.getWQLObject("PDM_BI_WorkTask"); // 工令工序任务表 WQLObject classTab = WQLObject.getWQLObject("md_pb_classstandard"); // 分类表 + WQLObject deviceTab = WQLObject.getWQLObject("em_bi_deviceinfo"); // 设备表 JSONObject jsonMst = formMstTab.query("formula_id ='" + formula_id + "'").uniqueResult(0); String material_id = jsonMst.getString("material_id"); @@ -859,8 +860,9 @@ public class FormulaServiceImpl implements FormulaService { map2.put("flag", "5"); map2.put("product_series_id", jsonMst.getString("product_series_id")); map2.put("workprocedure_id", "1472449923327856640"); - JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDevice3)) oneMap.put("device2",jsonDevice3.getString("device_name")); +// JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0); + JSONObject jsonDevice = deviceTab.query("device_id = '" + jsonWork.getString("device_id") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonDevice)) oneMap.put("device2",jsonDevice.getString("device_name")); // 球磨