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}