DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-01-27 15:41:33 +08:00
parent 522f3400fc 9c5546418c
commit 6bf42cc2ec
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
View File

@@ -95,6 +95,12 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
*/ */
@Override @Override
public Boolean updateByBo(WmsDeliveryWaybillBo bo) { 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); WmsDeliveryWaybill update = BeanUtil.toBean(bo, WmsDeliveryWaybill.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;

20
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -552,16 +552,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
qw.in("mc.coil_id", coilIdList); qw.in("mc.coil_id", coilIdList);
} }
} }
// 仅查询未发货且未绑定在发货计划里的钢卷 // // 仅查询未发货且未绑定在发货计划里的钢卷
if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) { // if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) {
// 未发货：排除状态=1（已出库/已发货） // // 未发货：排除状态=1（已出库/已发货）
qw.ne("mc.status", 1); // qw.ne("mc.status", 1);
// 未绑定在任一有效发货计划：计划未删除，coil 字段包含当前 coil_id // // 未绑定在任一有效发货计划：计划未删除，coil 字段包含当前 coil_id
// 这里使用 NOT EXISTS + FIND_IN_SET，避免将所有计划加载到内存 // // 这里使用 NOT EXISTS + FIND_IN_SET，避免将所有计划加载到内存
qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_plan dp " + // 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 <> '' " + // "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))"); // "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))");
} // }
//逻辑删除 //逻辑删除
qw.eq("mc.del_flag", 0); qw.eq("mc.del_flag", 0);
//把team字段作为筛选条件 //把team字段作为筛选条件