rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改分页插叙的方法

This commit is contained in:
zhangke 2026-03-03 10:59:05 +08:00
parent aca556b024
commit 86517ae775
5 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java
View File

@ -37,6 +37,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* 采购退货 * 采购退货
*/ */
@ -72,7 +73,7 @@ public class PurchaseReturnController extends BaseController {
@PostMapping("search") @PostMapping("search")
@ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息") @ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息")
public ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(@Valid @RequestBody ApplyReturnRequestSearchQO request) { 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") @PostMapping("searchPos")
@ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息") @ApiMark(moduleName = "获取送货单的入库信息", apiName = "获取送货单的入库信息")
public ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(@Valid @RequestBody GoodsReceiptSearchQO request) { public ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(@Valid @RequestBody GoodsReceiptSearchQO request) {
return returnRequestService.getGoodsReceipts(request);
return ApiResult.success(returnRequestService.getGoodsReceipts(request));
} }
/** /**

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsReturnRequestMapper.java
View File

@ -1,6 +1,7 @@
package com.nflg.wms.repository.mapper; package com.nflg.wms.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
@ -20,7 +21,7 @@ import com.nflg.wms.repository.entity.WmsReturnRequest;
*/ */
public interface WmsReturnRequestMapper extends BaseMapper<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);
} }

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsReturnRequestService.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.repository.service; 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.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.qo.ApplyReturnRequestSearchQO; 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); 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); void delApplyOrders(@NotNull Long id);
ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(@Valid ApplyReturnRequestSearchQO request); IPage<ApplyReturnRequestVO> getApplyOrders(@Valid ApplyReturnRequestSearchQO request);
} }

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestServiceImpl.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
@ -49,7 +50,7 @@ public class WmsReturnRequestServiceImpl extends ServiceImpl<WmsReturnRequestMap
} }
@Override @Override
public ApiResult<PageData<GoodsReceiptVO>> getGoodsReceipts(GoodsReceiptSearchQO request) { public IPage<GoodsReceiptVO> getGoodsReceipts(GoodsReceiptSearchQO request) {
return baseMapper.getGoodsReceipts(request, new Page<>(request.getPage(), request.getPageSize())); return baseMapper.getGoodsReceipts(request, new Page<>(request.getPage(), request.getPageSize()));
} }
@ -63,7 +64,7 @@ public class WmsReturnRequestServiceImpl extends ServiceImpl<WmsReturnRequestMap
} }
@Override @Override
public ApiResult<PageData<ApplyReturnRequestVO>> getApplyOrders(ApplyReturnRequestSearchQO request) { public IPage<ApplyReturnRequestVO> getApplyOrders(ApplyReturnRequestSearchQO request) {
return baseMapper.getApplyOrders(request, new Page<>(request.getPage(), request.getPageSize())); return baseMapper.getApplyOrders(request, new Page<>(request.getPage(), request.getPageSize()));
} }
} }

61
nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <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 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, 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 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 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>
<select id="getApplyOrders" resultType="com.nflg.wms.common.pojo.PageData"> <select id="getApplyOrders" resultType="com.nflg.wms.common.pojo.vo.ApplyReturnRequestVO">
SELECT * from wms_return_request SELECT * from wms_return_request
<where> <where>
<if test="request.applicationNo !=null and request.applicationNo !=''"> <if test="request.applicationNo !=null and request.applicationNo !=''">
and a.application_no =#{request.applicationNo} and a.application_no =#{request.applicationNo}
</if> </if>
<if test="request.supplierCode !=null and request.supplierCode !=''"> <if test="request.supplierCode !=null and request.supplierCode !=''">
and a.supplier_code =#{ request.supplierCode} and a.supplier_code =#{ request.supplierCode}
</if> </if>
<if test="request.poNum !=null and request.poNum !=''"> <if test="request.poNum !=null and request.poNum !=''">
and a.po_num =#{ request.poNum} and a.po_num =#{ request.poNum}
</if> </if>
<if test="request.approvalStatus !=null and request.approvalStatus !=''"> <if test="request.approvalStatus !=null and request.approvalStatus !=''">
and a.approval_status =#{ request.approvalStatus} and a.approval_status =#{ request.approvalStatus}
</if> </if>
<if test="request.documentType !=null and request.documentType !=''"> <if test="request.documentType !=null and request.documentType !=''">
and a.document_type =#{ request.documentType} and a.document_type =#{ request.documentType}
</if> </if>
<if test="request.purchaseGroup !=null and request.purchaseGroup !=''"> <if test="request.purchaseGroup !=null and request.purchaseGroup !=''">
and a.purchase_group =#{ request.purchaseGroup} and a.purchase_group =#{ request.purchaseGroup}
</if> </if>
<if test="request.startDate !=null"> <if test="request.startDate !=null">
and a.approve_time>= #{request.inStartDate} and a.approve_time>= #{request.inStartDate}
</if> </if>
<if test="request.endDate !=null"> <if test="request.endDate !=null">
and a.approve_time &lt;= #{request.inEndDate} and a.approve_time &lt;= #{request.inEndDate}
</if> </if>
</where> </where>
</select> </select>
</mapper> </mapper>