root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-21 11:25:21 +08:00
parent 31fb7a7d0f
commit 5f4e1f6cc2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
View File

@@ -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"));
// 球磨