From 6b4cbc519b8037edea103206a2c614b5cd36b266 Mon Sep 17 00:00:00 2001
From: zengxiangping <318732054@qq.com>
Date: Wed, 13 Dec 2023 11:33:44 +0800
Subject: [PATCH] 波次明细增加仓库和库区字段
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfigDetail.java | 10 ++++++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/entity/ReceiptHeader.java | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfigDetail.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfigDetail.java
index 15e55e6..a17cc88 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfigDetail.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfigDetail.java
@@ -55,6 +55,16 @@ public class WaveConfigDetail implements Serializable {
@ApiModelProperty(value = "排序优先级")
private java.lang.Integer sortingPriority;
+ /** 仓库 */
+ @Excel(name = "仓库", width = 15)
+ @ApiModelProperty(value = "仓库")
+ private String warehouseCode;
+
+ /** 库区 */
+ @Excel(name = "库区", width = 15)
+ @ApiModelProperty(value = "库区")
+ private String zoneCode;
+
/** 创建人 */
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/entity/ReceiptHeader.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/entity/ReceiptHeader.java
index 2906c42..9bc4e71 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/entity/ReceiptHeader.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/entity/ReceiptHeader.java
@@ -89,7 +89,7 @@ public class ReceiptHeader implements Serializable {
/** 波次id */
@Excel(name = "波次id", width = 15)
@ApiModelProperty(value = "波次id")
- private String waveConfigId;
+ private Integer waveConfigId;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
@ApiModelProperty(value = "备用字段1")
--
libgit2 0.22.2