From 979fa4aec75a28457c247bc2c93d1d36b5ab7fec Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Sun, 3 Jul 2022 18:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InitformulaServiceImpl.java  | 25 +++++++++++++++++++
 .../views/wms/pf/initformula/DivDialog.vue    |  1 +
 2 files changed, 26 insertions(+)

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) {