From cae7d8f5f0896ba3af20ff18b7c3f143b59d801c Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 27 Nov 2024 10:17:46 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0bar=5Fcode=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/domain/constant/DictConstantPool.java   |  1 +
 .../form_struc/service/dao/BmFormStruc.java        |  4 ++++
 .../form_struc/service/dto/BmFormStrucDto.java     | 14 ++++++++++++++
 .../form_data/service/dao/PmFormData.java          |  5 +++++
 .../views/wms/config_manage/formStruc/index.vue    |  7 +++++++
 5 files changed, 31 insertions(+)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
index 00c44838..55e7ec56 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
@@ -27,6 +27,7 @@ public class DictConstantPool {
             ,"qty","申请数量"
             ,"plan_qty","计划数量"
             ,"assign_qty","已领数量"
+            ,"bar_code","条码"
             ,"unit_id","单位"
             ,"pcsn","批次"
             ,"vehicle_code","载具");
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
index dcc697a1..1f8e6c39 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
@@ -143,6 +143,10 @@ public class BmFormStruc implements Serializable {
      * 是否属于基础表单
      */
     private Boolean is_base;
+    /**
+     * 条码
+     */
+    private String bar_code;
 
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java
index 56db6007..02f4d005 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java
@@ -97,6 +97,16 @@ public class BmFormStrucDto implements Serializable {
      */
     private String qty;
 
+    /**
+     * 计划数量
+     */
+    private String plan_qty;
+
+    /**
+     * 已领取数量
+     */
+    private String assign_qty;
+
     /**
      * 单位id
      */
@@ -121,6 +131,10 @@ public class BmFormStrucDto implements Serializable {
      * 是否为基础表
      */
     private Boolean is_base;
+    /**
+     * 是否为基础表
+     */
+    private String bar_code;
     /**
      * 表单自动映射
      */
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
index a3742dd6..c8ed628b 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
@@ -142,6 +142,11 @@ public class PmFormData implements Serializable {
      */
     private String remark;
 
+    /**
+     * 条码
+     */
+    private String bar_code;
+
 
 
 }
diff --git a/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue b/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
index f01ad5fe..5ba4f902 100644
--- a/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
+++ b/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
@@ -177,6 +177,11 @@
                 <el-input v-model="form.vehicle_code" style="width: 150px;" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="条码" prop="bar_code">
+                <el-input v-model="form.bar_code" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-form-item label="自定义字段" prop="form_param">
             <el-input v-model="form.form_param" type="textarea" :formatter="jsonFormat" style="width: 430px;" />
@@ -217,6 +222,7 @@
         <el-table-column prop="assign_qty" show-overflow-tooltip width="120" label="已分配数量" />
         <el-table-column prop="pcsn" show-overflow-tooltip width="120" label="批次" />
         <el-table-column prop="vehicle_code" show-overflow-tooltip width="120" label="载具编号" />
+        <el-table-column prop="bar_code" show-overflow-tooltip width="120" label="条码" />
         <el-table-column prop="form_param" show-overflow-tooltip width="120" :formatter="jsonFormat" label="自定义字段映射" />
         <el-table-column prop="update_time" show-overflow-tooltip width="150" label="更新时间" />
         <el-table-column prop="update_name" show-overflow-tooltip width="150" label="更新人" />
@@ -271,6 +277,7 @@ const defaultForm = {
   qty: null,
   plan_qty: null,
   assign_qty: null,
+  bar_code: null,
   pcsn: null,
   vehicle_code: null,
   form_param: null,