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 db48d116..2fa05f60 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 @@ -1344,17 +1344,25 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { @Override @Transactional(rollbackFor = Exception.class) public String updateByBo(WmsMaterialCoilBo bo, String qrcodeStepType) { + String result; // 判断是否批量更新 if (bo.getNewCoils() != null && !bo.getNewCoils().isEmpty()) { // 批量更新逻辑(分卷/合卷) - return updateByBatch(bo); // 分卷返回逗号分隔的ID,合卷返回单个ID + result = updateByBatch(bo); // 分卷返回逗号分隔的ID,合卷返回单个ID } else { // 单个更新逻辑,需要coilId if (bo.getCoilId() == null) { throw new RuntimeException("钢卷ID不能为空"); } - return updateBySingle(bo, qrcodeStepType); // 返回新钢卷ID字符串 + result = updateBySingle(bo, qrcodeStepType); // 返回新钢卷ID字符串 } + + // 如果有关联的操作记录ID,调用完成接口 + if (bo.getActionId() != null && bo.getActionId() > 0) { + coilPendingActionService.completeAction(bo.getActionId(), result); + } + + return result; } /**