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");