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 | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 9724b77..8463068 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
@@ -10,10 +10,12 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -30,7 +32,7 @@
public class LswMaterialOutbound implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭*/
+ /**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
private String id;
@@ -67,6 +69,15 @@
@Excel(name = "浜х嚎ID", width = 15)
@ApiModelProperty(value = "浜х嚎ID")
private String factoryId;
+ /**搴撳瓨ID*/
+ @Excel(name = "搴撳瓨ID", width = 15)
+ @ApiModelProperty(value = "搴撳瓨ID")
+ private String inventoryId;
+ /**绾胯竟搴揑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)
@ApiModelProperty(value = "鎵规鍙�")
@@ -74,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")
@@ -84,9 +96,10 @@
/**鍑哄簱鏁伴噺*/
@Excel(name = "鍑哄簱鏁伴噺", width = 15)
@ApiModelProperty(value = "鍑哄簱鏁伴噺")
- private String quantity;
- /**宸ュ崟ID*/
- @Excel(name = "宸ュ崟ID", width = 15)
- @ApiModelProperty(value = "宸ュ崟ID")
- private String workOrderId;
+ private BigDecimal quantity;
+ /**鍑哄簱绫诲瀷*/
+ @Excel(name = "鍑哄簱绫诲瀷", width = 15)
+ @ApiModelProperty(value = "鍑哄簱绫诲瀷")
+ @Dict(dicCode = "material_outbound_category")
+ private String outboundCategory;
}
--
Gitblit v1.9.3