From 34580ceb745eaeaf6f8a6188a779c0746a23b02d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 04 九月 2025 23:18:33 +0800
Subject: [PATCH] art: 热处理入库相关接口

---
 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java |   14 +++++++++-----
 1 files changed, 9 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..2e7e017 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
@@ -9,6 +9,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -60,23 +61,26 @@
 	/**搴撳瓨绫诲瀷*/
 	@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;
+    /**鐑鐞嗘爣璇�*/
+    @Excel(name = "鐑鐞嗘爣璇�", width = 15)
+    @ApiModelProperty(value = "鐑鐞嗘爣璇�")
+    private String heatTreatmentFlag = CommonConstant.STATUS_0;
 
     public LswMaterialInventory(){}
 

--
Gitblit v1.9.3