From 6c7d9e1d5932aeb1935f5b8dc0518cc8cf70b36d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 30 Mar 2026 13:35:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=AD=A3=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E5=88=AB=E5=90=8D=E5=BC=95=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将查询条件中的表别名从 a 修改为 rr
- 确保所有字段引用都使用正确的表别名
- 修复了 application_no、supplier_code、po_num 等字段的表别名
- 统一了 approval_status、document_type、purchase_group 字段的表别名
- 修正了 approve_time 时间范围查询的表别名引用
---
 .../resources/mapper/WmsReturnRequestMapper.xml  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
index 08c8babb..995730ed 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
@@ -46,28 +46,28 @@
             left join user_supplier us on rr.supplier_code=us.supplier_code
             where (rr.create_user_id=#{request.userId} or rr.purchase_group=#{request.purchaseGroup})
             <if test="request.applicationNo !=null and request.applicationNo !=''">
-                and a.application_no =#{request.applicationNo}
+                and rr.application_no =#{request.applicationNo}
             </if>
             <if test="request.supplierCode !=null and request.supplierCode !=''">
-                and a.supplier_code =#{ request.supplierCode}
+                and rr.supplier_code =#{ request.supplierCode}
             </if>
             <if test="request.poNum !=null and request.poNum !=''">
-                and a.po_num =#{ request.poNum}
+                and rr.po_num =#{ request.poNum}
             </if>
             <if test="request.approvalStatus !=null and request.approvalStatus !=''">
-                and a.approval_status =#{ request.approvalStatus}
+                and rr.approval_status =#{ request.approvalStatus}
             </if>
             <if test="request.documentType !=null and request.documentType !=''">
-                and a.document_type =#{ request.documentType}
+                and rr.document_type =#{ request.documentType}
             </if>
             <if test="request.purchaseGroup !=null and request.purchaseGroup !=''">
-                and a.purchase_group =#{ request.purchaseGroup}
+                and rr.purchase_group =#{ request.purchaseGroup}
             </if>
             <if test="request.startDate !=null">
-                and a.approve_time>= #{request.startDate}
+                and rr.approve_time>= #{request.startDate}
             </if>
             <if test="request.endDate !=null">
-                and a.approve_time &lt;= #{request.endDate}
+                and rr.approve_time &lt;= #{request.endDate}
             </if>
         </select>