修改

mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java

@@ -112,6 +112,12 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
             throw new PdaRequestException("缺少必要参数！");
         }
 
+        //判断该设备是否属于配粉设备
+        JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX001'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(device)){
+            throw new PdaRequestException("请输入配粉工位设备编码！");
+        }
+
         //查询当前工艺任务物料
         JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0);
         String material_id = work_task.getString("material_id");
@@ -458,7 +464,11 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
             throw new PdaRequestException("该配方未完成,不允许搬出！");
         }
 
-        JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "'").uniqueResult(0);
+        //判断该设备是否属于配粉设备
+        JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX001'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(device)){
+            throw new PdaRequestException("请输入配粉工位设备编码！");
+        }
         JSONObject device_point = WQLObject.getWQLObject("SCH_BASE_DevicePointPara")
                 .query("device_uuid = '" + device.getString("device_id") + "' AND is_used = '1' AND is_delete = '0' AND point_type = '02'").uniqueResult(0);
         if (ObjectUtil.isEmpty(device_point)) {
@@ -618,6 +628,12 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
             throw new PdaRequestException("缺少必要参数！");
         }
 
+        //判断该设备是否属于球磨设备
+        JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX002'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(device)){
+            throw new PdaRequestException("请输入球磨设备编码！");
+        }
+
         //查询该设备的上下料点位是否存在任务
         JSONObject up_form = new JSONObject();
         up_form.put("device_code", device_code);
@@ -703,7 +719,11 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
 
         JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0);
         JSONObject work_order = WQLObject.getWQLObject("PDM_BI_WorkOrder").query("workorder_code = '" + work_task.getString("workorder_code") + "'").uniqueResult(0);
-        JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '" + work_task.getString("device_id") + "'").uniqueResult(0);
+        //判断该设备是否属于球磨设备
+        JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '" + work_task.getString("device_id") + "' AND workprocedure_code = 'GX002'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(device_jo)){
+            throw new PdaRequestException("请输入配粉工位设备编码！");
+        }
         JSONObject form_jo = WQLObject.getWQLObject("PDM_BI_Formula").query("workorder_code = '" + work_task.getString("workorder_code") + "' AND bucket_type = '01'").uniqueResult(0);
         JSONObject material_ext = WQLObject.getWQLObject("MD_ME_ProducMaterialExt").query("material_id = '" + work_order.getString("material_id") + "'").uniqueResult(0);
 
@@ -798,6 +818,12 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
 
         JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0);
 
+        //判断该设备是否属于球磨设备
+        JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX002'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(device)){
+            throw new PdaRequestException("请输入球磨设备编码！");
+        }
+
         JSONObject now_form = new JSONObject();
         now_form.put("device_code", device_code);
         now_form.put("point_type", "02");
@@ -915,6 +941,12 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
             throw new PdaRequestException("缺少必要参数！");
         }
 
+        //判断该设备是否属于喷雾设备
+        JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX003'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(device)){
+            throw new PdaRequestException("请输入喷雾设备编码！");
+        }
+
         //判断该载具是否重量大于0
         JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + storagevehicle_code + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(vehicle_ext)) {
@@ -1008,7 +1040,11 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
         }
 
         JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0);
-        JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '" + work_task.getString("device_id") + "'").uniqueResult(0);
+        //判断该设备是否属于喷雾设备
+        JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"' AND workprocedure_code = 'GX003'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(device_jo)){
+            throw new PdaRequestException("请输入喷雾设备编码！");
+        }
 
         if (StrUtil.isEmpty(work_task.getString("device_id"))) {
             throw new PdaRequestException("当前工序任务还未绑定设备！");
@@ -1158,6 +1194,13 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
         if (work_task.getString("workprocedure_id").equals(work_task.getString("nextworkprocedure_id"))) {
             throw new PdaRequestException("当前工序为最后一道工序！");
         }
+
+        //判断该设备是否属于喷雾设备
+        JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+mix_device_code+"' AND workprocedure_code = 'GX004'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(device)){
+            throw new PdaRequestException("请输入混合设备编码！");
+        }
+
         //查询混料设备的上料位
         JSONObject next_form = new JSONObject();
         next_form.put("device_code", mix_device_code);

mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/service/impl/SparePartServiceImpl.java

@@ -908,12 +908,11 @@ public class SparePartServiceImpl implements SparePartService {
         JSONObject form = JSONObject.parseObject(JSON.toJSONString(jsonObject));
         String dept_id = form.getString("dept_id");
 
-        JSONObject jo1 = WQL.getWO("QPDAEM_BI_SPAREPART").addParam("flag", "10").addParam("dept_id", dept_id).pageQuery(ctx,"create_time desc");
+        JSONArray rows = WQL.getWO("QPDAEM_BI_SPAREPART").addParam("flag", "10").addParam("dept_id", dept_id).process().getResultJSONArray(0);
         JSONObject returnjo = new JSONObject();
         returnjo.put("code", "1");
         returnjo.put("desc", "查询成功！");
-        returnjo.put("rows", jo1.getJSONArray("content"));
+        returnjo.put("rows", rows);
-        returnjo.put("size", jo1.getJSONArray("content").size());
         return returnjo;
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/wql/QPDAEM_BI_SPAREPART.wql

@@ -21,6 +21,7 @@
     输入.iostorinvdtl_id      					        TYPEAS s_string
     输入.material_id            					        TYPEAS s_string
     输入.run_date            					        TYPEAS s_string
+    输入.dept_id         					            TYPEAS s_string
 
 
 [临时表]
@@ -318,6 +319,31 @@
         ENDQUERY
     ENDIF
 
+    IF 输入.flag = "10"
+        QUERY
+            SELECT
+            	request.request_id,
+            	request.create_time,
+            	file.device_name,
+            	file.device_code,
+            	dept.name,
+            	request.fault_desc,
+            	request.process_time
+            FROM
+            	em_bi_devicerepairrequest request
+            	LEFT JOIN em_bi_equipmentfile file ON file.devicerecord_id = request.devicerecord_id
+            	LEFT JOIN sys_dept dept ON dept.dept_id = request.sysdeptid
+            WHERE
+                1=1
+            OPTION 输入.dept_id <> ""
+                request.sysdeptid = 输入.dept_id
+            ENDOPTION
+            	ORDER BY
+            	create_time desc
+            ENDSELECT
+        ENDQUERY
+    ENDIF
+