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 6d24cb8c..88df32f6 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 @@ -5371,8 +5371,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (StringUtils.isNotBlank(pendingAction.getRemark())) { throw new RuntimeException("该分卷操作已开始,请勿取消"); } - // 删除待操作记录 - coilPendingActionService.deleteWithValidByIds(Arrays.asList(pendingActionId), false); // 3. 查询母卷 WmsMaterialCoil parentCoil = baseMapper.selectById(pendingAction.getCoilId()); if (parentCoil == null) { @@ -5387,14 +5385,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (Objects.equals(parentCoil.getExclusiveStatus(), 0)) { throw new RuntimeException("钢卷未处于分卷状态,无法取消"); } - - // 释放母卷独占锁 - if (Objects.equals(parentCoil.getExclusiveStatus(), 1)) { - LambdaUpdateWrapper parentUpdate = new LambdaUpdateWrapper<>(); - parentUpdate.eq(WmsMaterialCoil::getCoilId, parentCoil.getCoilId()) - .set(WmsMaterialCoil::getExclusiveStatus, 0); - baseMapper.update(null, parentUpdate); - } + // 删除待操作记录 + coilPendingActionService.deleteWithValidByIds(Arrays.asList(pendingActionId), false); +// // 释放母卷独占锁 +// if (Objects.equals(parentCoil.getExclusiveStatus(), 1)) { +// LambdaUpdateWrapper parentUpdate = new LambdaUpdateWrapper<>(); +// parentUpdate.eq(WmsMaterialCoil::getCoilId, parentCoil.getCoilId()) +// .set(WmsMaterialCoil::getExclusiveStatus, 0); +// baseMapper.update(null, parentUpdate); +// } result.put("success", true); result.put("message", "取消分卷成功");