From 4e508dbad06b4714e4fa4234ad3ced5f9b1701b8 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 28 Jan 2026 10:10:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9D=90=E6=96=99=E5=8D=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在IWmsDeliveryWaybillService中新增changeStatus方法定义 - 在WmsDeliveryWaybillController中添加/status接口用于修改发货单状态 - 在WmsDeliveryWaybillServiceImpl中实现changeStatus业务逻辑 - 在WmsMaterialCoilServiceImpl中添加逻辑删除过滤条件 - 从材料卷查询中移除发货时间范围筛选相关代码 - 优化材料卷查询中的时间筛选逻辑和条件处理 --- .../controller/WmsDeliveryWaybillController.java | 6 ++++++ .../klp/service/IWmsDeliveryWaybillService.java | 2 ++ .../impl/WmsDeliveryWaybillServiceImpl.java | 10 +++++++++- .../service/impl/WmsMaterialCoilServiceImpl.java | 15 +++------------ 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillController.java index 5d55af22..74390fc3 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillController.java @@ -85,6 +85,12 @@ public class WmsDeliveryWaybillController extends BaseController { return toAjax(iWmsDeliveryWaybillService.updateByBo(bo)); } + // 修改发货单状态 + @Log(title = "发货单主", businessType = BusinessType.UPDATE) + @PutMapping("/status") + public R changeStatus(@RequestBody WmsDeliveryWaybillBo bo) { + return toAjax(iWmsDeliveryWaybillService.changeStatus(bo)); + } /** * 删除发货单主 * diff --git a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryWaybillService.java b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryWaybillService.java index 4910dc68..3c2dad6b 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryWaybillService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryWaybillService.java @@ -46,4 +46,6 @@ public interface IWmsDeliveryWaybillService { * 校验并批量删除发货单主信息 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + Boolean changeStatus(WmsDeliveryWaybillBo bo); } 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 2d43195e..2f627233 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 @@ -105,7 +105,13 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } - + @Override + public Boolean changeStatus(WmsDeliveryWaybillBo bo) { + WmsDeliveryWaybill update = new WmsDeliveryWaybill(); + update.setWaybillId(bo.getWaybillId()); + update.setStatus(bo.getStatus()); + return baseMapper.updateById(update) > 0; + } /** * 保存前的数据校验 */ @@ -123,4 +129,6 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService } return baseMapper.deleteBatchIds(ids) > 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 7c5445fd..fb7b7a69 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 @@ -394,6 +394,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(StringUtils.isNotBlank(bo.getTemperGrade()), "mc.temper_grade", bo.getTemperGrade()); // 独占状态 qw.eq(bo.getExclusiveStatus() != null, "mc.exclusive_status", bo.getExclusiveStatus()); + //逻辑删除 + qw.eq("mc.del_flag", 0); // 按创建时间范围筛选 if (bo.getByCreateTimeStart() != null) { qw.ge("mc.create_time", bo.getByCreateTimeStart()); @@ -401,13 +403,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (bo.getByCreateTimeEnd() != null) { qw.le("mc.create_time", bo.getByCreateTimeEnd()); } - // 按发货时间范围筛选 - if (bo.getByExportTimeStart() != null) { - qw.ge("mc.export_time", bo.getByExportTimeStart()); - } - if (bo.getByExportTimeEnd() != null) { - qw.le("mc.export_time", bo.getByExportTimeEnd()); - } // 统一处理 warehouseId 与 warehouseIds： List warehouseIdList = new ArrayList<>(); if (bo.getWarehouseId() != null) { @@ -576,17 +571,13 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // "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字段作为筛选条件 qw.eq(StringUtils.isNotBlank(bo.getTeam()), "mc.team", bo.getTeam()); //根据开始时间和结束时间筛选修改时间 qw.ge(bo.getStartTime() != null, "mc.update_time", bo.getStartTime()); qw.le(bo.getEndTime() != null, "mc.update_time", bo.getEndTime()); - qw.ge(bo.getByCreateTimeStart() != null, "mc.create_time", bo.getByCreateTimeStart()); - qw.le(bo.getByCreateTimeEnd() != null, "mc.create_time", bo.getByCreateTimeEnd()); - // 处理发货时间筛选逻辑（核心修改部分） if (bo.getByExportTimeStart() != null || bo.getByExportTimeEnd() != null) { // 开启OR条件分组：满足情况1 或 情况2