From 9da4f5a2a1751141c8b488d59fdc6767d40ab11b Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 9 Apr 2025 13:47:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=BC=E5=8F=AB=E5=A5=97=E8=BD=B4?= =?UTF-8?q?=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92=E5=88=A4=E7=A9=BA=E3=80=81?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4=E7=A9=BA?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dao/mapper/BstIvtCutpointivtMapper.xml | 1 + .../nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 4 ++++ .../src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java | 1 + 3 files changed, 6 insertions(+) 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 9fa813429..9125362a6 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 @@ -40,6 +40,7 @@ AND bc.is_used = '1' AND bc.point_status = '3' + AND IFNULL(pp.workorder_id,'') ]]> '' AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status '07' 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 3b75dcb7b..60b194320 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 @@ -275,6 +275,10 @@ public class AutoCallAirShaftTask { setIsSleeveShaft(param); // 最多两条 List oldPlans = slittingproductionplanService.getByQzzNo(oldQzzNo); + if (oldPlans.size() == 0) { + log.warn("当前气胀轴编码{}，找不到对应的计划", oldQzzNo); + return; + } SlitterTaskUtil.putCurrentPaperSpec(param, oldPlans); // 套管数量 param.put("casingCount", needPlans.size()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index 82aed0494..a385a5d26 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -256,6 +256,7 @@ public class CallEmpReelTask extends AbstractAcsTask { jsonIvt2.put("material_code", jsonTask.getString("material_code")); point_tab.update(jsonIvt2); } else if (jsonTask.getString("task_type").equals("010106")) { + // B2生箔 BakingServiceImpl bean = SpringContextHolder.getBean(BakingServiceImpl.class); WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表 JSONObject requestParam = jsonTask.getJSONObject("request_param");