From d9cff93a1140ab3d5a30a5059c2252c58c3ecc9a Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 9 Jul 2024 15:21:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E5=88=87=E4=B8=8B=E6=96=99?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml | 1 +
 .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
index 8de13ae16..315efbd33 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
@@ -27,6 +27,7 @@
         FROM `bst_ivt_cutpointivt` bct
         WHERE bct.point_type = '3'
           AND bct.point_status = '3'
+          AND bct.product_area = 'B2'
           AND bct.is_used = '1'
           AND 0 = (SELECT COUNT(*)
                    FROM sch_base_task t
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 8eca237ac..732acd994 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -445,7 +445,7 @@ public class SlitterServiceImpl implements SlitterService {
     public JSONObject mesSlittingMachineSendMaterial(JSONObject param) {
         log.info("分切机下料的输入参数为：{}", param);
         JSONObject res = new JSONObject();
-        // todo: 获取子卷号数组
+        // 获取子卷号数组
         JSONArray containers = param.getJSONArray("container");
         List<String> containerList = containers.toJavaList(String.class);
         if (containerList.size() == 0) {
@@ -955,7 +955,7 @@ public class SlitterServiceImpl implements SlitterService {
         try {
             openLock = open.tryLock(0, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+            throw new BadRequestException("获取锁异常");
         }
         try {
             if (openLock) {
@@ -975,7 +975,7 @@ public class SlitterServiceImpl implements SlitterService {
                 try {
                     tryLock = lock.tryLock(0, TimeUnit.SECONDS);
                 } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
+                    throw new BadRequestException("获取锁异常");
                 }
                 try {
                     if (tryLock) {