From 8a540096f534dd883050187a6dcba2e938753640 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 4 Mar 2026 11:01:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E5=8D=B7=E6=93=8D=E4=BD=9C=E6=97=B6=E9=97=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在分卷步骤中添加 create_time 字段记录操作时间 - 使用 DateUtils.getNowDate() 获取当前时间戳 - 确保分卷流程中的时间信息完整记录 --- .../impl/WmsMaterialCoilServiceImpl.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) 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 e0157d0a..230c86e5 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 @@ -1600,6 +1600,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { splitStep.put("child_coils", allNewCoilNos); // 分卷产生的子钢卷ID将在后续步骤中设置 splitStep.put("operator", LoginHelper.getUsername()); // 操作者 + // 分卷的操作时间 + splitStep.put("create_time", DateUtils.getNowDate()); steps.add(splitStep); contentMap.put("steps", steps); @@ -1902,7 +1904,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { } } } - + return baseMapper.deleteBatchIds(ids) > 0; } @@ -3103,17 +3105,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { * 回滚合卷操作 * 获取所有被合并的钢卷ID，将这些钢卷还原（dataType改为1），并删除当前合卷的钢卷 */ - private Map rollbackMergeOperation(WmsMaterialCoil currentCoil, WmsGenerateRecordVo qrcodeRecord, + private Map rollbackMergeOperation(WmsMaterialCoil currentCoil, WmsGenerateRecordVo qrcodeRecord, Map rollbackInfo, Map result) { List parentCoilIds = (List) rollbackInfo.get("parentCoilIds"); - + if (parentCoilIds == null || parentCoilIds.isEmpty()) { throw new RuntimeException("无法获取合卷的原始钢卷ID，无法回滚"); } // 查询所有原始钢卷 List originalCoils = baseMapper.selectBatchIds(parentCoilIds); - + // 检查所有原始钢卷是否存在 if (originalCoils.size() != parentCoilIds.size()) { throw new RuntimeException("部分原始钢卷不存在，无法回滚"); @@ -3160,9 +3162,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { result.put("message", "合卷回滚成功，已恢复 " + parentCoilIds.size() + " 个原始钢卷，删除了合卷钢卷"); result.put("restoredCoilCount", parentCoilIds.size()); result.put("deletedCoilId", currentCoil.getCoilId()); - + log.info("合卷回滚操作成功：删除的合卷钢卷ID={}, 恢复的原始钢卷ID={}", currentCoil.getCoilId(), parentCoilIds); - + return result; } @@ -3170,17 +3172,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { * 回滚分卷操作 * 删除所有母卷生成的子钢卷，恢复母卷为当前数据 */ - private Map rollbackSplitOperation(WmsMaterialCoil currentCoil, WmsGenerateRecordVo qrcodeRecord, + private Map rollbackSplitOperation(WmsMaterialCoil currentCoil, WmsGenerateRecordVo qrcodeRecord, Map rollbackInfo, Map result) { List childCoilIds = (List) rollbackInfo.get("childCoilIds"); - + if (childCoilIds == null || childCoilIds.isEmpty()) { throw new RuntimeException("无法获取分卷的子钢卷ID，无法回滚"); } // 查询所有子钢卷 List childCoils = baseMapper.selectBatchIds(childCoilIds); - + // 检查所有子钢卷是否存在 if (childCoils.size() != childCoilIds.size()) { throw new RuntimeException("部分子钢卷不存在，无法回滚"); @@ -3262,9 +3264,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { result.put("message", "分卷回滚成功，已恢复母卷，删除了 " + childCoilIds.size() + " 个子钢卷"); result.put("deletedCoilIds", childCoilIds); result.put("restoredCoilId", motherCoilId); - + log.info("分卷回滚操作成功：删除的子卷ID={}, 恢复的母卷ID={}", childCoilIds, motherCoilId); - + return result; }