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/utils/MatExcelListener.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index cd399be..ad11586 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -126,14 +126,20 @@
         // 鍟嗗搧
         Mat mat = matService.selectByMatnr(excel.getMatnr());
         if (mat == null) {
-            mat = excel;
+            mat = new Mat();
+            mat.setMatnr(excel.getMatnr());
+            mat.setMaktx(excel.getMaktx());
+            mat.setSafeQty(excel.getSafeQty());
+            mat.setVolume(excel.getVolume());
+            mat.setStoreMax(excel.getStoreMax());
+            mat.setStoreMin(excel.getStoreMin());
             mat.setTagId(tagId);
             mat.setLocType(tagId);
             if (Objects.isNull(mat.getVolume())) {
                 throw new CoolException("姣忓叕鏂ら暱搴︿笉鑳戒负绌猴紒锛�");
             }
             if (Objects.isNull(mat.getSafeQty())) {
-                throw new CoolException("褰掗浂闃�鍊间笉鑳戒负绌猴紒锛�");
+                throw new CoolException("褰掗浂闃堝�间笉鑳戒负绌猴紒锛�");
             }
             if (!matService.insert(mat)) {
                 throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());

--
Gitblit v1.9.1