From 92cfac8432c26e7fe775ae285f3948576e631ffb Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 7 Feb 2023 16:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outbill/service/impl/CheckOutBillServiceImpl.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 1d4539b6d..9bff88827 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -2545,6 +2545,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         if (ObjectUtil.isEmpty(allRowArr)) throw new BadRequestException("当前没有可设置的分配明细");
 
+        // 判断当前排是否有其他任务正在执行
+        for (int i = 0; i < allRowArr.size(); i++) {
+            JSONObject jsonRow = allRowArr.getJSONObject(i);
+            JSONArray structArr = attrTab.query("block_num = '" + jsonRow.getString("block_num")
+                    + "' and row_num = '" + jsonRow.getString("row_num") + "' and is_used = '1' and is_delete = '0' and lock_type not in ('1','6','3')").getResultJSONArray(0);
+
+            if (ObjectUtil.isNotEmpty(structArr)) {
+                throw new BadRequestException(jsonRow.getString("block_num")+"区-"+jsonRow.getString("row_num")+"排有未完成的任务的入库任务！");
+            }
+        }
+
         for (int i = 0; i < allRowArr.size(); i++) {
             // 调用当前排处理方法
             JSONObject jsonRow = allRowArr.getJSONObject(i);