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

修改bug

Browse Source
This commit is contained in:
zds
2022-07-03 18:07:05 +08:00
parent 48bdf86c89
commit 979fa4aec7
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,6 +214,7 @@ public class InitformulaServiceImpl implements InitformulaService {
}else{ }else{
jo.put("seqno","0"); jo.put("seqno","0");
} }
jo.put("is_need_manage","1");
ja.add(jo); ja.add(jo);
} }
if(ja!=null){ if(ja!=null){
@@ -315,6 +316,12 @@ public class InitformulaServiceImpl implements InitformulaService {
jo.put("formula_code",formula_code); jo.put("formula_code",formula_code);
jo.put("seq_no",(mn)+""); jo.put("seq_no",(mn)+"");
mn++; mn++;
if(!jo.containsKey("is_need_manage")){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"缺少is_need_manage！");
}
if(!jo.containsKey("is_need_move")){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"缺少is_need_move！");
}
if("".equals(jo.getString("is_need_manage"))){ if("".equals(jo.getString("is_need_manage"))){
jo.put("is_need_manage","0"); jo.put("is_need_manage","0");
} }
@@ -412,6 +419,12 @@ public class InitformulaServiceImpl implements InitformulaService {
jo.put("formula_code",formula_code2); jo.put("formula_code",formula_code2);
jo.put("seq_no",(mm)+""); jo.put("seq_no",(mm)+"");
mm++; mm++;
if(!jo.containsKey("is_need_manage")){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"缺少is_need_manage！");
}
if(!jo.containsKey("is_need_move")){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"缺少is_need_move！");
}
if("".equals(jo.getString("is_need_manage"))){ if("".equals(jo.getString("is_need_manage"))){
jo.put("is_need_manage","0"); jo.put("is_need_manage","0");
} }
@@ -587,6 +600,12 @@ public class InitformulaServiceImpl implements InitformulaService {
jo.put("formula_code",formula_code); jo.put("formula_code",formula_code);
jo.put("seq_no",(nn)+""); jo.put("seq_no",(nn)+"");
nn++; nn++;
if(!jo.containsKey("is_need_manage")){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"缺少is_need_manage！");
}
if(!jo.containsKey("is_need_move")){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"缺少is_need_move！");
}
if("".equals(jo.getString("is_need_manage"))){ if("".equals(jo.getString("is_need_manage"))){
jo.put("is_need_manage","0"); jo.put("is_need_manage","0");
} }
@@ -685,6 +704,12 @@ public class InitformulaServiceImpl implements InitformulaService {
jo.put("formula_code",formula_code2); jo.put("formula_code",formula_code2);
jo.put("seq_no",(num)+""); jo.put("seq_no",(num)+"");
num++; num++;
if(!jo.containsKey("is_need_manage")){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"缺少is_need_manage！");
}
if(!jo.containsKey("is_need_move")){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"缺少is_need_move！");
}
if("".equals(jo.getString("is_need_manage"))){ if("".equals(jo.getString("is_need_manage"))){
jo.put("is_need_manage","0"); jo.put("is_need_manage","0");
} }

1
mes/qd/src/views/wms/pf/initformula/DivDialog.vue
View File

@@ -753,6 +753,7 @@ export default {
} }
}, },
queryTableDtl4(rows) { queryTableDtl4(rows) {
debugger
const tablemap = new Map() const tablemap = new Map()
rows.forEach((item) => { rows.forEach((item) => {
if (this.tableDtl.length !== 0) { if (this.tableDtl.length !== 0) {