From b1612c81901953cda4c9c6f682f3c454d52abe09 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 18:06:55 +0800
Subject: [PATCH] art: 物料出库
---
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 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 2e7e017..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;
@@ -9,12 +8,10 @@
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;
-import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -43,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;
@@ -80,16 +69,17 @@
/**鐑鐞嗘爣璇�*/
@Excel(name = "鐑鐞嗘爣璇�", width = 15)
@ApiModelProperty(value = "鐑鐞嗘爣璇�")
- private String heatTreatmentFlag = CommonConstant.STATUS_0;
+ 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