From d4c1f85f8cf88882c6512c97819e0c6f10bcdfaa Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 10 Dec 2024 00:07:58 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form_data/service/impl/PmFormDataServiceImpl.java |  8 +++++---
 .../qd/src/views/wms/pm_manage/form_data/index.vue    | 11 ++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
index a6991f3f..52f0c1a7 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
@@ -195,9 +195,11 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
                     String productArea = dataDto.getForm_data().getString("product_area");
                     dataDto.setProduct_area(productArea);
                     List<PmFormDataDto> children = childMap.get(dataDto.getId());
-                    for (PmFormDataDto child : children) {
-                        String childProductArea = child.getForm_data().getString("product_area");
-                        child.setProduct_area(childProductArea);
+                    if (children!=null){
+                        for (PmFormDataDto child : children) {
+                            String childProductArea = child.getForm_data().getString("product_area");
+                            child.setProduct_area(childProductArea);
+                        }
                     }
                     dataDto.setChildren(children);
                 }
diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
index 1cb892ee..cbd8ecbf 100644
--- a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
+++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
@@ -28,6 +28,15 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="单据编码">
+            <el-input
+              v-model="query.code"
+              clearable
+              size="mini"
+              placeholder="编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="单据状态">
             <el-select
               v-model="query.status"
@@ -198,7 +207,7 @@ export default {
   dicts: ['base_data'],
   components: { pagination, crudOperation, rrOperation, udOperation, ViewDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  statusEnums: [ 'FORM_STATUS' ],
+  statusEnums: ['FORM_STATUS'],
   cruds() {
     return CRUD({
       title: '表单数据',