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/common/entity/MatExcel.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/entity/MatExcel.java b/src/main/java/com/zy/common/entity/MatExcel.java
index 640c0de..8a5ccea 100644
--- a/src/main/java/com/zy/common/entity/MatExcel.java
+++ b/src/main/java/com/zy/common/entity/MatExcel.java
@@ -2,17 +2,11 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.zy.asrs.entity.Mat;
import lombok.Data;
-/**
- * 0.A 1.B 2.C 3.D 4.E 5.F 6.G 7.H 8.I
- * 9.J 10.K 11.L 12.M 13.N 14.O 15.P 16.Q 17.R 18.S
- * 19.T 20.U 21.V 22.W 23.X 24.Y 25.Z
- */
@Data
@ExcelIgnoreUnannotated
-public class MatExcel extends Mat {
+public class MatExcel {
@ExcelProperty(index = 0, value = "涓�绾у垎绫�")
private String priClass;
@@ -20,4 +14,21 @@
@ExcelProperty(index = 1, value = "浜岀骇鍒嗙被")
private String secClass;
+ @ExcelProperty(index = 2, value = "鍟嗗搧缂栫爜")
+ private String matnr;
+
+ @ExcelProperty(index = 3, value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ @ExcelProperty(index = 4, value = "褰掗浂闃�鍊�")
+ private Double safeQty;
+
+ @ExcelProperty(index = 5, value = "姣忓叕鏂ら暱搴�")
+ private Double volume;
+
+ @ExcelProperty(index = 6, value = "搴撳瓨棰勮鏁伴噺涓婇檺")
+ private Double storeMax;
+
+ @ExcelProperty(index = 7, value = "搴撳瓨棰勮鏁伴噺涓嬮檺")
+ private Double storeMin;
}
--
Gitblit v1.9.1