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

修改自动开单（新料、改配）加库存等级查询、排序

Browse Source
This commit is contained in:
zds
2022-06-30 12:25:01 +08:00
parent 5b73689fdd
commit ae3b341488
3 changed files with 207 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,12 +464,17 @@ public class AutoformulaServiceImpl implements AutoformulaService {
String is_need_move = bomdlt.getString("is_need_move");
String bomdtl_material_id = bomdlt.getString("material_id");
String bomdtl_material_code = bomdlt.getString("material_code");
String prior_level = bomdlt.getString("prior_level");
if (StrUtil.isEmpty(prior_level)) {
prior_level = "03";
}
if("1".equals(is_need_move)){
//查询库存
JSONArray bom_materials = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",bomdtl_material_id)
.addParam("workorder_id",workorder_id)
.addParam("quality_scode","01")
.addParam("prior_level",prior_level)
.addParam("flag","22")
.process().getResultJSONArray(0);
if(bom_materials.size()==0){
@@ -1308,12 +1313,17 @@ public class AutoformulaServiceImpl implements AutoformulaService {
}
String is_need_move = bomdlt.getString("is_need_move");
String bomdtl_material_id = bomdlt.getString("material_id");
String prior_level = bomdlt.getString("prior_level");
if (StrUtil.isEmpty(prior_level)) {
prior_level = "03";
}
if(nedd_qty>0 && "1".equals(is_need_move)){
//查询库存
JSONArray bom_materials = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",bomdtl_material_id)
.addParam("quality_scode","01")
.addParam("workorder_id",workorder_id)
.addParam("prior_level",prior_level)
.addParam("flag","22")
.process().getResultJSONArray(0);
if(bom_materials.size()==0){
@@ -2525,9 +2535,14 @@ public class AutoformulaServiceImpl implements AutoformulaService {
//获取Y1、X1、X2….剩余>0的物料
if(left_qty>0){
if(is_need_move.equals("1")){
String prior_level = bomdlt.getString("prior_level");
if (StrUtil.isEmpty(prior_level)) {
prior_level = "03";
}
JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",bomdtl_material_id)
.addParam("quality_scode","01")
.addParam("prior_level",prior_level)
.addParam("workorder_id",workorder_id)
.addParam("flag","22")
.process().getResultJSONArray(0);
@@ -3426,11 +3441,16 @@ public class AutoformulaServiceImpl implements AutoformulaService {
String bomdtl_material_id = bomdlts_plan.getString("material_id");
double left_qty = bomdlts_plan.getDouble("formula_qty");
String is_need_move = bomdlts_plan.getString("is_need_move");
String prior_level = bomdlts_plan.getString("prior_level");
if (StrUtil.isEmpty(prior_level)) {
prior_level = "03";
}
if(is_need_move.equals("1")){
//二次分配新料库存
JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",bomdtl_material_id)
.addParam("quality_scode","01")
.addParam("prior_level",prior_level)
.addParam("workorder_id",workorder_id)
.addParam("flag","22")
.process().getResultJSONArray(0);

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

@@ -15,6 +15,7 @@
#################################################
输入.flag TYPEAS s_string
输入.quality_scode TYPEAS s_string
输入.prior_level TYPEAS s_string
输入.material_id TYPEAS s_string
输入.material_code TYPEAS s_string
输入.is_need_manage TYPEAS s_string
@@ -186,10 +187,13 @@
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.pcsn, structivt.sum_qty desc
ORDER BY structivt.material_id,structivt.ivt_level desc,structivt.pcsn, structivt.sum_qty desc
ENDSELECT
ENDQUERY
ENDIF