From 4a1269fe45967bd36f00f293f3ab99c237e8940e Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 14 Jun 2024 16:29:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E6=89=BE=E5=89=A9=E4=BD=99?=
 =?UTF-8?q?=E5=90=8C=E7=BB=84=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/PdmBiSlittingproductionplanMapper.xml |  1 +
 .../b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml |  4 ++--
 .../slitter/service/impl/SlitterServiceImpl.java     | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
index 296520e16..b1c9dced2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
@@ -133,6 +133,7 @@
         <foreach item="item" index="index" collection="qzzs" open="(" separator="," close=")">
             #{item}
         </foreach>
+        OR p1.qzzno IS NULL
         )
         SELECT
         resource_name,
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 92316591c..e1c36a0fa 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
@@ -10,8 +10,8 @@
             `bst_ivt_cutpointivt` bct
                 LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bct.qzz_no1 OR p.qzzno = bct.qzz_no2
         WHERE bct.point_status = '2' AND p.parent_container_name = #{parent_container_name} AND p.split_group = #{split_group}
-          AND (LENGTH(bic.qzz_no1) = 0 OR LENGTH(bic.qzz_no2) = 0)
-          AND (LENGTH(bic.qzz_no1) <![CDATA[ > ]]> 0 OR LENGTH(bic.qzz_no2) <![CDATA[ > ]]> 0)
+          AND (LENGTH(bct.qzz_no1) = 0 OR LENGTH(bct.qzz_no2) = 0)
+          AND (LENGTH(bct.qzz_no1) <![CDATA[ > ]]> 0 OR LENGTH(bct.qzz_no2) <![CDATA[ > ]]> 0)
           AND bct.is_used = '1'
         LIMIT 1
     </select>
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 3eeec9c40..6101f8361 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
@@ -136,7 +136,7 @@ public class SlitterServiceImpl implements SlitterService {
                 : "");
         con.put("number", ObjectUtil.isNotEmpty(point.getTube_code1()) && ObjectUtil.isNotEmpty(point.getTube_code2())
                 ? "2" : "1");
-        res.put("code", HttpStatus.HTTP_OK);
+        res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "任务请求成功!");
         return res;
     }
@@ -155,7 +155,7 @@ public class SlitterServiceImpl implements SlitterService {
             TaskUtils.updateOptMessageByBShaftPoint(CBJ);
             shafttubeivtService.updateById(CBJ);
         }
-        res.put("code", HttpStatus.HTTP_OK);
+        res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "请求成功");
         return res;
     }
@@ -184,7 +184,7 @@ public class SlitterServiceImpl implements SlitterService {
         r.put("device_code", deviceCode);
         SlitterTaskUtil.putCurrentPaperSpec(r, plans);
         r.put("pullCount", plans.size());
-        res.put("code", HttpStatus.HTTP_OK);
+        res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "请求成功");
         return res;
     }
@@ -295,7 +295,7 @@ public class SlitterServiceImpl implements SlitterService {
                 lockPoint.unlock();
             }
         }
-        res.put("code", HttpStatus.HTTP_OK);
+        res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "请求成功");
         return res;
     }
@@ -332,7 +332,7 @@ public class SlitterServiceImpl implements SlitterService {
         param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
         param.put("is_bushing", "0");
         trussCallShaftCacheTask.createTask(param);
-        res.put("code", HttpStatus.HTTP_OK);
+        res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "请求成功");
         return res;
     }
@@ -639,7 +639,7 @@ public class SlitterServiceImpl implements SlitterService {
         taskParam.put("point_code2", one.getPoint_code());
         taskParam.put("material_code", plan.getContainer_name());
         taskParam.put("to_is_labeling", "0");
-        res.put("code", HttpStatus.HTTP_OK);
+        res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "请求成功!");
         res.put("data", taskParam);
         return res;