diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java index d65fd1bd..1a15a9e8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java @@ -214,6 +214,7 @@ public class InitformulaServiceImpl implements InitformulaService { }else{ jo.put("seqno","0"); } + jo.put("is_need_manage","1"); ja.add(jo); } if(ja!=null){ @@ -315,6 +316,12 @@ public class InitformulaServiceImpl implements InitformulaService { jo.put("formula_code",formula_code); jo.put("seq_no",(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"))){ jo.put("is_need_manage","0"); } @@ -412,6 +419,12 @@ public class InitformulaServiceImpl implements InitformulaService { jo.put("formula_code",formula_code2); jo.put("seq_no",(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"))){ jo.put("is_need_manage","0"); } @@ -587,6 +600,12 @@ public class InitformulaServiceImpl implements InitformulaService { jo.put("formula_code",formula_code); jo.put("seq_no",(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"))){ jo.put("is_need_manage","0"); } @@ -685,6 +704,12 @@ public class InitformulaServiceImpl implements InitformulaService { jo.put("formula_code",formula_code2); jo.put("seq_no",(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"))){ jo.put("is_need_manage","0"); } diff --git a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue index daebbf12..baf34992 100644 --- a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue +++ b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue @@ -753,6 +753,7 @@ export default { } }, queryTableDtl4(rows) { + debugger const tablemap = new Map() rows.forEach((item) => { if (this.tableDtl.length !== 0) {