优化

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

@@ -102,7 +102,7 @@ public class DailyplanServiceImpl implements DailyplanService {
             map.put("end_time", end_time.substring(0,10)+" 23:59:59");
         }
         map.put("flag", "3");
-        JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.planstart_time,WorkOrder.device_id,ext.old_mark");
+        JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder2.planstart_time,WorkOrder2.device_id,WorkOrder2.old_mark");
         JSONArray json = jret.getJSONArray("content");
         JSONArray ja = new JSONArray();
         for(int i=0;i<json.size();i++){
@@ -157,7 +157,7 @@ public class DailyplanServiceImpl implements DailyplanService {
             map.put("end_time", end_time.substring(0,10)+" 23:59:59");
         }
         map.put("flag", "7");
-        JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.device_id,materialbase.material_code");
+        JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder2.device_id,WorkOrder2.material_code");
         JSONArray json = jret.getJSONArray("content");
         JSONArray ja = new JSONArray();
         for(int i=0;i<json.size();i++){

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

@@ -153,38 +153,47 @@
     IF 输入.flag = "3"
         PAGEQUERY
             SELECT
-                WorkOrder.planstart_time,
-                 deviceinfo.device_code,
-                deviceinfo.device_name,
-                WorkOrder.device_id,
-                COUNT(*) AS product_num,
-                sum(WorkOrder.workorder_qty) AS sum_qty,
-                ext.old_mark,
-                ext.standard_mark
+            	WorkOrder2.planstart_time,
+            	WorkOrder2.device_id,
+            	WorkOrder2.old_mark,
+            	COUNT(*) AS product_num,
+            	sum( WorkOrder2.workorder_qty ) AS sum_qty,
+            	MIN(WorkOrder2.device_code2)AS device_code,
+            	MIN(WorkOrder2.device_name2) AS device_name
             FROM
-                PDM_BI_WorkOrder WorkOrder
-                LEFT JOIN MD_ME_ProducMaterialExt ext ON WorkOrder.material_id = ext.material_id
-                LEFT JOIN md_me_materialbase materialbase ON WorkOrder.material_id = materialbase.material_id
-                LEFT JOIN em_bi_deviceinfo deviceinfo ON deviceinfo.device_id = WorkOrder.device_id
-            WHERE
-                1=1 and WorkOrder.is_delete='0'
-                 AND deviceinfo.is_active = '1'
-                AND deviceinfo.is_delete = '0'
-                AND deviceinfo.is_produceuse = '1'
-                AND deviceinfo.workprocedure_code = 'GX003'
-               OPTION 输入.begin_time <> ""
-                        WorkOrder.planstart_time >= 输入.begin_time
-               ENDOPTION
-               OPTION 输入.end_time <> ""
-                         WorkOrder.planstart_time <= 输入.end_time
-               ENDOPTION
-                OPTION 输入.material_code <> ""
-                       (materialbase.material_code like 输入.material_code or materialbase.material_name like 输入.material_code)
-                ENDOPTION
-                 OPTION 输入.device_id <> ""
-                        WorkOrder.device_id = 输入.device_id
-                ENDOPTION
-                group by WorkOrder.planstart_time,WorkOrder.device_id,ext.old_mark
+            	(
+            	SELECT
+            		WorkOrder.planstart_time,
+            		WorkOrder.workorder_qty,
+            		deviceinfo.device_code AS device_code2,
+            		deviceinfo.device_name AS device_name2,
+            		WorkOrder.device_id,
+            		ext.old_mark
+            	FROM
+                    PDM_BI_WorkOrder WorkOrder
+                    LEFT JOIN MD_ME_ProducMaterialExt ext ON WorkOrder.material_id = ext.material_id
+                    LEFT JOIN md_me_materialbase materialbase ON WorkOrder.material_id = materialbase.material_id
+                    LEFT JOIN em_bi_deviceinfo deviceinfo ON deviceinfo.device_id = WorkOrder.device_id
+                WHERE
+                    1=1 and WorkOrder.is_delete='0'
+                     AND deviceinfo.is_active = '1'
+                    AND deviceinfo.is_delete = '0'
+                    AND deviceinfo.is_produceuse = '1'
+                    AND deviceinfo.workprocedure_code = 'GX003'
+                   OPTION 输入.begin_time <> ""
+                            WorkOrder.planstart_time >= 输入.begin_time
+                   ENDOPTION
+                   OPTION 输入.end_time <> ""
+                             WorkOrder.planstart_time <= 输入.end_time
+                   ENDOPTION
+                    OPTION 输入.material_code <> ""
+                           (materialbase.material_code like 输入.material_code or materialbase.material_name like 输入.material_code)
+                    ENDOPTION
+                     OPTION 输入.device_id <> ""
+                            WorkOrder.device_id = 输入.device_id
+                    ENDOPTION
+                    ) WorkOrder2
+                group by WorkOrder2.planstart_time,WorkOrder2.device_id,WorkOrder2.old_mark
             ENDSELECT
         ENDPAGEQUERY
     ENDIF
@@ -269,14 +278,23 @@
 
     IF 输入.flag = "7"
         PAGEQUERY
-            SELECT
-                deviceinfo.device_code,
-                deviceinfo.device_name,
-                WorkOrder.device_id,
+             SELECT
+                WorkOrder2.material_code,
+                WorkOrder2.device_id,
                 COUNT(*) AS product_num,
-                sum(WorkOrder.workorder_qty) AS sum_qty,
+                sum( WorkOrder2.workorder_qty ) AS sum_qty,
+                MIN(WorkOrder2.device_code2)AS device_code,
+                MIN(WorkOrder2.device_name2) AS device_name,
+                             MIN(WorkOrder2.planstart_time) AS workorder_date
+            FROM
+                (
+                SELECT
+                                deviceinfo.device_code AS device_code2,
+                deviceinfo.device_name AS device_name2,
+                WorkOrder.device_id,
+                WorkOrder.workorder_qty,
                 materialbase.material_code,
-                MIN(WorkOrder.planstart_time) AS workorder_date
+                                WorkOrder.planstart_time
             FROM
                 PDM_BI_WorkOrder WorkOrder
                 LEFT JOIN md_me_materialbase materialbase ON WorkOrder.material_id = materialbase.material_id
@@ -292,7 +310,8 @@
                 OPTION 输入.material_code <> ""
                        (materialbase.material_code like 输入.material_code or materialbase.material_name like 输入.material_code)
                 ENDOPTION
-                group by WorkOrder.device_id,materialbase.material_code
+                ) WorkOrder2
+                group by WorkOrder2.device_id,WorkOrder2.material_code
             ENDSELECT
         ENDPAGEQUERY
     ENDIF

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairmstController.java

@@ -74,6 +74,14 @@ public class DevicerepairmstController {
         return new ResponseEntity<>(devicerepairmstService.queryBom(whereJson, page), HttpStatus.OK);
     }
 
+    @GetMapping("/findByCode")
+    @Log("查询备件bom")
+    @ApiOperation("查询")
+    public ResponseEntity<Object> findByCode(@RequestParam Map whereJson) {
+        String code = (String) whereJson.get("id");
+        return new ResponseEntity<>(devicerepairmstService.findByCode(code), HttpStatus.OK);
+    }
+
     @PostMapping
     @Log("新增维修单维护")
     @ApiOperation("新增维修单维护")

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java

@@ -149,7 +149,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
     @Override
     public DevicerepairmstDto findByCode(String code) {
         WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairmst");
-        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
+        JSONObject json = wo.query("repair_code ='" + code + "'").uniqueResult(0);
         if (ObjectUtil.isNotEmpty(json)) {
             return json.toJavaObject(DevicerepairmstDto.class);
         }

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java

@@ -68,6 +68,14 @@ public class DevicemaintenancemstController {
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
+    @GetMapping("/findByCode")
+    @Log("查询备件bom")
+    @ApiOperation("查询")
+    public ResponseEntity<Object> findByCode(@RequestParam Map whereJson) {
+        String code = (String) whereJson.get("id");
+        return new ResponseEntity<>(devicemaintenancemstService.findByCode(code), HttpStatus.OK);
+    }
+
     @PutMapping
     @Log("修改设备保养单")
     @ApiOperation("修改设备保养单")

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java

@@ -141,7 +141,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
     @Override
     public DevicemaintenancemstDto findByCode(String code) {
         WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenancemst");
-        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
+        JSONObject json = wo.query("maint_code ='" + code + "'").uniqueResult(0);
         if (ObjectUtil.isNotEmpty(json)) {
             return json.toJavaObject(DevicemaintenancemstDto.class);
         }