优化

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DailyplanController.java

@@ -40,6 +40,13 @@ public class DailyplanController {
                 queryAll(whereJson,page),HttpStatus.OK);
     }
 
+    @GetMapping("/queryday")
+    @Log("查询月生产计划")
+    @ApiOperation("查询月生产计划")
+    public ResponseEntity<Object> queryday(@RequestParam Map whereJson, Pageable page){
+        return new ResponseEntity<>(dailyplanService.
+                queryday(whereJson,page),HttpStatus.OK);
+    }
     @GetMapping("/query2")
     @Log("查询月生产计划")
     @ApiOperation("查询月生产计划")

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

@@ -25,6 +25,13 @@ public interface DailyplanService {
     * @return Map<String,Object>
     */
     Map<String,Object> queryAll(Map whereJson, Pageable page);
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @param page 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> queryday(Map whereJson, Pageable page);
     /**
      * 创建
      * @param json /

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

@@ -85,7 +85,61 @@ public class DailyplanServiceImpl implements DailyplanService {
         jret.put("content",ja);
         return jret;
     }
+    @Override
+    public Map<String, Object> queryday(Map whereJson, Pageable page) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
 
+        String material_code = map.get("material_code");
+        if (StrUtil.isNotEmpty(material_code)) {
+            map.put("material_code", "%" + material_code + "%");
+        }
+        String begin_time = map.get("begin_time");
+        if (StrUtil.isNotEmpty(begin_time)) {
+            map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
+        }
+        String end_time = map.get("end_time");
+        if (StrUtil.isNotEmpty(end_time)) {
+            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");
+        JSONArray json = jret.getJSONArray("content");
+        JSONArray ja = new JSONArray();
+        for(int i=0;i<json.size();i++){
+            JSONObject jo = json.getJSONObject(i);
+            String planstart_time = jo.getString("planstart_time");
+            JSONObject last =  WQL.getWO("QPDM_PRODUCTDAILYPLAN")
+                    .addParam("flag", "4")
+                    .addParam("begin_time", "%"+planstart_time.substring(0,10)+"%")
+                    .addParam("device_id",jo.getString("device_id"))
+                    .addParam("old_mark",jo.getString("old_mark"))
+                    .process().uniqueResult(0);
+            if(last!=null){
+                jo.put("pw_time",last.getString("realend_time"));
+            }
+            JSONObject last5 =  WQL.getWO("QPDM_PRODUCTDAILYPLAN")
+                    .addParam("flag", "5")
+                    .addParam("begin_time", "%"+planstart_time.substring(0,10)+"%")
+                    .addParam("device_id",jo.getString("device_id"))
+                    .addParam("old_mark",jo.getString("old_mark"))
+                    .process().uniqueResult(0);
+            if(last5!=null){
+                jo.put("in_time",last5.getString("create_time"));
+            }
+            JSONObject last6 =  WQL.getWO("QPDM_PRODUCTDAILYPLAN")
+                    .addParam("flag", "6")
+                    .addParam("begin_time", "%"+planstart_time.substring(0,10)+"%")
+                    .addParam("device_id",jo.getString("device_id"))
+                    .addParam("old_mark",jo.getString("old_mark"))
+                    .process().uniqueResult(0);
+            if(StrUtil.isNotEmpty(last6.getString("total_qty"))){
+                jo.put("in_qty",last6.getDouble("total_qty")/1000.0);
+            }
+            ja.add(jo);
+        }
+        jret.put("content",ja);
+        return jret;
+    }
     @Override
     public JSONArray queryAll(Map whereJson) {
         HashMap<String, String> map = new HashMap<>(whereJson);

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

@@ -23,6 +23,7 @@
 	输入.begin_time			            TYPEAS s_string
     输入.end_time					    TYPEAS s_string
     输入.device_id					    TYPEAS s_string
+    输入.old_mark					    TYPEAS s_string
     输入.workorder_type					    TYPEAS s_string
 
 
@@ -148,6 +149,124 @@
         ENDQUERY
         ENDIF
 
+    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,
+                materialbase.material_code
+            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
+            ENDSELECT
+        ENDPAGEQUERY
+    ENDIF
+
+    IF 输入.flag = "4"
+            QUERY
+                SELECT
+                    WorkOrder.*,
+                     ext.old_mark
+                FROM
+                    PDM_BI_WorkOrder WorkOrder
+                 LEFT JOIN MD_ME_ProducMaterialExt ext ON WorkOrder.material_id = ext.material_id
+                WHERE
+                    1=1 and WorkOrder.is_delete='0'
+                    and WorkOrder.status='99'
+                   OPTION 输入.begin_time <> ""
+                            WorkOrder.planstart_time like 输入.begin_time
+                   ENDOPTION
+                    OPTION 输入.old_mark <> ""
+                           ext.old_mark = 输入.old_mark
+                    ENDOPTION
+                    OPTION 输入.device_id <> ""
+                           WorkOrder.device_id = 输入.device_id
+                   ENDOPTION
+                 order by WorkOrder.realend_time desc
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+
+     IF 输入.flag = "5"
+        QUERY
+            SELECT
+                WorkOrder.workorder_id,
+                ProcedureOffline.diskrecord_id,
+                ProcedureOffline.qty,
+                ProcedureOffline.create_time
+            FROM
+                PDM_BI_WorkOrder WorkOrder
+            LEFT JOIN PDM_BI_ProcedureOffline ProcedureOffline ON ProcedureOffline.workorder_id = WorkOrder.workorder_id
+             LEFT JOIN MD_ME_ProducMaterialExt ext ON WorkOrder.material_id = ext.material_id
+            WHERE
+                1=1 and WorkOrder.is_delete='0'
+                and ProcedureOffline.status='1'
+              OPTION 输入.begin_time <> ""
+                      WorkOrder.planstart_time like 输入.begin_time
+             ENDOPTION
+              OPTION 输入.old_mark <> ""
+                     ext.old_mark = 输入.old_mark
+              ENDOPTION
+              OPTION 输入.device_id <> ""
+                     WorkOrder.device_id = 输入.device_id
+             ENDOPTION
+             order by ProcedureOffline.create_time desc
+            ENDSELECT
+        ENDQUERY
+    ENDIF
+
+    IF 输入.flag = "6"
+            QUERY
+                SELECT
+                    sum(ProcedureOffline.qty) AS total_qty,
+                    WorkOrder.device_id
+                FROM
+                    PDM_BI_WorkOrder WorkOrder
+                LEFT JOIN PDM_BI_ProcedureOffline ProcedureOffline ON ProcedureOffline.workorder_id = WorkOrder.workorder_id
+                  LEFT JOIN MD_ME_ProducMaterialExt ext ON WorkOrder.material_id = ext.material_id
+                WHERE
+                    1=1 and WorkOrder.is_delete='0'
+                    and ProcedureOffline.status='1'
+                  OPTION 输入.begin_time <> ""
+                          WorkOrder.planstart_time like 输入.begin_time
+                 ENDOPTION
+                  OPTION 输入.old_mark <> ""
+                         ext.old_mark = 输入.old_mark
+                  ENDOPTION
+                  OPTION 输入.device_id <> ""
+                         WorkOrder.device_id = 输入.device_id
+                 ENDOPTION
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+