From 605be0c8702fc7bfe4f7fcdd397c9f0d40722b69 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 09 四月 2026 15:19:43 +0800
Subject: [PATCH] 1.商品档案新增最大限制和最小限制 2.mes空桶/余料回库修复
---
src/main/java/com/zy/asrs/entity/Mat.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bdd9654..c5b3db5 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -81,6 +81,21 @@
private String name;
/**
+ * 褰掗浂闃堝��
+ */
+ @ApiModelProperty(value= "褰掗浂闃堝��")
+ @ExcelProperty(value = "褰掗浂闃堝��")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ @ExcelProperty(value = "姣忓叕鏂ら暱搴�")
+ private Double volume;
+
+ /**
* 瑙勬牸
*/
@ApiModelProperty(value= "瑙勬牸")
@@ -173,13 +188,6 @@
@TableField("item_num")
private String itemNum;
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
- @TableField("safe_qty")
- private Double safeQty;
/**
* 閲嶉噺
@@ -199,13 +207,6 @@
@ApiModelProperty(value= "闀垮害")
@TableField("man_length")
private Double manLength;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- @ExcelProperty(value = "浣撶Н")
- private Double volume;
/**
* 涓夋柟缂栫爜
@@ -309,6 +310,7 @@
@ApiModelProperty("搴撲綅绫诲瀷")
@TableField("loc_type")
+ @ExcelProperty(value = "搴撲綅绫诲瀷")
private Long locType;
/**
@@ -321,12 +323,16 @@
/**
* 搴撳瓨棰勮鏁伴噺涓婇檺
*/
+ @ApiModelProperty(value= "搴撳瓨棰勮鏁伴噺涓婇檺")
+ @ExcelProperty(value = "搴撳瓨棰勮鏁伴噺涓婇檺")
@TableField("store_max")
private Double storeMax;
/**
* 搴撳瓨棰勮鏁伴噺涓嬮檺
*/
+ @ApiModelProperty(value= "搴撳瓨棰勮鏁伴噺涓嬮檺")
+ @ExcelProperty(value = "搴撳瓨棰勮鏁伴噺涓嬮檺")
@TableField("store_min")
private Double storeMin;
--
Gitblit v1.9.1