From e9f0a3fcadb2a8f563147e8d767ee5c347def189 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Tue, 11 Jun 2024 09:53:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=86=85=E5=8C=85=E9=97=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml | 3 ++-
 .../b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java  | 2 +-
 .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java     | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
index e6be015bf..0dd7c4c97 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
@@ -48,7 +48,8 @@
             resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
         SELECT DISTINCT bic.*, sc.qzz_generation, p.qzz_size
         FROM bst_ivt_cutpointivt bic
-        LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bic.qzz_no1 OR p.qzzno = bic.qzz_no2
+        LEFT JOIN pdm_bi_slittingproductionplan p ON ((p.qzzno = bic.qzz_no1 AND IFNULL(bic.qzz_no1,'') != '')
+        OR (p.qzzno = bic.qzz_no2 AND IFNULL(bic.qzz_no2,'') != ''))
         LEFT JOIN st_ivt_cutpointivt sc ON sc.ext_code = p.resource_name
         WHERE bic.point_type = '1'
         AND bic.is_used = '1'
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
index 777a87eb2..f847dbaf3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
@@ -79,7 +79,7 @@ public class AutoSendAirShaftAgvTask {
                         .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO));
                 if (list.size() > 0) {
                     // 还有不同轴，所以不继续
-                    break;
+                    continue;
                 }
             }
             // 如果两个气涨轴编码则表示一组满了
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 6f3e7dc4b..eefc4ca6a 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
@@ -636,6 +636,7 @@ public class SlitterServiceImpl implements SlitterService {
         JSONObject taskParam = new JSONObject();
         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("message", "请求成功!");
         res.put("data", taskParam);