From 86517ae77563e4f7913e2c817455a860914c44ca Mon Sep 17 00:00:00 2001
From: zhangke <sunwill6677@>
Date: Tue, 3 Mar 2026 10:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E6=8F=92?=
 =?UTF-8?q?=E5=8F=99=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PurchaseReturnController.java  |  6 +-
 .../mapper/WmsReturnRequestMapper.java        |  5 +-
 .../service/IWmsReturnRequestService.java     |  5 +-
 .../impl/WmsReturnRequestServiceImpl.java     |  5 +-
 .../mapper/WmsReturnRequestMapper.xml         | 61 ++++++++++---------
 5 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java
index 96f102d4..d2f7e9bf 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java
@@ -37,6 +37,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 /**
  * 采购退货
  */
@@ -72,7 +73,7 @@ public class PurchaseReturnController extends BaseController {
     @PostMapping("search")
     @ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息")
     public ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(@Valid @RequestBody ApplyReturnRequestSearchQO request) {
-        return returnRequestService.getApplyOrders(request);
+        return ApiResult.success(returnRequestService.getApplyOrders(request));
     }
 
     /**
@@ -101,7 +102,8 @@ public class PurchaseReturnController extends BaseController {
     @PostMapping("searchPos")
     @ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息")
     public ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(@Valid @RequestBody GoodsReceiptSearchQO request) {
-        return returnRequestService.getGoodsReceipts(request);
+
+        return ApiResult.success(returnRequestService.getGoodsReceipts(request));
     }
 
     /**
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestMapper.java
index 9f0094e3..4f5eb362 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestMapper.java
@@ -1,6 +1,7 @@
 package com.nflg.wms.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
@@ -20,7 +21,7 @@ import com.nflg.wms.repository.entity.WmsReturnRequest;
  */
 public interface WmsReturnRequestMapper extends BaseMapper<WmsReturnRequest> {
 
-    ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(GoodsReceiptSearchQO request, Page<Object> objectPage);
+    IPage<GoodsReceiptVO> getGoodsReceipts(GoodsReceiptSearchQO request, Page<Object> objectPage);
 
-    ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(ApplyReturnRequestSearchQO request, Page<Object> objectPage);
+    IPage<ApplyReturnRequestVO> getApplyOrders(ApplyReturnRequestSearchQO request, Page<Object> objectPage);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestService.java
index bbf0c599..133cf30f 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestService.java
@@ -1,5 +1,6 @@
 package com.nflg.wms.repository.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.qo.ApplyReturnRequestSearchQO;
@@ -26,9 +27,9 @@ public interface IWmsReturnRequestService extends IService<WmsReturnRequest> {
 
     void addPurchaseReturns(List<WmsReturnRequest> returnRequests, List<WmsReturnRequestItem> returnRequestItems);
 
-    ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(@Valid GoodsReceiptSearchQO request);
+    IPage<GoodsReceiptVO> getGoodsReceipts(@Valid GoodsReceiptSearchQO request);
 
     void delApplyOrders(@NotNull Long id);
 
-    ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(@Valid ApplyReturnRequestSearchQO request);
+    IPage<ApplyReturnRequestVO> getApplyOrders(@Valid ApplyReturnRequestSearchQO request);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestServiceImpl.java
index 30775fd3..c26b17fe 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
@@ -49,7 +50,7 @@ public class WmsReturnRequestServiceImpl extends ServiceImpl<WmsReturnRequestMap
     }
 
     @Override
-    public ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(GoodsReceiptSearchQO request) {
+    public IPage<GoodsReceiptVO> getGoodsReceipts(GoodsReceiptSearchQO request) {
         return baseMapper.getGoodsReceipts(request, new Page<>(request.getPage(), request.getPageSize()));
     }
 
@@ -63,7 +64,7 @@ public class WmsReturnRequestServiceImpl extends ServiceImpl<WmsReturnRequestMap
     }
 
     @Override
-    public ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(ApplyReturnRequestSearchQO request) {
+    public IPage<ApplyReturnRequestVO> getApplyOrders(ApplyReturnRequestSearchQO request) {
         return baseMapper.getApplyOrders(request, new Page<>(request.getPage(), request.getPageSize()));
     }
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
index ebef64fc..41d4d506 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nflg.wms.repository.mapper.WmsReturnRequestMapper">
 
-    <select id="getGoodsReceipts" resultType="com.nflg.wms.common.pojo.PageData">
+    <select id="getGoodsReceipts" resultType="com.nflg.wms.common.pojo.vo.GoodsReceiptVO">
         select a.note_num as delivery_no,a.line_number as delivery_line_no,a.po_num,a.po_line_number,a.item_code as
         material_code,a.item_name as material_description,sum(a.in_qty) as request_quantity,
         a.uom_code,a.received_warehouse as storage_location,a.iu_code as factory_code,a.purchase_group,a.supplier_num as
@@ -40,33 +40,34 @@
         a.note_num,a.line_number,a.po_num,a.po_line_number,a.item_code,a.item_name,a.uom_code,a.received_warehouse,a.iu_code,a.purchase_group,a.supplier_num,b.supplier_name,a.received_warehouse
     </select>
 
-    <select id="getApplyOrders" resultType="com.nflg.wms.common.pojo.PageData">
-        SELECT * from wms_return_request
-        <where>
-            <if test="request.applicationNo !=null and request.applicationNo !=''">
-                and a.application_no =#{request.applicationNo}
-            </if>
-            <if test="request.supplierCode !=null and request.supplierCode !=''">
-                and a.supplier_code =#{ request.supplierCode}
-            </if>
-            <if test="request.poNum !=null and request.poNum !=''">
-                and a.po_num =#{ request.poNum}
-            </if>
-            <if test="request.approvalStatus !=null and request.approvalStatus !=''">
-                and a.approval_status =#{ request.approvalStatus}
-            </if>
-            <if test="request.documentType !=null and request.documentType !=''">
-                and a.document_type =#{ request.documentType}
-            </if>
-            <if test="request.purchaseGroup !=null and request.purchaseGroup !=''">
-                and a.purchase_group =#{ request.purchaseGroup}
-            </if>
-            <if test="request.startDate !=null">
-                and a.approve_time>= #{request.inStartDate}
-            </if>
-            <if test="request.endDate !=null">
-                and a.approve_time &lt;= #{request.inEndDate}
-            </if>
-        </where>
-    </select>
+        <select id="getApplyOrders" resultType="com.nflg.wms.common.pojo.vo.ApplyReturnRequestVO">
+            SELECT * from wms_return_request
+            <where>
+                <if test="request.applicationNo !=null and request.applicationNo !=''">
+                    and a.application_no =#{request.applicationNo}
+                </if>
+                <if test="request.supplierCode !=null and request.supplierCode !=''">
+                    and a.supplier_code =#{ request.supplierCode}
+                </if>
+                <if test="request.poNum !=null and request.poNum !=''">
+                    and a.po_num =#{ request.poNum}
+                </if>
+                <if test="request.approvalStatus !=null and request.approvalStatus !=''">
+                    and a.approval_status =#{ request.approvalStatus}
+                </if>
+                <if test="request.documentType !=null and request.documentType !=''">
+                    and a.document_type =#{ request.documentType}
+                </if>
+                <if test="request.purchaseGroup !=null and request.purchaseGroup !=''">
+                    and a.purchase_group =#{ request.purchaseGroup}
+                </if>
+                <if test="request.startDate !=null">
+                    and a.approve_time>= #{request.inStartDate}
+                </if>
+                <if test="request.endDate !=null">
+                    and a.approve_time &lt;= #{request.inEndDate}
+                </if>
+            </where>
+        </select>
+
 </mapper>