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/LswMaterialInventory.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 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..1dac62c 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
@@ -1,7 +1,6 @@
package org.jeecg.modules.lsw.entity;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -13,7 +12,6 @@
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -42,14 +40,6 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private Date updateTime;
/**鐗╂枡ID*/
@ApiModelProperty(value = "鐗╂枡ID")
private String materialId;
@@ -60,32 +50,36 @@
/**搴撳瓨绫诲瀷*/
@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;
public LswMaterialInventory(){}
- public LswMaterialInventory(LswMaterialInbound inbound, String materialId, String inventoryCategory) {
+ public LswMaterialInventory(LswMaterialInbound inbound, String materialId, String inventoryCategory, String heatTreatmentFlag) {
this.warehouseId = inbound.getWarehouseId();
this.quantity = inbound.getQuantity();
this.batchNumber = inbound.getBatchNumber();
this.inventoryStatus = MaterialInventoryStatusEnum.NORMAL.name();
this.inventoryCategory = inventoryCategory;
this.materialId = materialId;
+ this.heatTreatmentFlag = heatTreatmentFlag;
}
}
--
Gitblit v1.9.3