root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-27 16:26:54 +08:00
parent ebe563f0fc c092970a8f
commit f1a9ffd218
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql
View File

@@ -192,28 +192,41 @@
IF 输入.flag = "5" IF 输入.flag = "5"
PAGEQUERY PAGEQUERY
SELECT SELECT
procedureoffline2.num_bucket,
procedureoffline2.total_qty,
procedureoffline.storagevehicle_code, procedureoffline.storagevehicle_code,
max(procedureoffline.is_send) as is_send, procedureoffline.is_send AS is_send,
max(procedureoffline.send_name) as send_name, procedureoffline.send_name AS send_name,
max(procedureoffline.send_time) as send_time, procedureoffline.send_time AS send_time,
max(procedureoffline.create_name) as create_name, procedureoffline.create_name AS create_name,
max(procedureoffline.status) as status, procedureoffline.STATUS AS STATUS,
max(procedureoffline.create_time) as create_time, procedureoffline.create_time AS create_time,
COUNT(procedureoffline.storagevehicle_code) AS num_bucket, workorder.pcsn AS pcsn,
sum(procedureoffline.qty) AS total_qty, mb.material_code AS material_code,
max(workorder.pcsn) as pcsn, workorder.workorder_code AS workorder_code,
max(mb.material_code) AS material_code, workorder.send_date AS send_date,
max(workorder.workorder_code) AS workorder_code, workorder.STATUS AS workorder_status,
max(workorder.send_date) AS send_date, workorder.workorder_qty AS workorder_qty,
max(workorder.status) AS workorder_status, workorder.org_id AS org_id
max(workorder.workorder_qty) AS workorder_qty,
max(workorder.org_id) AS org_id
FROM FROM
pdm_bi_workorder workorder pdm_bi_workorder workorder
LEFT JOIN pdm_bi_procedureoffline procedureoffline ON workorder.workorder_id = procedureoffline.workorder_id 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 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 WHERE
1 = 1 and workorder.is_out='1' 1 = 1
AND workorder.is_out = '1'
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""
workorder.send_date >= 输入.begin_time workorder.send_date >= 输入.begin_time
ENDOPTION ENDOPTION
@@ -238,7 +251,6 @@
OPTION 输入.is_send <> "" OPTION 输入.is_send <> ""
procedureoffline.is_send = 输入.is_send procedureoffline.is_send = 输入.is_send
ENDOPTION ENDOPTION
group by ifnull(procedureoffline.storagevehicle_code,uuid())
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF