From a2844ec54ade507ae3958f08f2f70dab925da280 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 15 Jun 2026 11:48:12 +0800 Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E6=93=8D=E4=BD=9C=E4=B8=AD=E7=9A=84=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=E5=92=8C=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsCoilPendingActionServiceImpl 中添加钢卷存在性检查，避免空指针异常 - 当关联钢卷不存在时抛出运行时异常提示"关联的钢卷不存在" - 修复 WmsMaterialCoilServiceImpl 中的合卷操作逻辑 - 修改条件判断避免整数缓存导致的比较错误 - 合卷操作已在 mergeCoils 方法中单独处理，此处跳过重复操作 --- .../com/klp/service/impl/WmsCoilPendingActionServiceImpl.java | 3 +++ .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java index be64ef1c..145e9fa5 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java @@ -274,6 +274,9 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer validEntityBeforeSave(add); if (add.getCoilId() != null){ WmsMaterialCoil materialCoil = materialCoilMapper.selectById(add.getCoilId()); + if (materialCoil == null) { + throw new RuntimeException("关联的钢卷不存在"); + } if (materialCoil.getDataType() == 0) { throw new RuntimeException("该钢卷为历史钢卷不能被操作"); } 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 14f5d8e0..6d24cb8c 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 @@ -1658,8 +1658,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { result = updateBySingle(bo, qrcodeStepType); // 返回新钢卷ID字符串 } - // 如果有关联的操作记录ID，调用完成接口 - if (bo.getActionId() != null && bo.getActionId() > 0 && bo.getHasMergeSplit() != 2) { + // 如果有关联的操作记录ID，调用完成接口（合卷已在mergeCoils中单独完成，此处跳过） + if (bo.getActionId() != null && bo.getActionId() > 0 && !Integer.valueOf(2).equals(bo.getHasMergeSplit())) { coilPendingActionService.completeAction(bo.getActionId(), result); }