From c3799fe05254c931ec054c1d49e23be965132385 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 11:25:15 +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

---
 .../main/resources/mapper/WmsStructuralPackageOrderMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
index 7a376b6c..ead1d516 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageOrderMapper">
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
-        SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
+        SELECT o.*,m."no"||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
         ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo"
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
@@ -24,7 +24,7 @@
                 and o.external_order_no=#{request.externalOrderNo}
             </if>
             <if test="request.workbenchCode!=null and request.workbenchCode!=''">
-                and wb."no" ilike concat('%', #{request.workbenchCode}, '%')
+                and m."no"||wb."no" ilike concat('%', #{request.workbenchCode}, '%')
             </if>
             <if test="request.startDate!=null">
                 and o.create_time>= #{request.startDate}