From 62126525bcccf7b6b3800c7848f7910abfa61252 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 04 八月 2025 15:05:22 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java b/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
index c052675..dff9c0c 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
@@ -96,9 +96,6 @@
 
             reviewService.insert(review);
             review = reviewService.selectOne(new EntityWrapper<Review>().eq("order_no", data.getColumn1()));
-        }else {
-            log.info("宸插瓨鍦ㄨ璁㈠崟锛歿}锛�", data.getColumn1());
-            throw new CoolException("璁㈠崟宸插瓨鍦紒");
         }
         data.setOrderId(review.getId());
         list.add(data);
@@ -133,8 +130,11 @@
 
         List<ReviewDetl> orderDetlList = new ArrayList<>();
         for (ImportReviewDto importOrderDto : list) {
+            List<ReviewDetl> reviewDetls = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>().eq("specs", importOrderDto.getColumn4()).eq("anfme", importOrderDto.getColumn9()).eq("batch", importOrderDto.getColumn7()));
+            if (reviewDetls != null && reviewDetls.size() > 0) {
+                throw new CoolException("鎵规锛�" + importOrderDto.getColumn7() + "瑙勬牸锛�" + importOrderDto.getColumn4() + "璇ユ槑缁嗗凡瀛樺湪锛�");
+            }
             ReviewDetl orderDetl = new ReviewDetl();
-
             orderDetl.setOrderNo(importOrderDto.getColumn1());
             orderDetl.setMatnr(importOrderDto.getColumn2());
             orderDetl.setMaktx(importOrderDto.getColumn3());

--
Gitblit v1.9.1