代码更新

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