diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java index 5a3e9abb..2d43195e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java @@ -95,6 +95,12 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService */ @Override public Boolean updateByBo(WmsDeliveryWaybillBo bo) { + // 现根据bo.getWaybillId()查询出数据库中的数据 + // 如果这条数据的status是1 则抛异常为不允许修改 + WmsDeliveryWaybill db = baseMapper.selectById(bo.getWaybillId()); + if (db.getStatus() == 1) { + throw new RuntimeException("已发货的发货单不能修改"); + } WmsDeliveryWaybill update = BeanUtil.toBean(bo, WmsDeliveryWaybill.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; 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 6e92c7ef..dfb7781b 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 @@ -552,16 +552,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.in("mc.coil_id", coilIdList); } } - // 仅查询未发货且未绑定在发货计划里的钢卷 - if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) { - // 未发货:排除状态=1(已出库/已发货) - qw.ne("mc.status", 1); - // 未绑定在任一有效发货计划:计划未删除,coil 字段包含当前 coil_id - // 这里使用 NOT EXISTS + FIND_IN_SET,避免将所有计划加载到内存 - qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_plan dp " + - "WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " + - "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))"); - } +// // 仅查询未发货且未绑定在发货计划里的钢卷 +// if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) { +// // 未发货:排除状态=1(已出库/已发货) +// qw.ne("mc.status", 1); +// // 未绑定在任一有效发货计划:计划未删除,coil 字段包含当前 coil_id +// // 这里使用 NOT EXISTS + FIND_IN_SET,避免将所有计划加载到内存 +// qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_plan dp " + +// "WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " + +// "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))"); +// } //逻辑删除 qw.eq("mc.del_flag", 0); //把team字段作为筛选条件