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

修改分页的类型

This commit is contained in:
zhangke 2026-03-03 16:12:55 +08:00
parent 1f839eb9a0
commit 0031d7d37b
19 changed files with 308 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java
View File

@ -61,8 +61,7 @@ public class LocationTransferController extends BaseController {
@PostMapping("search")
@ApiMark(moduleName = "获取转储信息", apiName = "获取物料的转储信息")
public ApiResult<PageData<TransferOrderVO>> search(@Valid @RequestBody TransferOrderSearchQO request) {
PageData<TransferOrderVO> pageData = transferOrdersService.search(request);
return ApiResult.success(pageData);
return ApiResult.success( transferOrdersService.search(request));
}
/**

39
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -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<PacageScanVO> scanPackage(@Valid @RequestBody StrappingQO request) {
//
// }
//
// @PostMapping("getPackageOrders")
// @ApiMark(moduleName = "获取打包码对应的送货单信息", apiName = "获取打包码对应的送货单信息")
// public ApiResult<PacageScanVO> scanPackage(@Valid @RequestBody StrappingQO request) {
//
// }
//
// @PostMapping("getPackageOrderItems")
// @ApiMark(moduleName = "根据送货单单号和大码的ID获取到具体的物料信息", apiName = "根据送货单单号和大码的ID获取到具体的物料信息")
// public ApiResult<PacageScanVO> scanPackage(@Valid @RequestBody StrappingQO request) {
//
// }
//
// @PostMapping("getPackageOrderItems")
// @ApiMark(moduleName = "根据送货单单号和大码的ID获取到具体的物料信息", apiName = "根据送货单单号和大码的ID获取到具体的物料信息")
// public ApiResult<PacageScanVO> scanPackage(@Valid @RequestBody StrappingQO request) {
//
// }
}

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java
View File

@ -139,8 +139,7 @@ public class PackingController extends BaseController {
@PostMapping("search")
@ApiMark(moduleName = "获取包装码信息", apiName = "获取包装码信息")
public ApiResult<PageData<PackingVO>> search(@Valid @RequestBody PackingSearchQO request) {
PageData<PackingVO> pageData = packageService.serach(request);
return ApiResult.success(pageData);
return ApiResult.success(packageService.serach(request));
}
/**

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

@ -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();
}

8
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
View File

@ -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<PageData<QrCodeItemVO>> search(@Valid @RequestBody QrCodeItemSearchQO request) {
PageData<QrCodeItemVO> pageData = qrCodeMasterService.search(request);
return ApiResult.success(pageData);
return ApiResult.success(qrCodeMasterService.search(request));
}
@PostMapping("childrens")
@ApiMark(moduleName = "获取箱内的物料信息", apiName = "获取箱内物料信息")
public ApiResult<PageData<QrCodeItemVO>> getSmallQrcode(@Valid @RequestBody FilterIdSearchQO request) {
PageData<QrCodeItemVO> pageData = qrCodeMasterService.getChildrens(request);
return ApiResult.success(pageData);
return ApiResult.success(qrCodeMasterService.getChildrens(request));
}
/**

93
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoItemVO.java Normal file
View File

@ -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;
}

28
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacagePoVO.java Normal file
View File

@ -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;
}

37
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PacageScanVO.java Normal file
View File

@ -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;
}

86
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PendingScanningVO.java Normal file
View File

@ -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;
}

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsPackageMapper.java
View File

@ -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<WmsPackage> {
List<PackingItemPDAVO> getPackageContent(Long id);
PageData<PackingVO> search(PackingSearchQO request, Page<Object> objectPage);
IPage<PackingVO> search(PackingSearchQO request, Page<Object> objectPage);
List<PackingItemPDAVO> getChildPackageContent(Long id);
}

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

@ -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<WmsQrCodeMaster> {
PageData<QrCodeItemVO> search(QrCodeItemSearchQO request, Page<Object> objectPage);
IPage<QrCodeItemVO> search(QrCodeItemSearchQO request, Page<Object> objectPage);
PageData<QrCodeItemVO> getChildrens(FilterIdSearchQO request, Page<Object> objectPage);
IPage<QrCodeItemVO> getChildrens(FilterIdSearchQO request, Page<Object> objectPage);
}

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferOrdersMapper.java
View File

@ -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<WmsTransferOrders> {
PageData<TransferOrderVO> search(TransferOrderSearchQO request, Page<Object> objectPage);
IPage<TransferOrderVO> search(TransferOrderSearchQO request, Page<Object> objectPage);
}

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsPackageService.java
View File

@ -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<WmsPackage> {
void unpackingDel(Long id, List<WmsQrCodeMaster> qrCodeMasters,Long packageId);
PageData<PackingVO> serach(@Valid PackingSearchQO request);
IPage<PackingVO> serach(@Valid PackingSearchQO request);
List<PackingItemPDAVO> getChildPackageContent(@NotNull Long id);
}

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

@ -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<WmsQrCodeMaster> {
void transferLocation(List<WmsQrCodeMaster> allQcMasters, List<InventoryDTO> inBoundInventory, List<InventoryDTO> outBoundInventory, List<WmsTransferOrders> transferOrders);
PageData<QrCodeItemVO> search(@Valid QrCodeItemSearchQO request);
IPage<QrCodeItemVO> search(@Valid QrCodeItemSearchQO request);
PageData<QrCodeItemVO> getChildrens(@Valid FilterIdSearchQO request);
IPage<QrCodeItemVO> getChildrens(@Valid FilterIdSearchQO request);
List<WmsQrCodeMaster> getByExtendId(Long orderId);

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferOrdersService.java
View File

@ -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<WmsTransferOrders> {
PageData<TransferOrderVO> search(@Valid TransferOrderSearchQO request);
IPage<TransferOrderVO> search(@Valid TransferOrderSearchQO request);
}

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsPackageServiceImpl.java
View File

@ -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<WmsPackageMapper, WmsPack
}
@Override
public PageData<PackingVO> serach(PackingSearchQO request) {
public IPage<PackingVO> serach(PackingSearchQO request) {
return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize()));
}

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

@ -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<WmsQrCodeMasterMappe
}
@Override
public PageData<QrCodeItemVO> search(QrCodeItemSearchQO request) {
public IPage<QrCodeItemVO> search(QrCodeItemSearchQO request) {
return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize()));
}
@Override
public PageData<QrCodeItemVO> getChildrens(FilterIdSearchQO request) {
public IPage<QrCodeItemVO> getChildrens(FilterIdSearchQO request) {
return baseMapper.getChildrens(request, new Page<>(request.getPage(), request.getPageSize()));
}

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferOrdersServiceImpl.java
View File

@ -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<WmsTransferOrdersMapper, WmsTransferOrders> implements IWmsTransferOrdersService {
@Override
public PageData<TransferOrderVO> search(TransferOrderSearchQO request) {
public IPage<TransferOrderVO> search(TransferOrderSearchQO request) {
return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize()));
}
}

2
nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
View File

@ -28,7 +28,7 @@
<select id="search" resultType="com.nflg.wms.common.pojo.vo.PackingVO">
select a.*,b.supplier_code,b.supplier_name from wms_package a
inner join user_supplier b on a.supplier_id=b."id"
left join user_supplier b on a.supplier_id=b."id"
<where>
<if test="request.packingCode !=null and request.packingCode !=''">
and a.package_code ilike concat('%', #{request.packingCode}, '%')