From 22c7fac30ee05b8024262fe89f191f6fb70bc61f Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sun, 14 Jul 2024 14:46:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A5=97=E8=BD=B4=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=AD=E4=BB=BB=E5=8A=A1=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E7=A9=BA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml | 1 + .../nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 1 + 2 files changed, 2 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml index 8fe74cbea..35b8ab105 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml @@ -18,5 +18,6 @@ LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = t.vehicle_code OR p.qzzno = t.vehicle_code2 WHERE t.task_status '071' AND t.task_status ]]> '07' AND t.task_type = '010813' AND p.resource_name = #{resourceName} + AND IFNULL(p.qzzno, '') ]]> '' 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 fd68cac60..733d8d31e 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 @@ -112,6 +112,7 @@ public class AutoCallAirShaftTask { makePullShaft(empty, specification); return; } + log.info("获取过滤后的分切计划数据：{}", plans); // 查看套轴对接位是否满了 // todo: 这里需要注意不要去校验071的任务，不然提前释放货位没意义。 List emptyShaftPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",