From 81d06decbb3093d01abca8c8fc6594c626fbb392 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 13 Jun 2024 18:19:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E6=89=BE=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E7=BB=84=E6=B0=94=E8=83=80=E8=BD=B4BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 2 +- .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index 0ac5ecd10..9cdccabc7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -176,7 +176,7 @@ public class AutoCallAirShaftTask { param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("qzz_size", needPlan.getQzz_size()); // 所需的纸管规格 - SlitterTaskUtil.putNeedPaperSpec(param, needPlans); + SlitterTaskUtil.putNeedPaperSpec(param, needPlans); // 当前纸管的规格信息 String oldQzzNo = ObjectUtil.isNotEmpty(startPoint.getQzz_no1()) ? startPoint.getQzz_no1() : startPoint.getQzz_no2(); 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 89129599b..92316591c 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,7 +10,9 @@ `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 (bct.qzz_no1 IS NULL OR bct.qzz_no1 = '' OR bct.qzz_no2 IS NULL OR bct.qzz_no2 = '') + AND (LENGTH(bic.qzz_no1) = 0 OR LENGTH(bic.qzz_no2) = 0) + AND (LENGTH(bic.qzz_no1) ]]> 0 OR LENGTH(bic.qzz_no2) ]]> 0) + AND bct.is_used = '1' LIMIT 1