From cd1798c22fc33a998b7fa7c709a51d1bf0332d25 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 27 Nov 2024 11:16:42 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=90=88=E6=A0=BC?=
=?UTF-8?q?=E8=AF=81=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD=E3=80=82?=
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 ++++++++++++++
.../pda_manage/iostorage/sevice/PdaIOService.java | 4 ++--
.../form_data/service/dao/PmFormData.java | 10 ++++++++--
.../views/wms/config_manage/formStruc/index.vue | 7 +++++++
6 files changed, 36 insertions(+), 4 deletions(-)
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/pda_manage/iostorage/sevice/PdaIOService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java
index b72efd96..a49a2c5a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java
@@ -125,7 +125,7 @@ public class PdaIOService {
public PmFormData getCertificateInfo(String id) {
PmFormData result = new PmFormData();
try {
- if (id.contains("OP")) {
+ if (id.contains("OP")||id.contains("op")) {
getOpBills(id, result);
} else {
@@ -164,7 +164,7 @@ public class PdaIOService {
result.setOwnerId(dataList.get(7).toString());
result.setPcsn(dataList.get(8).toString());
result.setProduct_area(dataList.get(9).toString());
- result.setStockInOrgId(dataList.get(10).toString());
+ //result.setStockId(dataList.get(10).toString());
}
}
}
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 f16e1fcf..9ee3ee5a 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
@@ -178,10 +178,16 @@ public class PmFormData implements Serializable {
private String product_area;
/**
- * 生产车间
+ * ERP仓库
*/
@TableField(exist = false)
- private String stockInOrgId;
+ private String stockId;
+
+ /**
+ * 条码
+ */
+ 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,