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/base/entity/LineSideWarehouse.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java b/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java
index da8196d..da727ba 100644
--- a/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java
+++ b/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java
@@ -1,22 +1,22 @@
package org.jeecg.modules.base.entity;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* @Description: 绾胯竟浠撳簱淇℃伅
@@ -56,7 +56,7 @@
@Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
- private Integer delFlag;
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**浠撳簱缂栫爜*/
@Excel(name = "浠撳簱缂栫爜", width = 15)
@ApiModelProperty(value = "浠撳簱缂栫爜")
@@ -65,8 +65,13 @@
@Excel(name = "浠撳簱鍚嶇О", width = 15)
@ApiModelProperty(value = "浠撳簱鍚嶇О")
private String warehouseName;
+ /**浠撳簱鐘舵��*/
+ @Excel(name = "浠撳簱鐘舵��", width = 15)
+ @ApiModelProperty(value = "浠撳簱鐘舵��")
+ private String warehouseStatus;
/**宸ュ巶/浜х嚎ID*/
@Excel(name = "宸ュ巶/浜х嚎ID", width = 15)
@ApiModelProperty(value = "宸ュ巶/浜х嚎ID")
+ @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
private String factoryId;
}
--
Gitblit v1.9.3