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 75c69797..4c8622cb 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
@@ -569,31 +569,26 @@ public class FormulaServiceImpl implements FormulaService {
         }
 
         // 系列设备
-        JSONObject jsonWorkTask_QM = workTaskTab.query("workorder_id = '" + jsonWork.getString("workorder_id") + "' and workprocedure_code = 'GX002'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(jsonWorkTask_QM)) {
-            HashMap<String, String> map1 = new HashMap<>();
-            map1.put("flag", "3");
-            map1.put("product_series_id", jsonWorkTask_QM.getString("product_series_id"));
-            map1.put("workprocedure_id", jsonWorkTask_QM.getString("workprocedure_id"));
-            JSONObject jsonDevice1 = WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
-            map1.put("flag", "4");
-            JSONObject jsonDevice2= WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
-            if (ObjectUtil.isNotEmpty(jsonDevice1) && ObjectUtil.isNotEmpty(jsonDevice2)) {
-                String device_code_1 = jsonDevice1.getString("device_code").substring(4, 6);
-                String device_code_2 = jsonDevice2.getString("device_code").substring(4, 6);
-                oneMap.put("device1", device_code_1 + "-" + device_code_2);
-            }
+        HashMap<String, String> map1 = new HashMap<>();
+        map1.put("flag", "3");
+        map1.put("product_series_id", jsonMst.getString("product_series_id"));
+        map1.put("workprocedure_id", "1472449856613257216");
+        JSONObject jsonDevice1 = WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
+        map1.put("flag", "4");
+        JSONObject jsonDevice2= WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(jsonDevice1) && ObjectUtil.isNotEmpty(jsonDevice2)) {
+            String device_code_1 = jsonDevice1.getString("device_code").substring(4, 6);
+            String device_code_2 = jsonDevice2.getString("device_code").substring(4, 6);
+            oneMap.put("device1", device_code_1 + "-" + device_code_2);
         }
 
-        JSONObject jsonWorkTask_PW = workTaskTab.query("workorder_id = '" + jsonWork.getString("workorder_id") + "' and workprocedure_code = 'GX003'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(jsonWorkTask_PW)) {
-            HashMap<String, String> map2 = new HashMap<>();
-            map2.put("flag", "5");
-            map2.put("product_series_id", jsonWorkTask_PW.getString("product_series_id"));
-            map2.put("workprocedure_id", jsonWorkTask_PW.getString("workprocedure_id"));
-            JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0);
-            if (ObjectUtil.isNotEmpty(jsonDevice3)) oneMap.put("device2",jsonDevice3.getString("device_name"));
-        }
+        HashMap<String, String> map2 = new HashMap<>();
+        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"));
+
 
         // 球磨
         oneMap.put("ball_speed", jsonMaterExt.getString("ball_speed"));