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/LswMaterialInbound.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java
index 1b7f50c..57edc9a 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.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;
/**
@@ -55,13 +57,21 @@
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
+ @Excel(name = "鏉ユ簮缂栫爜", width = 15)
+ @ApiModelProperty(value = "鏉ユ簮缂栫爜")
+ private String originalCode;
+ @Excel(name = "鏉ユ簮鍚嶇О", width = 15)
+ @ApiModelProperty(value = "鏉ユ簮鍚嶇О")
+ private String originalName;
/**浜х嚎ID*/
@Excel(name = "浜х嚎ID", width = 15)
@ApiModelProperty(value = "浜х嚎ID")
+ @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
private String factoryId;
/**搴撳瓨鍦癐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)
@@ -78,10 +88,16 @@
/**鍏ュ簱鏁伴噺*/
@Excel(name = "鍏ュ簱鏁伴噺", width = 15)
@ApiModelProperty(value = "鍏ュ簱鏁伴噺")
- private Integer quantity;
+ private BigDecimal quantity;
+ /**鍏ュ簱绫诲瀷*/
+ @Excel(name = "鍏ュ簱绫诲瀷", width = 15)
+ @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+ @Dict(dicCode = "material_inbound_category")
+ private String inboundCategory;
/**鎺ユ敹浜�*/
@Excel(name = "鎺ユ敹浜�", width = 15)
@ApiModelProperty(value = "鎺ユ敹浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String receiver;
/**鎺ユ敹鏃堕棿*/
@Excel(name = "鎺ユ敹鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3