diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql index 9b15f715..66dd491d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql @@ -192,28 +192,41 @@ IF 输入.flag = "5" PAGEQUERY SELECT + procedureoffline2.num_bucket, + procedureoffline2.total_qty, procedureoffline.storagevehicle_code, - max(procedureoffline.is_send) as is_send, - max(procedureoffline.send_name) as send_name, - max(procedureoffline.send_time) as send_time, - max(procedureoffline.create_name) as create_name, - max(procedureoffline.status) as status, - max(procedureoffline.create_time) as create_time, - COUNT(procedureoffline.storagevehicle_code) AS num_bucket, - sum(procedureoffline.qty) AS total_qty, - max(workorder.pcsn) as pcsn, - max(mb.material_code) AS material_code, - max(workorder.workorder_code) AS workorder_code, - max(workorder.send_date) AS send_date, - max(workorder.status) AS workorder_status, - max(workorder.workorder_qty) AS workorder_qty, - max(workorder.org_id) AS org_id + procedureoffline.is_send AS is_send, + procedureoffline.send_name AS send_name, + procedureoffline.send_time AS send_time, + procedureoffline.create_name AS create_name, + procedureoffline.STATUS AS STATUS, + procedureoffline.create_time AS create_time, + workorder.pcsn AS pcsn, + mb.material_code AS material_code, + workorder.workorder_code AS workorder_code, + workorder.send_date AS send_date, + workorder.STATUS AS workorder_status, + workorder.workorder_qty AS workorder_qty, + workorder.org_id AS org_id FROM pdm_bi_workorder workorder LEFT JOIN pdm_bi_procedureoffline procedureoffline ON workorder.workorder_id = procedureoffline.workorder_id LEFT JOIN md_me_materialbase mb ON mb.material_id = workorder.material_id + LEFT JOIN ( + SELECT + procedureoffline.storagevehicle_code, + COUNT( procedureoffline.diskrecord_id ) AS num_bucket, + sum( procedureoffline.qty ) AS total_qty + FROM + pdm_bi_procedureoffline procedureoffline + WHERE + 1 = 1 + GROUP BY + procedureoffline.storagevehicle_code + ) procedureoffline2 ON procedureoffline2.storagevehicle_code = procedureoffline.storagevehicle_code WHERE - 1 = 1 and workorder.is_out='1' + 1 = 1 + AND workorder.is_out = '1' OPTION 输入.begin_time <> "" workorder.send_date >= 输入.begin_time ENDOPTION @@ -238,7 +251,6 @@ OPTION 输入.is_send <> "" procedureoffline.is_send = 输入.is_send ENDOPTION - group by ifnull(procedureoffline.storagevehicle_code,uuid()) ENDSELECT ENDPAGEQUERY ENDIF