From 78a11bb4c85e2a8082e5271e8a6e9ee100add96c Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 12 Aug 2024 16:09:08 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=9C=A8=E7=AE=B1=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=A0=A1=E9=AA=8C=E7=9B=B8=E5=90=8C=E6=9C=A8=E7=AE=B1?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E6=9C=A8=E7=AE=B1=E5=87=BA=E5=BA=93=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E4=B8=8B=E5=8F=91=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BstIvtPackageinfoivtServiceImpl.java | 11 -----------
 .../java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java    |  2 +-
 .../iostorInv/util/impl/InBoxManageServiceImpl.java   |  9 +++++++++
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index 06a66199b..c9c00466a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -147,11 +147,6 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         return result;
     }
 
-    @Override
-    public List<BstIvtPackageinfoivt> getBstIvtPackageinfoivts(String ivtType, String ivtStatus, String sortType, boolean isQueryGroup) {
-        return null;
-    }
-
     /**
      * 根据取放货类型二次分配新的点位
      *
@@ -891,12 +886,6 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         return result;
     }
 
-    @Override
-    public String getDjqShiftingPoint(BstIvtPackageinfoivt shallowIvt, boolean isDjqShifting) {
-        return null;
-    }
-
-
     /**
      * 多选删除
      *
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
index c41984a06..6f226fd6b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
@@ -59,7 +59,7 @@ public class TwoOutBoxTask extends AbstractAcsTask {
         JSONArray arr = taskTab.query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' order by create_time").getResultJSONArray(0);
 
         // 判断当前有多少个正在执行中的任务
-        int num = taskTab.query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.EXECUTING.getCode() + "' and is_delete ='0'")
+        int num = taskTab.query("handle_class = '" + THIS_CLASS + "' and task_status < '" + TaskStatusEnum.FINISHED.getCode() + "' and is_delete ='0'")
                 .getResultJSONArray(0).size();
 
         // 查询装箱对接位是否有木箱
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index e36d6d8c5..a5d7eca45 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -189,6 +189,15 @@ public class InBoxManageServiceImpl implements InBoxManageService {
             throw new BadRequestException("扫描的木箱个数和选择的木箱层数不一致！");
         }
 
+        // 校验是否有相同木箱号
+        List<String> strings = Arrays.asList(split);
+        int size = (int) strings.stream()
+                .distinct().count();
+
+        if (size != split.length) {
+            throw new BadRequestException("木箱号有相同，请重新扫码!");
+        }
+
         for (int i = 0; i < split.length; i++) {
             String boxNO = split[i];
             JSONObject jo = new JSONObject();