diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 609cc1df..79780c1a 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -1870,6 +1870,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { } // 检查长度/厚度偏差并插入告警 + // 退火工序没有actionId(不创建代操作记录),直接设置actionType=600 + if ("annealing".equals(qrcodeStepType)) { + bo.setActionType(600); + } materialWarningService.checkAndInsertWarnings(newCoil, bo); // 如果实际库区id为-1,则清空钢卷上的实际库区绑定 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java index 77b60f97..dcebe400 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java @@ -198,6 +198,10 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService log.warn("查询产线类型失败, actionId={}", bo.getActionId(), e); } } + // 兜底:如果没有actionId(如退火工序不创建代操作记录),直接使用bo中的actionType + if (actionType == null && bo != null && bo.getActionType() != null) { + actionType = bo.getActionType(); + } if (actionType != null) { for (WmsMaterialWarning w : warnings) { w.setActionType(actionType);