From 7b7ce757e052877f075cbdc82b844b594b44af57 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Fri, 27 Mar 2026 11:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java    | 5 +++++
 .../nflg/wms/shipment/controller/MaterialCodeController.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java
index 3076370b..176d78cb 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java
@@ -27,6 +27,11 @@ public class MaterialCodeSearchQO extends SearchBaseQO {
      */
     private String customerName;
 
+    /**
+     * 装箱状态
+     */
+    private Integer packingStatus;
+
     /**
      * 下单开始日期
      */
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
index 023230d0..309690be 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
@@ -161,7 +161,7 @@ public class MaterialCodeController extends BaseController {
                         .like(StrUtil.isNotBlank(request.getSoNo()), WmsShipmentMaterialCode::getSoNo, request.getSoNo())
                         .like(StrUtil.isNotBlank(request.getMaterialNo()), WmsShipmentMaterialCode::getMaterialNo, request.getMaterialNo())
                         .like(StrUtil.isNotBlank(request.getCustomerName()), WmsShipmentMaterialCode::getCustomerName, request.getCustomerName())
-                        .orderByAsc(WmsShipmentMaterialCode::getStatus)
+                        .eq(Objects.nonNull(request.getPackingStatus()), WmsShipmentMaterialCode::getStatus, request.getPackingStatus())                        .orderByAsc(WmsShipmentMaterialCode::getStatus)
                         .orderByDesc(WmsShipmentMaterialCode::getId)
                         .page(new Page<>(request.getPage(), request.getPageSize()))
         );