From a033aa2b5ee7ec01442f566c6040e9013a544c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 25 Sep 2025 10:57:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-739=20=E9=92=A2=E6=9E=84=E4=BB=B6?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E6=9C=BA=E5=8F=B0=E5=8F=B7=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=80=9A=E8=BF=87=E6=9C=BA=E5=8F=B0=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/common/pojo/qo/StructuralPackageOrderSearchQO.java    | 4 ++--
 .../main/resources/mapper/WmsStructuralPackageOrderMapper.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java
index f4a61a20..b8bdb18e 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java
@@ -26,7 +26,7 @@ public class StructuralPackageOrderSearchQO extends SearchBaseQO {
     private String externalOrderNo;
 
     /**
-     * 机台id
+     * 机台编号
      */
-    private Long workbenchId;
+    private String workbenchCode;
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
index 96313b68..7a376b6c 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
@@ -23,8 +23,8 @@
             <if test="request.externalOrderNo!=null and request.externalOrderNo!=''">
                 and o.external_order_no=#{request.externalOrderNo}
             </if>
-            <if test="request.workbenchId!=null">
-                and o.workbench_id=#{request.workbenchId}
+            <if test="request.workbenchCode!=null and request.workbenchCode!=''">
+                and wb."no" ilike concat('%', #{request.workbenchCode}, '%')
             </if>
             <if test="request.startDate!=null">
                 and o.create_time>= #{request.startDate}