rev：木箱入库校验相同木箱号、木箱出库控制下发数量

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;
-    }
-
-
     /**
      * 多选删除
      *

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();
 
         // 查询装箱对接位是否有木箱

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