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

rev:配粉开单时，软废库存选择根据产品对应PG粉维护的库存等级去选择

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-07-18 16:15:37 +08:00
parent 84e4ce7af3
commit 3e59139e0c
2 changed files with 2098 additions and 1887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3786
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

199
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
View File

@@ -21,6 +21,7 @@
输入.material_code TYPEAS s_string
输入.is_need_manage TYPEAS s_string
输入.formingtype_id TYPEAS s_string
输入.product_material_id TYPEAS s_string
输入.item_material_id TYPEAS s_string
输入.is_active TYPEAS s_string
输入.workorder_id TYPEAS s_string
@@ -29,6 +30,7 @@
输入.is_pure TYPEAS s_string
输入.set_type TYPEAS s_string
输入.set_material_id TYPEAS s_string
输入.set_prior_level TYPEAS s_string
输入.material_type_id TYPEAS f_string
输入.mater_ids TYPEAS f_string
@@ -197,6 +199,9 @@
OPTION 输入.prior_level <> ""
structivt.ivt_level <= 输入.prior_level
ENDOPTION
OPTION 输入.set_prior_level <> ""
structivt.ivt_level = 输入.set_prior_level
ENDOPTION
OPTION 输入.is_pure <> ""
stockmaterialext.is_pure = 输入.is_pure
ENDOPTION
@@ -205,6 +210,102 @@
ENDQUERY
ENDIF
IF 输入.flag = "23"
QUERY
SELECT
structivt.*,
mb.material_name,
mb.material_code,
mb.material_type_id,
stockmaterialext.is_need_move,
CASE
WHEN FormulaDtl3.used__qty > 0 THEN
structivt.sum_qty - FormulaDtl3.used__qty ELSE structivt.sum_qty
END AS sum_ivt_qty
FROM
(
SELECT
SUM( ivt.canuse_qty ) AS sum_qty,
ivt.qty_unit_id,
ivt.qty_unit_name,
ivt.material_id,
ivt.pcsn,
ivt.is_active,
ivt.ivt_level,
ivt.quality_scode
FROM
st_ivt_structivt ivt
INNER JOIN (
SELECT * FROM md_pd_productmaterialset ms WHERE ms.material_id = 输入.product_material_id AND ms.set_type = 输入.set_type
) a ON ivt.material_id = a.set_material_id AND ivt.ivt_level = a.set_prior_level
GROUP BY
ivt.material_id,
ivt.pcsn,
ivt.is_active,
ivt.ivt_level,
ivt.quality_scode,
ivt.qty_unit_id,
ivt.qty_unit_name
) structivt
LEFT JOIN md_me_materialbase mb ON mb.material_id = structivt.material_id
LEFT JOIN md_me_stockmaterialext stockmaterialext ON mb.material_id = stockmaterialext.material_id
LEFT JOIN (
SELECT
SUM( FormulaDtl2.formula_qty - FormulaDtl2.put_qty ) AS used__qty,
FormulaDtl2.material_id,
FormulaDtl2.pcsn,
FormulaDtl2.is_active,
FormulaDtl2.ivt_level,
FormulaDtl2.quality_scode
FROM
PDM_BI_FormulaDtl FormulaDtl2
LEFT JOIN PDM_BI_Formula Formula2 ON FormulaDtl2.formula_id = Formula2.formula_id
WHERE
1 = 1
AND FormulaDtl2.STATUS <> '99'
OPTION 输入.workorder_id <> ""
Formula2.workorder_id <> 输入.workorder_id
ENDOPTION
GROUP BY
FormulaDtl2.material_id,
FormulaDtl2.pcsn,
FormulaDtl2.is_active,
FormulaDtl2.ivt_level,
FormulaDtl2.quality_scode
) FormulaDtl3 ON (
FormulaDtl3.material_id = structivt.material_id
AND FormulaDtl3.pcsn = structivt.pcsn
AND FormulaDtl3.is_active = structivt.is_active
AND FormulaDtl3.ivt_level = structivt.ivt_level
AND FormulaDtl3.quality_scode = structivt.quality_scode
)
WHERE
1 = 1
AND structivt.sum_qty > 0
OPTION 输入.material_id <> ""
structivt.material_id = 输入.material_id
ENDOPTION
OPTION 输入.mater_ids <> ""
structivt.material_id in 输入.mater_ids
ENDOPTION
OPTION 输入.is_active <> ""
structivt.is_active = 输入.is_active
ENDOPTION
OPTION 输入.quality_scode <> ""
structivt.quality_scode = 输入.quality_scode
ENDOPTION
OPTION 输入.prior_level <> ""
structivt.ivt_level <= 输入.prior_level
ENDOPTION
OPTION 输入.is_pure <> ""
stockmaterialext.is_pure = 输入.is_pure
ENDOPTION
ORDER BY structivt.material_id,structivt.ivt_level desc, structivt.pcsn, structivt.sum_qty desc
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "3"
QUERY
SELECT
@@ -477,6 +578,9 @@
OPTION 输入.prior_level <> ""
structivt.ivt_level <= 输入.prior_level
ENDOPTION
OPTION 输入.set_prior_level <> ""
structivt.ivt_level = 输入.set_prior_level
ENDOPTION
OPTION 输入.is_pure <> ""
stockmaterialext.is_pure = 输入.is_pure
ENDOPTION
@@ -485,3 +589,98 @@
ENDQUERY
ENDIF
IF 输入.flag = "92"
QUERY
SELECT
structivt.*,
mb.material_name,
mb.material_code,
mb.material_type_id,
stockmaterialext.is_need_move,
CASE
WHEN FormulaDtl3.used__qty > 0 THEN
structivt.sum_qty - FormulaDtl3.used__qty ELSE structivt.sum_qty
END AS sum_ivt_qty
FROM
(
SELECT
SUM( ivt.canuse_qty ) AS sum_qty,
ivt.qty_unit_id,
ivt.qty_unit_name,
ivt.material_id,
ivt.pcsn,
ivt.is_active,
ivt.ivt_level,
ivt.quality_scode
FROM
st_ivt_structivt ivt
INNER JOIN (
SELECT * FROM md_pd_productmaterialset ms WHERE ms.material_id = 输入.product_material_id AND ms.set_type = 输入.set_type
) a ON ivt.material_id = a.set_material_id AND ivt.ivt_level = a.set_prior_level
GROUP BY
ivt.material_id,
ivt.pcsn,
ivt.is_active,
ivt.ivt_level,
ivt.quality_scode,
ivt.qty_unit_id,
ivt.qty_unit_name
) structivt
LEFT JOIN md_me_materialbase mb ON mb.material_id = structivt.material_id
LEFT JOIN md_me_stockmaterialext stockmaterialext ON mb.material_id = stockmaterialext.material_id
LEFT JOIN (
SELECT
SUM( FormulaDtl2.formula_qty - FormulaDtl2.put_qty ) AS used__qty,
FormulaDtl2.material_id,
FormulaDtl2.pcsn,
FormulaDtl2.is_active,
FormulaDtl2.ivt_level,
FormulaDtl2.quality_scode
FROM
PDM_BI_FormulaDtl FormulaDtl2
LEFT JOIN PDM_BI_Formula Formula2 ON FormulaDtl2.formula_id = Formula2.formula_id
WHERE
1 = 1
AND FormulaDtl2.STATUS <> '99'
OPTION 输入.workorder_id <> ""
Formula2.workorder_id <> 输入.workorder_id
ENDOPTION
GROUP BY
FormulaDtl2.material_id,
FormulaDtl2.pcsn,
FormulaDtl2.is_active,
FormulaDtl2.ivt_level,
FormulaDtl2.quality_scode
) FormulaDtl3 ON (
FormulaDtl3.material_id = structivt.material_id
AND FormulaDtl3.pcsn = structivt.pcsn
AND FormulaDtl3.is_active = structivt.is_active
AND FormulaDtl3.ivt_level = structivt.ivt_level
AND FormulaDtl3.quality_scode = structivt.quality_scode
)
WHERE
1 = 1
AND structivt.sum_qty > 0
OPTION 输入.material_id <> ""
structivt.material_id = 输入.material_id
ENDOPTION
OPTION 输入.mater_ids <> ""
structivt.material_id in 输入.mater_ids
ENDOPTION
OPTION 输入.is_active <> ""
structivt.is_active = 输入.is_active
ENDOPTION
OPTION 输入.quality_scode <> ""
structivt.quality_scode = 输入.quality_scode
ENDOPTION
OPTION 输入.prior_level <> ""
structivt.ivt_level <= 输入.prior_level
ENDOPTION
OPTION 输入.is_pure <> ""
stockmaterialext.is_pure = 输入.is_pure
ENDOPTION
ORDER BY structivt.material_id,structivt.ivt_level desc, sum_ivt_qty
ENDSELECT
ENDQUERY
ENDIF