From ad9e95343ccec55d45d73d9e814b7c68ac38e9ca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 八月 2025 10:55:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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..b6344d4 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,17 +130,21 @@
List<ReviewDetl> orderDetlList = new ArrayList<>();
for (ImportReviewDto importOrderDto : list) {
+ List<ReviewDetl> reviewDetls = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>().eq("order_no", importOrderDto.getColumn1()).eq("specs", importOrderDto.getColumn2()).eq("anfme", importOrderDto.getColumn4()).eq("batch", importOrderDto.getColumn3()));
+ if (reviewDetls != null && reviewDetls.size() > 0) {
+ throw new CoolException(importOrderDto.getColumn1() + "=鎵规锛�" + importOrderDto.getColumn7() + "瑙勬牸锛�" + importOrderDto.getColumn4() + "璇ユ槑缁嗗凡瀛樺湪锛�");
+ }
ReviewDetl orderDetl = new ReviewDetl();
-
orderDetl.setOrderNo(importOrderDto.getColumn1());
- orderDetl.setMatnr(importOrderDto.getColumn2());
- orderDetl.setMaktx(importOrderDto.getColumn3());
- orderDetl.setSpecs(importOrderDto.getColumn4());
- orderDetl.setUnit(importOrderDto.getColumn5());
+ orderDetl.setSpecs(importOrderDto.getColumn2());
+ orderDetl.setBatch(importOrderDto.getColumn3());
+ orderDetl.setAnfme(importOrderDto.getColumn4());
+
+ orderDetl.setMatnr(importOrderDto.getColumn5());
+ orderDetl.setMaktx(importOrderDto.getColumn6());
+ orderDetl.setUnit(importOrderDto.getColumn7());
//orderDetl.set(importOrderDto.getColumn6());
- orderDetl.setBatch(importOrderDto.getColumn7());
- orderDetl.setModel(importOrderDto.getColumn8());
- orderDetl.setAnfme(importOrderDto.getColumn9());
+ orderDetl.setModel(importOrderDto.getColumn9());
orderDetl.setDeadTime(importOrderDto.getColumn10());
orderDetl.setOrderId(importOrderDto.getOrderId());
--
Gitblit v1.9.1