From b141c90208b6a82504680d35eacdaecff1cb7e40 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期日, 14 四月 2024 10:39:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index d78fcbe..13d18e6 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -90,11 +90,16 @@
             List<String[]> outLocBoxCList = new ArrayList<>();
             List<String> outLocBoxCNew = new ArrayList<>();
             for (String[] outLocBoxC:OutLocBoxCs){
+                total--;
                 if (!outLocBoxCNew.contains(outLocBoxC[0])){
                     LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
+                    if (Cools.isEmpty(locDetlSou)){
+                        throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
+                    }
                     List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                             .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
                     for (LocDetl locDetl:locDetls){
+                        total++;
                         String[] locDetlNow=new String[2];
                         locDetlNow[0] = locDetl.getBatch();
                         locDetlNow[1] = outLocBoxC[1];
@@ -119,7 +124,15 @@
 
             StockOutParam param = new StockOutParam();
             ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
-            for (LocDto locDto:locDtos){
+            List<LocDto> locDtosList = new ArrayList<>();
+            List<String> batchList = new ArrayList<>();
+            for (LocDto locDto : locDtos) {
+                if (!batchList.contains(locDto.getBatch())){
+                    batchList.add(locDto.getBatch());
+                    locDtosList.add(locDto);
+                }
+            }
+            for (LocDto locDto:locDtosList){
                 StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
                 locDetl.setBrand(locDto.getBrand());
                 locDetl.setLocNo(locDto.getLocNo());
@@ -143,8 +156,7 @@
 
         }
 
-
-        log.info("瀵煎叆{}鏉$鍙凤紒", total);
+        log.info("鍑哄簱{}鏉$鍙凤紒", total);
     }
 
     public int getTotal() {

--
Gitblit v1.9.1