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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-22 14:13:55 +08:00
parent 92f4ffc6f1
commit c75494408a
2 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PowderOrderQueryServiceImpl.java
View File

@@ -106,7 +106,7 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
String classIds = classstandardService.getAllChildIdStr(MaterOptTypeEnum.YL_AND_FL.getClass_idStr()); String classIds = classstandardService.getAllChildIdStr(MaterOptTypeEnum.YL_AND_FL.getClass_idStr());
String RF = classstandardService.getAllChildIdStr(MaterOptTypeEnum.RF.getClass_idStr()); String RF = classstandardService.getAllChildIdStr(MaterOptTypeEnum.RF.getClass_idStr());
JSONArray resultJSONArray = WQL.getWO("QP_POWDERORDERQUERY01").addParam("flag", "2").addParam("classIds", classIds).addParam("rf", RF).process().getResultJSONArray(0); JSONArray resultJSONArray = WQL.getWO("QP_POWDERORDERQUERY01").addParam("flag", "2").addParam("classIds", classIds).process().getResultJSONArray(0);
for (int i = 0; i < resultJSONArray.size(); i++) { for (int i = 0; i < resultJSONArray.size(); i++) {
JSONObject json = resultJSONArray.getJSONObject(i); JSONObject json = resultJSONArray.getJSONObject(i);

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

@@ -97,14 +97,20 @@
QUERY QUERY
SELECT SELECT
MAX(dtl.formuladtl_id) AS formuladtl_id, MAX(dtl.formuladtl_id) AS formuladtl_id,
mater.material_id, mater.material_id AS material_id,
MAX(mater.material_name) AS material_name, MAX(mater.material_name) AS material_name,
MAX(mater.material_code) AS material_code, MAX(mater.material_code) AS material_code,
group_concat(dtl.pcsn separator '+') AS pcsn, group_concat(dtl.pcsn separator '+') AS pcsn,
group_concat(dtl.formula_qty separator '+') AS formula_qty group_concat(dtl.formula_qty separator '+') AS formula_qty,
(case when class.class_id = '1503644362192588800' then 1
when class.class_id = '1503644361664106496' then 2
when class.class_id = '1503644362788179968' then 4
when class.class_id = '1503644362234531840' then 5
else 3 end) AS order_no
FROM FROM
PDM_BI_FormulaDtl dtl PDM_BI_FormulaDtl dtl
LEFT JOIN md_me_materialbase mater ON dtl.material_id = mater.material_id LEFT JOIN md_me_materialbase mater ON dtl.material_id = mater.material_id
LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id
LEFT JOIN PDM_BI_Formula mst ON dtl.formula_id = mst.formula_id LEFT JOIN PDM_BI_Formula mst ON dtl.formula_id = mst.formula_id
WHERE WHERE
@@ -114,12 +120,36 @@
mater.material_type_id in 输入.classIds mater.material_type_id in 输入.classIds
ENDOPTION ENDOPTION
OPTION 输入.rf <> "" group by material_id
mater.material_type_id not in 输入.rf
union
SELECT
MAX(dtl.formuladtl_id) AS formuladtl_id,
class.class_id AS material_id,
MAX(class.class_name) AS material_name,
MAX(class.class_code) AS material_code,
group_concat(dtl.pcsn separator '+') AS pcsn,
group_concat(dtl.formula_qty separator '+') AS formula_qty,
(case when class.class_id = '1503644362192588800' then 1
when class.class_id = '1503644361664106496' then 2
when class.class_id = '1503644362788179968' then 4
when class.class_id = '1503644362234531840' then 5
else 3 end) AS order_no
FROM
PDM_BI_FormulaDtl dtl
LEFT JOIN md_pb_classstandard class ON class.class_id = dtl.material_id
LEFT JOIN PDM_BI_Formula mst ON dtl.formula_id = mst.formula_id
WHERE
mst.is_delete= '0'
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION ENDOPTION
group by mater.material_id group by material_id
order by mater.material_id order by order_no,material_code
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
@@ -129,9 +159,9 @@
QUERY QUERY
SELECT SELECT
dtl.formuladtl_id, dtl.formuladtl_id,
mater.material_id, mater.material_id AS material_id,
mater.material_name, mater.material_name AS material_name,
mater.material_code, mater.material_code AS material_code,
dtl.pcsn, dtl.pcsn,
dtl.formula_qty dtl.formula_qty
FROM FROM
@@ -145,7 +175,26 @@
dtl.formula_id = 输入.formula_id dtl.formula_id = 输入.formula_id
ENDOPTION ENDOPTION
order by mater.material_id union
SELECT
dtl.formuladtl_id,
class.class_id AS material_id,
class.class_name AS material_code,
class.class_code AS material_name,
dtl.pcsn,
dtl.formula_qty
FROM
PDM_BI_FormulaDtl dtl
LEFT JOIN md_pb_classstandard class ON class.class_id = dtl.material_id
WHERE
1=1
OPTION 输入.formula_id <> ""
dtl.formula_id = 输入.formula_id
ENDOPTION
order by material_id
ENDSELECT ENDSELECT