From f6c365d60e5f3b61e1f5f019d6532ab4f7e77238 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 24 Apr 2026 16:21:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(data):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E7=BC=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 WmsCoilCacheMapper.xml 中 selectVoByCoilId 查询的返回类型 - 修复 WmsMaterialCoilServiceImpl 中质量状态检查的条件判断逻辑 - 确保非免检仓库的质量状态验证正常工作 --- .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++-- klp-wms/src/main/resources/mapper/klp/WmsCoilCacheMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 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 9067ed39..61fa275a 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 @@ -2866,8 +2866,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { } // 检查是否需要判级：排除四个特定逻辑库，这些库的钢卷即使未判级也能发货 Set exemptWarehouseIds = new HashSet<>(Arrays.asList(1988150210872930306L, 1988150380649967617L, 1988150800092950529L, 1988151027466170370L)); - if (wmsMaterialCoilVo != null - && StringUtils.isBlank(wmsMaterialCoilVo.getQualityStatus()) + if (wmsMaterialCoilVo != null + && StringUtils.isBlank(wmsMaterialCoilVo.getQualityStatus()) && !exemptWarehouseIds.contains(wmsMaterialCoilVo.getWarehouseId())) { throw new RuntimeException("该钢卷未判级，请勿发货！"); } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilCacheMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilCacheMapper.xml index f73af7ec..45aef77c 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilCacheMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilCacheMapper.xml @@ -17,7 +17,7 @@ - select * from wms_coil_cache where coil_id = #{coilId}