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 @@
+
+
+
+
+
@@ -217,6 +222,7 @@
+
@@ -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,