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 5aabed7d..14f5d8e0 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 @@ -1987,6 +1987,23 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { return coil == null ? null : coil.getExclusiveStatus(); } + /** + * 获取锁状态描述 + */ + private String getLockStatusDesc(Integer exclusiveStatus) { + if (exclusiveStatus == null) { + return "状态未知"; + } + switch (exclusiveStatus) { + case 1: return "正在单步分卷中"; + case 2: return "正在退火中"; + case 3: return "已被酸扎领料锁定"; + case 4: return "已被分卷领料锁定"; + case 5: return "已被合卷领料锁定"; + default: return "已被其他操作锁定(状态码:" + exclusiveStatus + ")"; + } + } + /** * 验证钢卷操作权限(检查独占状态) * @param coilId 钢卷ID @@ -5031,7 +5048,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 3. 检查是否已被锁定或已有相同类型的待处理操作 if (coil.getExclusiveStatus() != null && coil.getExclusiveStatus() != 0) { - throw new RuntimeException("钢卷正在进行操作"); + String lockDesc = getLockStatusDesc(coil.getExclusiveStatus()); + throw new RuntimeException("钢卷" + lockDesc + ",无法执行单步分卷"); } // // 3.1 检查是否已经有相同类型的待处理操作(防止重复领料)