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 6e111e96..bd9df568 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 @@ -1325,8 +1325,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { * @return 新钢卷ID字符串 */ private String updateBySingle(WmsMaterialCoilBo bo, String qrcodeStepType) { - // 检查独占状态 - validateCoilOperationPermission(bo.getCoilId(), "单个更新"); + if (StringUtils.isNotBlank(qrcodeStepType) && !"annealing".equals(qrcodeStepType)){ + // 检查独占状态 + validateCoilOperationPermission(bo.getCoilId(), "单个更新"); + } // 查询原钢卷 WmsMaterialCoil oldCoil = baseMapper.selectById(bo.getCoilId()); @@ -1388,7 +1390,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 3. 更新二维码内容(添加更新步骤并更新current_coil_id) if (oldCoil.getQrcodeRecordId() != null) { - if ("annealing".equals(qrcodeStepType)) { + if (StringUtils.isNotBlank(qrcodeStepType) && "annealing".equals(qrcodeStepType)) { updateQrcodeContentForCustomStep(oldCoil, bo, newCoil.getCoilId(), "退火", "退火操作"); } else { updateQrcodeContentForNormalUpdate(oldCoil, bo, newCoil.getCoilId());