From 11703b8518033f68e74e0c5e23150416e0c7799b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 31 Mar 2026 14:22:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 ApplyReturnRequestItemVO 中的 TableField 注解
- 在 ApplyReturnRequestItemVO 中新增 poLineNumberNew 和 poNumberNew 字段
- 创建 WmsOutAssistanceTicketMapper.xml 映射文件
- 实现 search 方法用于查询辅助出库信息
- 实现 getInfo 方法用于获取单个辅助出库详情
- 配置辅助出库单据相关的数据库查询逻辑
---
 .../wms/common/pojo/vo/ApplyReturnRequestItemVO.java  | 11 ++++++++++-
 .../resources/mapper/WmsOutAssistanceTicketMapper.xml |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java
index 5d8c34c0..ee026880 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java
@@ -1,6 +1,5 @@
 package com.nflg.wms.common.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -110,4 +109,14 @@ public class ApplyReturnRequestItemVO {
      * 单位
      */
     private String unit;
+
+    /**
+     * sap过账的行号
+     */
+    private Integer poLineNumberNew;
+
+    /**
+     * 新的采购单号
+     */
+    private String poNumberNew;
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml
index b010518a..d532a6df 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml
@@ -7,6 +7,8 @@
         ,oat.audit_time,oat.audit_msg,oa.*
         FROM wms_out_assistance_ticket oat
         INNER JOIN wms_out_assistance oa ON oat.order_id=oa."id"
+        INNER JOIN wms_out_assistance_ticket_item oati ON oati.ticket_id=oat."id"
+        INNER JOIN wms_out_assistance_item oai ON oai."id"=oati.order_item_id
         <where>
             <if test="request.no != null and request.no!=''">
                 AND oa."no" ilike CONCAT('%', #{request.no}, '%')
@@ -20,6 +22,9 @@
             <if test="request.lifnr!=null and request.lifnr!=''">
                 and lifnr like concat('%', #{request.lifnr}, '%')
             </if>
+            <if test="request.matnr!=null and request.matnr!=''">
+                and (oai.matnr like concat('%', #{request.matnr}, '%') OR oai.matnr1 like concat('%', #{request.matnr}, '%'))
+            </if>
             <if test="request.startDate!=null">
                 and oat.create_time >= #{request.startDate}
             </if>