From f95d05316d49bcdd31d022a11d0fc4fbafb040da Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 08 九月 2025 11:40:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
index 9130b9c..8463068 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
@@ -68,7 +68,6 @@
/**浜х嚎ID*/
@Excel(name = "浜х嚎ID", width = 15)
@ApiModelProperty(value = "浜х嚎ID")
- @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
private String factoryId;
/**搴撳瓨ID*/
@Excel(name = "搴撳瓨ID", width = 15)
@@ -77,6 +76,7 @@
/**绾胯竟搴揑D*/
@Excel(name = "绾胯竟搴揑D", width = 15)
@ApiModelProperty(value = "绾胯竟搴揑D")
+ @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
private String warehouseId;
/**鎵规鍙�*/
@Excel(name = "鎵规鍙�", width = 15)
@@ -85,6 +85,7 @@
/**鍑哄簱浜�*/
@Excel(name = "鍑哄簱浜�", width = 15)
@ApiModelProperty(value = "鍑哄簱浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String outboundStaff;
/**鍑哄簱鏃堕棿*/
@Excel(name = "鍑哄簱鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -96,4 +97,9 @@
@Excel(name = "鍑哄簱鏁伴噺", width = 15)
@ApiModelProperty(value = "鍑哄簱鏁伴噺")
private BigDecimal quantity;
+ /**鍑哄簱绫诲瀷*/
+ @Excel(name = "鍑哄簱绫诲瀷", width = 15)
+ @ApiModelProperty(value = "鍑哄簱绫诲瀷")
+ @Dict(dicCode = "material_outbound_category")
+ private String outboundCategory;
}
--
Gitblit v1.9.3