From 1621b79516ac72b9933dd2ea950fe4e267d8a3a7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 05 十二月 2023 20:03:41 +0800
Subject: [PATCH] bug修复 1.四项库入库时找到在库库位 2.四项库订单出库时没有匹配容器码导致报错 3.四项库转历史档失败

---
 src/main/java/com/zy/asrs/utils/MatExcelListener.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index e2e7ebd..6f29fc9 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.core.exception.CoolException;
@@ -132,9 +133,14 @@
             mat = excel;
             mat.setTagId(tagId);
             if (!matService.insert(mat)) {
-                throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽崟鎹彿锛�" + excel.getMatnr());
+                throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛岀墿鏂欏彿锛�" + excel.getMatnr());
             }
             total++;
+        }else {
+            mat = excel;
+            mat.setTagId(tagId);
+            matService.update(mat,new EntityWrapper<Mat>().eq("matnr",mat.getMatnr()));
+            total++;
         }
     }
 

--
Gitblit v1.9.1