生产设备修改

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java

@@ -41,6 +41,7 @@ public class DeviceServiceImpl implements DeviceService {
         param.put("flag", "1");
         param.put("search", whereJson.get("search"));
         param.put("workprocedure_id", whereJson.get("workprocedure_id"));
+        param.put("product_area", whereJson.get("product_area"));
         JSONObject jsonObject = WQL.getWO("QUERY_DEVICE").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "device_code asc");
         return jsonObject;
     }
@@ -120,8 +121,7 @@ public class DeviceServiceImpl implements DeviceService {
     @Override
     public JSONArray getWorkprocedure() {
         WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure");
-        final JSONArray resultJSONArray = wo.query("is_used = '0'").getResultJSONArray(0);
-        return resultJSONArray;
+        return wo.query("is_used = '1'").getResultJSONArray(0);
     }
 
     @Override

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql

@@ -16,6 +16,7 @@
 	输入.flag					        TYPEAS s_string
 	输入.search  					    TYPEAS s_string
 	输入.workprocedure_id			    TYPEAS s_string
+	输入.product_area   			    TYPEAS s_string
 
 
 [临时表]
@@ -54,6 +55,9 @@
                     ENDOPTION
                     OPTION 输入.workprocedure_id <> ""
                         (device.workprocedure_id = 输入.workprocedure_id)
+                    ENDOPTION
+                    OPTION 输入.product_area <> ""
+                        device.product_area = 输入.product_area
                     ENDOPTION
     			ENDSELECT
     		ENDPAGEQUERY