From 0031d7d37b5013f83578e273f8a347fc1001a4b4 Mon Sep 17 00:00:00 2001 From: zhangke Date: Tue, 3 Mar 2026 16:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LocationTransferController.java | 3 +- .../admin/controller/NormalPGIController.java | 39 +++++++- .../admin/controller/PackingController.java | 3 +- .../controller/PurchaseReturnController.java | 2 +- .../controller/QrCodeMasterController.java | 8 +- .../wms/common/pojo/vo/PacagePoItemVO.java | 93 +++++++++++++++++++ .../nflg/wms/common/pojo/vo/PacagePoVO.java | 28 ++++++ .../nflg/wms/common/pojo/vo/PacageScanVO.java | 37 ++++++++ .../wms/common/pojo/vo/PendingScanningVO.java | 86 +++++++++++++++++ .../repository/mapper/WmsPackageMapper.java | 3 +- .../mapper/WmsQrCodeMasterMapper.java | 5 +- .../mapper/WmsTransferOrdersMapper.java | 3 +- .../service/IWmsPackageService.java | 3 +- .../service/IWmsQrCodeMasterService.java | 5 +- .../service/IWmsTransferOrdersService.java | 3 +- .../service/impl/WmsPackageServiceImpl.java | 3 +- .../impl/WmsQrCodeMasterServiceImpl.java | 5 +- .../impl/WmsTransferOrdersServiceImpl.java | 3 +- .../resources/mapper/WmsPackageMapper.xml | 2 +- 19 files changed, 308 insertions(+), 26 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoItemVO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoVO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacageScanVO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PendingScanningVO.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java index de02f57a..37d4a088 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java @@ -61,8 +61,7 @@ public class LocationTransferController extends BaseController { @PostMapping("search") @ApiMark(moduleName = "获取转储信息", apiName = "获取物料的转储信息") public ApiResult> search(@Valid @RequestBody TransferOrderSearchQO request) { - PageData pageData = transferOrdersService.search(request); - return ApiResult.success(pageData); + return ApiResult.success( transferOrdersService.search(request)); } /** diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 5d1ac014..14a67d1b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -29,10 +29,7 @@ import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.*; -import com.nflg.wms.repository.service.IWmsPoReceiptItemService; -import com.nflg.wms.repository.service.IWmsPoReceiptService; -import com.nflg.wms.repository.service.IWmsSrmOrderItemService; -import com.nflg.wms.repository.service.IWmsSrmOrderService; +import com.nflg.wms.repository.service.*; import com.nflg.wms.starter.BaseController; import com.nflg.wms.starter.annotation.ApiMark; import jakarta.annotation.Resource; @@ -80,6 +77,15 @@ public class NormalPGIController extends BaseController { @Resource private IWmsPoReceiptItemService wmsPoReceiptItemService; + @Resource + private IWmsPackageService wmsPackageService; + + @Resource + private IWmsPackageItemService wmsPackageItemService; + + @Resource + private IWmsQrCodeMasterService wmsQrCodeMasterService; + //收货单分页 /** @@ -1077,4 +1083,29 @@ public class NormalPGIController extends BaseController { return ApiResult.success(); } + //------------------------------------通过大包物料扫码收货------------------------------------ + +// @PostMapping("scanPackage") +// @ApiMark(moduleName = "打包扫码", apiName = "通过打包码获取到打包码的信息") +// public ApiResult scanPackage(@Valid @RequestBody StrappingQO request) { +// +// } +// +// @PostMapping("getPackageOrders") +// @ApiMark(moduleName = "获取打包码对应的送货单信息", apiName = "获取打包码对应的送货单信息") +// public ApiResult scanPackage(@Valid @RequestBody StrappingQO request) { +// +// } +// +// @PostMapping("getPackageOrderItems") +// @ApiMark(moduleName = "根据送货单单号和大码的ID获取到具体的物料信息", apiName = "根据送货单单号和大码的ID获取到具体的物料信息") +// public ApiResult scanPackage(@Valid @RequestBody StrappingQO request) { +// +// } +// +// @PostMapping("getPackageOrderItems") +// @ApiMark(moduleName = "根据送货单单号和大码的ID获取到具体的物料信息", apiName = "根据送货单单号和大码的ID获取到具体的物料信息") +// public ApiResult scanPackage(@Valid @RequestBody StrappingQO request) { +// +// } } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java index 1b4f98e8..53cd15b4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java @@ -139,8 +139,7 @@ public class PackingController extends BaseController { @PostMapping("search") @ApiMark(moduleName = "获取包装码信息", apiName = "获取包装码信息") public ApiResult> search(@Valid @RequestBody PackingSearchQO request) { - PageData pageData = packageService.serach(request); - return ApiResult.success(pageData); + return ApiResult.success(packageService.serach(request)); } /** 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 d2f7e9bf..ab5b1da2 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 @@ -222,7 +222,7 @@ public class PurchaseReturnController extends BaseController { .set(WmsReturnRequest::getApproverId, UserUtil.getUserId()) .set(WmsReturnRequest::getApproverName, UserUtil.getUserName()) .eq(WmsReturnRequest::getId, request.getId()) - .update(returnRequest); + .update(); return ApiResult.success(); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java index 58958119..5220e449 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java @@ -33,6 +33,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; + /** * 装箱管理 * @author: nflg @@ -52,15 +53,14 @@ public class QrCodeMasterController extends BaseController { @PostMapping("search") @ApiMark(moduleName = "获取二维码详细信息", apiName = "获取二维码详细信息") public ApiResult> search(@Valid @RequestBody QrCodeItemSearchQO request) { - PageData pageData = qrCodeMasterService.search(request); - return ApiResult.success(pageData); + + return ApiResult.success(qrCodeMasterService.search(request)); } @PostMapping("childrens") @ApiMark(moduleName = "获取箱内的物料信息", apiName = "获取箱内物料信息") public ApiResult> getSmallQrcode(@Valid @RequestBody FilterIdSearchQO request) { - PageData pageData = qrCodeMasterService.getChildrens(request); - return ApiResult.success(pageData); + return ApiResult.success(qrCodeMasterService.getChildrens(request)); } /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoItemVO.java new file mode 100644 index 00000000..bb8c3f38 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoItemVO.java @@ -0,0 +1,93 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +@Data +@Accessors(chain = true) +public class PacagePoItemVO { + private Long id; + + /** + * 订单id + */ + private Long orderId; + + /** + * 送货单行号 + */ + private String lineNumber; + + /** + * 采购订单号 + */ + private String poNum; + + /** + * 采购订单行号 + */ + private String poLineNumber; + + /** + * 物料编码 + */ + private String itemCode; + + /** + * 物料描述 + */ + private String itemName; + + /** + * 订单数量 + */ + private BigDecimal orderQty; + + /** + * 单位 + */ + private String uomCode; + + /** + * 订单需求日期 + */ + private String demandDate; + + /** + * 送货数量 + */ + private BigDecimal deliveryQty; + + /** + * 送货单行状态 + */ + private String noteLineStatus; + + /** + * 采购订单类型 + */ + private String orderType; + + /** + * 是否质检 + */ + private Boolean isQuality; + + /** + * 已收货数量 + */ + private BigDecimal receiptQty; + + /** + * 收货单号 + */ + private String noteNum; + + + /** + * 是否需要点数 + */ + private String isCounting; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoVO.java new file mode 100644 index 00000000..66474b73 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoVO.java @@ -0,0 +1,28 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class PacagePoVO { + /** + * 送货单号 + */ + private Long deliveryId; + + /** + * 送货单号 + */ + private String deliveryNo; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 是否需要点数 + */ + private String isCounting; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacageScanVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacageScanVO.java new file mode 100644 index 00000000..54e629a1 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacageScanVO.java @@ -0,0 +1,37 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 扫描的大码信息 + */ +@Data +@Accessors(chain = true) +public class PacageScanVO { + private Long id; + + /** + * 包装编号 + */ + private String packageCode; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 包装名称 + */ + private String packageName; + + + /** + * 是否需要点数 0 不需要点数；1 需要点数 + */ + private Integer isCounting; + +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PendingScanningVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PendingScanningVO.java new file mode 100644 index 00000000..65babab6 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PendingScanningVO.java @@ -0,0 +1,86 @@ +package com.nflg.wms.common.pojo.vo; + +import com.baomidou.mybatisplus.annotation.Version; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 待扫描物料VO + */ +@Data +@Accessors(chain = true) +public class PendingScanningVO { + private Long barcodeId; + + /** + * 条码编号(可读) + */ + private String barcodeCode; + + /** + * 物料编号 + */ + private String materialCode; + + /** + * 物料描述 + */ + private String materialDescription; + + + /** + * 送货数量 + */ + private BigDecimal packingQuantity; + + /** + * 待扫数量 + */ + private BigDecimal pendingScanQuantity; + + + /** + * 单位 + */ + private String unit; + + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 采购单号 + */ + private String poNumber; + + /** + * 采购单行号 + */ + private String poLineNumber; + + /** + * 条码类型(物料码、箱码) 0 物料码；1 箱码 + */ + private Short packagingType; + + /** + * 默认为0 ，如果存在包装的情况，此处为包装的条码ID号 + */ + private Long parentBarcodeId; + + /** + * 送货单单号 + */ + private String deliveryNo; + + /** + * 送货单行号 + */ + private String deliveryLineNo; + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsPackageMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsPackageMapper.java index ec805b5d..02c014d2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsPackageMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsPackageMapper.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.PageData; import com.nflg.wms.common.pojo.qo.PackingQO; @@ -23,7 +24,7 @@ public interface WmsPackageMapper extends BaseMapper { List getPackageContent(Long id); - PageData search(PackingSearchQO request, Page objectPage); + IPage search(PackingSearchQO request, Page objectPage); List getChildPackageContent(Long id); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQrCodeMasterMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQrCodeMasterMapper.java index cc74baf9..7e15eac1 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQrCodeMasterMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQrCodeMasterMapper.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.PageData; import com.nflg.wms.common.pojo.qo.FilterIdSearchQO; @@ -18,7 +19,7 @@ import com.nflg.wms.repository.entity.WmsQrCodeMaster; */ public interface WmsQrCodeMasterMapper extends BaseMapper { - PageData search(QrCodeItemSearchQO request, Page objectPage); + IPage search(QrCodeItemSearchQO request, Page objectPage); - PageData getChildrens(FilterIdSearchQO request, Page objectPage); + IPage getChildrens(FilterIdSearchQO request, Page objectPage); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferOrdersMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferOrdersMapper.java index d08d2b89..b8ca8a57 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferOrdersMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferOrdersMapper.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.PageData; import com.nflg.wms.common.pojo.qo.TransferOrderSearchQO; @@ -17,5 +18,5 @@ import com.nflg.wms.repository.entity.WmsTransferOrders; */ public interface WmsTransferOrdersMapper extends BaseMapper { - PageData search(TransferOrderSearchQO request, Page objectPage); + IPage search(TransferOrderSearchQO request, Page objectPage); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsPackageService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsPackageService.java index 9bea9db2..9b947d6e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsPackageService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsPackageService.java @@ -1,5 +1,6 @@ package com.nflg.wms.repository.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.PackingQO; import com.nflg.wms.common.pojo.qo.PackingSearchQO; @@ -31,7 +32,7 @@ public interface IWmsPackageService extends IService { void unpackingDel(Long id, List qrCodeMasters,Long packageId); - PageData serach(@Valid PackingSearchQO request); + IPage serach(@Valid PackingSearchQO request); List getChildPackageContent(@NotNull Long id); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsQrCodeMasterService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsQrCodeMasterService.java index b9e2245e..f208fd64 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsQrCodeMasterService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsQrCodeMasterService.java @@ -1,5 +1,6 @@ package com.nflg.wms.repository.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.InventoryDTO; import com.nflg.wms.common.pojo.dto.QrCodeMasterPrintDTO; @@ -34,9 +35,9 @@ public interface IWmsQrCodeMasterService extends IService { void transferLocation(List allQcMasters, List inBoundInventory, List outBoundInventory, List transferOrders); - PageData search(@Valid QrCodeItemSearchQO request); + IPage search(@Valid QrCodeItemSearchQO request); - PageData getChildrens(@Valid FilterIdSearchQO request); + IPage getChildrens(@Valid FilterIdSearchQO request); List getByExtendId(Long orderId); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferOrdersService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferOrdersService.java index cadd4da2..b4d109fe 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferOrdersService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferOrdersService.java @@ -1,5 +1,6 @@ package com.nflg.wms.repository.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.TransferOrderSearchQO; import com.nflg.wms.common.pojo.vo.TransferOrderVO; @@ -17,5 +18,5 @@ import jakarta.validation.Valid; */ public interface IWmsTransferOrdersService extends IService { - PageData search(@Valid TransferOrderSearchQO request); + IPage search(@Valid TransferOrderSearchQO request); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsPackageServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsPackageServiceImpl.java index 37e80c54..0789e9d0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsPackageServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsPackageServiceImpl.java @@ -2,6 +2,7 @@ package com.nflg.wms.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.constant.BarCodeProcessStage; import com.nflg.wms.common.pojo.PageData; @@ -97,7 +98,7 @@ public class WmsPackageServiceImpl extends ServiceImpl serach(PackingSearchQO request) { + public IPage serach(PackingSearchQO request) { return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQrCodeMasterServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQrCodeMasterServiceImpl.java index d7bd0092..e5d84940 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQrCodeMasterServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQrCodeMasterServiceImpl.java @@ -1,6 +1,7 @@ package com.nflg.wms.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.constant.BarCodeProcessStage; @@ -133,12 +134,12 @@ public class WmsQrCodeMasterServiceImpl extends ServiceImpl search(QrCodeItemSearchQO request) { + public IPage search(QrCodeItemSearchQO request) { return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); } @Override - public PageData getChildrens(FilterIdSearchQO request) { + public IPage getChildrens(FilterIdSearchQO request) { return baseMapper.getChildrens(request, new Page<>(request.getPage(), request.getPageSize())); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferOrdersServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferOrdersServiceImpl.java index 39e94261..0ba2de0a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferOrdersServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferOrdersServiceImpl.java @@ -1,5 +1,6 @@ package com.nflg.wms.repository.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.TransferOrderSearchQO; @@ -22,7 +23,7 @@ import org.springframework.stereotype.Service; public class WmsTransferOrdersServiceImpl extends ServiceImpl implements IWmsTransferOrdersService { @Override - public PageData search(TransferOrderSearchQO request) { + public IPage search(TransferOrderSearchQO request) { return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml index 5ded1a86..66604ac8 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml @@ -28,7 +28,7 @@