diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql index 56381f35..c291c1dd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql @@ -65,14 +65,6 @@ WHERE 1 = 1 AND workorder.is_out = '1' - AND workorder.workorder_id IN ( - SELECT DISTINCT - ( procedureoffline.workorder_id ) - FROM - pdm_bi_procedureoffline procedureoffline - WHERE - 1 = 1 - AND procedureoffline.is_send='0') ENDSELECT ENDPAGEQUERY ENDIF 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 bf2392fb..204d3da9 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 @@ -201,7 +201,7 @@ max(procedureoffline.create_time) as create_time, COUNT(*) AS num_bucket, sum(procedureoffline.qty) AS total_qty, - max(procedureoffline.pcsn) as pcsn, + 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, @@ -209,9 +209,9 @@ max(workorder.workorder_qty) AS workorder_qty, max(workorder.org_id) AS org_id FROM - pdm_bi_procedureoffline procedureoffline - INNER JOIN pdm_bi_workorder workorder ON workorder.workorder_id = procedureoffline.workorder_id - INNER JOIN md_me_materialbase mb ON mb.material_id = procedureoffline.material_id + 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 WHERE 1 = 1 and workorder.is_out='1' OPTION 输入.begin_time <> ""