From 84d9001deaaef28054423a9d086fbceb7d25043b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 26 Jan 2026 10:54:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BC=98=E5=8C=96=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E9=92=A2=E5=8D=B7=E6=81=A2=E5=A4=8D=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改重复校验逻辑，仅校验当前钢卷号是否重复 - 移除入场钢卷号的重复校验，避免不必要的错误提示 - 简化错误信息提示内容，提高用户体验 - 保持原有异常处理机制，确保数据一致性 --- .../impl/WmsMaterialCoilServiceImpl.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 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 07ca8e9a..0dd98245 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 @@ -2913,19 +2913,13 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { throw new RuntimeException("目标钢卷不是历史数据，无法恢复"); } - // 8. 检查历史钢卷的钢卷号是否重复 + // 8. 检查历史钢卷的当前钢卷号是否重复 Map duplicateCheck = checkCoilNoDuplicate(currentCoilId, historyCoil.getEnterCoilNo(), historyCoil.getCurrentCoilNo()); - String duplicateType = (String) duplicateCheck.get("duplicateType"); - if (!"none".equals(duplicateType)) { - String errorMsg = "无法恢复历史钢卷，存在重复的钢卷号："; - if ("enter".equals(duplicateType)) { - errorMsg += "入场钢卷号[" + historyCoil.getEnterCoilNo() + "]重复"; - } else if ("current".equals(duplicateType)) { - errorMsg += "当前钢卷号[" + historyCoil.getCurrentCoilNo() + "]重复"; - } else if ("both".equals(duplicateType)) { - errorMsg += "入场钢卷号[" + historyCoil.getEnterCoilNo() + "]和当前钢卷号[" + historyCoil.getCurrentCoilNo() + "]都重复"; - } - errorMsg += "。请先删除重复的钢卷后再进行回滚操作。"; + // 仅校验当前钢卷号是否重复，忽略入场钢卷号重复 + boolean currentCoilNoDuplicate = (boolean) duplicateCheck.get("currentCoilNoDuplicate"); + if (currentCoilNoDuplicate) { + String errorMsg = "无法恢复历史钢卷，存在重复的钢卷号：历史钢卷的当前钢卷号[" + historyCoil.getCurrentCoilNo() + "]重复。"; + errorMsg += "重复的钢卷无法进行回滚操作。"; throw new RuntimeException(errorMsg); }