From 2a8733bb2f7a0894bbda8be60129c356fb1d3cbe Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 12 Aug 2025 14:26:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 IWmsOrderService接口中新增 queryPageListByStatus 方法
- 在 WmsOrderController 中添加 listByStatus 接口
- 在 WmsOrderServiceImpl 中实现 queryPageListByStatus 方法- 优化查询条件，实现根据订单状态筛选功能
---
 .../klp/controller/WmsOrderController.java    |  8 +++++
 .../com/klp/service/IWmsOrderService.java     |  2 ++
 .../klp/service/impl/WmsOrderServiceImpl.java | 30 +++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/controller/WmsOrderController.java b/klp-wms/src/main/java/com/klp/controller/WmsOrderController.java
index 552dc3da..7c99288c 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsOrderController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsOrderController.java
@@ -45,6 +45,14 @@ public class WmsOrderController extends BaseController {
         return iWmsOrderService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * order_status不是零就查出来
+     * 新接口 不是预订单的
+     */
+    @GetMapping("/listByStatus")
+    public TableDataInfo<WmsOrderVo> listByStatus(WmsOrderBo bo, PageQuery pageQuery) {
+        return iWmsOrderService.queryPageListByStatus(bo, pageQuery);
+    }
     /**
      * 导出订单主列表
      */
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsOrderService.java b/klp-wms/src/main/java/com/klp/service/IWmsOrderService.java
index c2bd15b1..bd823c2b 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsOrderService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsOrderService.java
@@ -46,4 +46,6 @@ public interface IWmsOrderService {
      * 校验并批量删除订单主信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TableDataInfo<WmsOrderVo> queryPageListByStatus(WmsOrderBo bo, PageQuery pageQuery);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
index cf91bad3..28f5bfc5 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
@@ -48,6 +48,36 @@ public class WmsOrderServiceImpl implements IWmsOrderService {
         Page<WmsOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
+    /**
+     * 查询订单主列表ByStatus
+     */
+    @Override
+    public TableDataInfo<WmsOrderVo> queryPageListByStatus(WmsOrderBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<WmsOrder> lqw = buildQueryWrapperByStatus(bo);
+        Page<WmsOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+    private LambdaQueryWrapper<WmsOrder> buildQueryWrapperByStatus(WmsOrderBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<WmsOrder> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), WmsOrder::getOrderCode, bo.getOrderCode());
+        lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), WmsOrder::getCustomerName, bo.getCustomerName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSalesManager()), WmsOrder::getSalesManager, bo.getSalesManager());
+        // 修改为order_status不是零就查出来
+        if (bo.getOrderStatus() != null) {
+            if (bo.getOrderStatus() == 0) {
+                // 当orderStatus为0时，查询所有记录（不添加筛选条件）
+            } else {
+                // 当orderStatus不为0且不为null时，按指定状态查询
+                lqw.eq(WmsOrder::getOrderStatus, bo.getOrderStatus());
+            }
+        } else {
+            // 当orderStatus为null时，查询所有非0状态的记录
+            lqw.ne(WmsOrder::getOrderStatus, 0);
+        }
+
+        return lqw;
+    }
 
     /**
      * 查询订单主列表