From b29a1cb6fbca3cf8cf1d307c4c519ae2047c9b18 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 04 九月 2025 15:43:13 +0800
Subject: [PATCH] art: 物料台账-相关接口修改

---
 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
index 73d6730..3d2a8ba 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
@@ -60,22 +60,21 @@
 	/**搴撳瓨绫诲瀷*/
 	@Excel(name = "搴撳瓨绫诲瀷", width = 15)
     @ApiModelProperty(value = "搴撳瓨绫诲瀷")
+    @Dict(dicCode = "material_inventory_category")
     private String inventoryCategory;
 	/**鏁伴噺*/
 	@Excel(name = "鏁伴噺", width = 15)
     @ApiModelProperty(value = "鏁伴噺")
     private BigDecimal quantity;
 	/**搴撳瓨鍦癐D*/
-	@Excel(name = "搴撳瓨鍦癐D", width = 15)
+	@Excel(name = "搴撳瓨鍦�", width = 15)
     @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
-    @ApiModelProperty(value = "搴撳瓨鍦癐D")
-    private String warehouseId;
-    @TableField(exist = false)
     @ApiModelProperty(value = "搴撳瓨鍦�")
-    private String warehouseName;
+    private String warehouseId;
 	/**搴撳瓨鐘舵��*/
 	@Excel(name = "搴撳瓨鐘舵��", width = 15)
     @ApiModelProperty(value = "搴撳瓨鐘舵��")
+    @Dict(dicCode = "material_inventory_status")
     private String inventoryStatus;
 
     public LswMaterialInventory(){}

--
Gitblit v1.9.3