1

zhang

3 天以前 62126525bcccf7b6b3800c7848f7910abfa61252

1

 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());