From 4a1909a74527e6b1b56742f4a19a0bc9ca4a4165 Mon Sep 17 00:00:00 2001 From: zhangke Date: Fri, 6 Mar 2026 08:37:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=93=E5=8C=85=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/NormalPGIController.java | 127 +++++++++++------- .../admin/controller/PackingController.java | 1 + .../controller/QrCodeMasterController.java | 2 +- .../service/NormalPGIControllerService.java | 64 +++++++++ .../wms/common/pojo/dto/PackagePOItemDTO.java | 49 +++++++ .../wms/common/pojo/qo/PendingScanningQO.java | 12 +- .../common/pojo/qo/PendingUnScanningQO.java | 4 +- .../wms/common/pojo/qo/QRCodeSearchQO.java | 4 +- .../wms/repository/entity/WmsPackage.java | 2 +- .../wms/repository/entity/WmsPackageItem.java | 7 +- .../repository/mapper/WmsPackageMapper.java | 3 + .../service/IWmsPackageService.java | 4 + .../service/impl/WmsPackageServiceImpl.java | 6 + .../resources/mapper/WmsPackageMapper.xml | 18 +++ .../wms/repository/CodeGeneratorTest.java | 2 +- 15 files changed, 250 insertions(+), 55 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackagePOItemDTO.java 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 a1c79cbe..55afef09 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 @@ -1274,7 +1274,8 @@ public class NormalPGIController extends BaseController { * @param request * @return */ - @PostMapping("scanPackage") + @Deprecated + @PostMapping("scanPackage1") @ApiMark(moduleName = "打包扫码", apiName = "通过打包码获取到打包码的信息") public ApiResult scanPackage(@Valid @RequestBody PackingPDASearchQO request) { // 首先判断当前包是否已经收货了 @@ -1291,6 +1292,7 @@ public class NormalPGIController extends BaseController { * @param request * @return */ + @Deprecated @PostMapping("getPackageOrders") @ApiMark(moduleName = "获取打包码对应的送货单信息", apiName = "获取打包码对应的送货单信息") public ApiResult> getPackageOrders(@Valid @RequestBody FilterIdQO request) { @@ -1302,6 +1304,7 @@ public class NormalPGIController extends BaseController { * @param request * @return */ + @Deprecated @PostMapping("getPackageOrderItems") @ApiMark(moduleName = "根据送货单单号和大码的ID获取到具体的物料信息", apiName = "根据送货单单号和大码的ID获取到具体的物料信息") public ApiResult> getPackageOrderItems(@Valid @RequestBody PackagePoSearchQO request) { @@ -1313,6 +1316,7 @@ public class NormalPGIController extends BaseController { * @param request id= 大码的ID * @return */ + @Deprecated @PostMapping("getPendingScanningItems") @ApiMark(moduleName = "根据送货单单号和大码的ID获取到具体的物料信息", apiName = "根据送货单单号和大码的ID获取到具体的物料信息") public ApiResult> getPendingScanningItems(@Valid @RequestBody FilterIdQO request) { @@ -1327,63 +1331,92 @@ public class NormalPGIController extends BaseController { return ApiResult.success(list); } + + /** + * 通过打包码获取到物料信息 + * @param request + * @return + */ + @PostMapping("scanPackage") + @ApiMark(moduleName = "打包扫码", apiName = "通过打包码获取到打包码的信息") + public ApiResult> getPackageContents(@Valid @RequestBody PackingPDASearchQO request) { + // 首先判断当前包是否已经收货了 + PacageScanVO pacageScanVO = wmsPackageService.getPackageInfo(request.getPackageCode()); + VUtil.trueThrowBusinessError(ObjectUtil.isNull(pacageScanVO)).throwMessage("打包码不存在"); + VUtil.trueThrowBusinessError(pacageScanVO.getPackageStatus() == 0).throwMessage("此打包码尚未打包"); + VUtil.trueThrowBusinessError(pacageScanVO.getPackageStatus() == 2).throwMessage("此打包码已完成收货"); + + List pdaOrderVO = normalPGIControllerService.getPackageContents(request.getPackageCode()); + return ApiResult.success(pdaOrderVO); + } + + /** + * 确认收货(无需扫码) + * @param request + * @return + */ @PostMapping("takeDeliveryConfirmUnScan") @ApiMark(moduleName = "无需扫码收货", apiName = "无需扫码收货") public ApiResult takeDeliveryConfirmUnScan(@Valid @RequestBody PendingUnScanningQO request) { - VUtil.trueThrowBusinessError(request.getBarcodeIds().stream().distinct().count() != request.getBarcodeIds().size()).throwMessage("存在重复的码"); - // 重新验证所有码的合法性 1、是否是已打包未收货的状态；2、是否全部是已启用储位管理的状态 - List pacageScanVO = wmsPackageService.getPackageInfos(request.getBarcodeIds()); - VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(pacageScanVO)).throwMessage("打包码不存在"); - - long count = pacageScanVO.stream() - .filter(pkg -> Objects.equals(pkg.getPackageStatus(), (short) 0)) - .count(); - VUtil.trueThrowBusinessError(count >= 0).throwMessage("存在尚未打包的码"); - long count1 = pacageScanVO.stream() - .filter(pkg -> Objects.equals(pkg.getPackageStatus(), (short) 2)) - .count(); - VUtil.trueThrowBusinessError(count1 >= 0).throwMessage("存在已经收货的码"); - - long count2 = pacageScanVO.stream() - .filter(pkg -> Objects.equals(pkg.getIsCounting(), 1)) - .count(); - VUtil.trueThrowBusinessError(count2 >= 0).throwMessage("存在必须扫码的包装"); - List items = wmsPackageService.getScanningItems(request.getBarcodeIds()); - //对箱码要做出来，将箱码换成对应的物料码 - List materialCodes = items.stream().filter(item -> Objects.equals(item.getPackagingType(), 1)) - .map(item -> item.getBarcodeId()) - .distinct() - .collect(Collectors.toList()); -// List qrCodeMasters = wmsQrCodeMasterService.getByMaterialCodes(materialCodes); -// if(CollectionUtil.isEmpty(materialCodes)) -// { -// //计算箱内物料的数量，并判断是否是打包状态 +// VUtil.trueThrowBusinessError(request.getBarcodeIds().stream().distinct().count() != request.getBarcodeIds().size()).throwMessage("存在重复的码"); +// // 重新验证所有码的合法性 1、是否是已打包未收货的状态；2、是否全部是已启用储位管理的状态 +// List pacageScanVO = wmsPackageService.getPackageInfos(request.getBarcodeIds()); +// VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(pacageScanVO)).throwMessage("打包码不存在"); +// +// long count = pacageScanVO.stream() +// .filter(pkg -> Objects.equals(pkg.getPackageStatus(), (short) 0)) +// .count(); +// VUtil.trueThrowBusinessError(count >= 0).throwMessage("存在尚未打包的码"); +// long count1 = pacageScanVO.stream() +// .filter(pkg -> Objects.equals(pkg.getPackageStatus(), (short) 2)) +// .count(); +// VUtil.trueThrowBusinessError(count1 >= 0).throwMessage("存在已经收货的码"); +// +// long count2 = pacageScanVO.stream() +// .filter(pkg -> Objects.equals(pkg.getIsCounting(), 1)) +// .count(); +// VUtil.trueThrowBusinessError(count2 >= 0).throwMessage("存在必须扫码的包装"); +// List items = wmsPackageService.getScanningItems(request.getBarcodeIds()); +// //对箱码要做出来，将箱码换成对应的物料码 +// List materialCodes = items.stream().filter(item -> Objects.equals(item.getPackagingType(), 1)) +// .map(item -> item.getBarcodeId()) +// .distinct() +// .collect(Collectors.toList()); +//// List qrCodeMasters = wmsQrCodeMasterService.getByMaterialCodes(materialCodes); +//// if(CollectionUtil.isEmpty(materialCodes)) +//// { +//// //计算箱内物料的数量，并判断是否是打包状态 +//// +//// +//// +//// } // // +// //根据包装信息获取对应的物料收货信息 +// List receiptQOS = new ArrayList<>(); +// //首先要对上面的信息 按照 srmId进行分组，汇总quantity // +// for (PendingScanningItemDTO item : items) { +// SrmMaterialReceiptQO qo = new SrmMaterialReceiptQO() +// .setNoteNum(item.getDeliveryNo()) +// .setLineNumber(item.getDeliveryLineNo()) +// .setPoNum(item.getPoNumber()) +// .setPoLineNumber(item.getPoLineNumber()) +// .setItemCode(item.getMaterialCode()) +// .setId(item.getSrmId()) +// .setReceiptNum(item.getQuantity()); +// +// // .setScanCodes(item.getScanCodes()); // } - - //根据包装信息获取对应的物料收货信息 - List receiptQOS = new ArrayList<>(); - //首先要对上面的信息 按照 srmId进行分组，汇总quantity - - for (PendingScanningItemDTO item : items) { - SrmMaterialReceiptQO qo = new SrmMaterialReceiptQO() - .setNoteNum(item.getDeliveryNo()) - .setLineNumber(item.getDeliveryLineNo()) - .setPoNum(item.getPoNumber()) - .setPoLineNumber(item.getPoLineNumber()) - .setItemCode(item.getMaterialCode()) - .setId(item.getSrmId()) - .setReceiptNum(item.getQuantity()); - - // .setScanCodes(item.getScanCodes()); - } - return ApiResult.success(); } + /** + * 确认收货(需扫码) + * @param request + * @return + */ @PostMapping("takeDeliveryConfirmByScan") @ApiMark(moduleName = "需扫码收货", apiName = "需扫码收货") public ApiResult takeDeliveryConfirmByScan(@Valid @RequestBody List 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 72a211de..5175fc31 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 @@ -379,6 +379,7 @@ public class PackingController extends BaseController { item.setDeliveryNo(qo.getDeliveryNo()); item.setDeliveryLineNo(qo.getDeliveryLineNo()); item.setSrmOrderItemId(qo.getSrmOrderItemId()); + item.setPackageStatus((short)0); item.setCreateUserId(UserUtil.getUserId()); item.setCreateUserName(UserUtil.getUserName()); item.setCreateTime(LocalDateTime.now()); 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 58371fae..f3c20b00 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 @@ -301,7 +301,7 @@ public class QrCodeMasterController extends BaseController { public ApiResult scan(@Valid @RequestBody QRCodeSearchQO request) { WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getBarcodeCode, request.getPackageCode()) - .eq(WmsQrCodeMaster::getProcessStage, request.getProcessStage()) + .in(WmsQrCodeMaster::getProcessStage, request.getProcessStage()) .one(); //判断是否为有效码 VUtil.trueThrowBusinessError(ObjectUtil.isNull(qrCodeMaster)).throwMessage("无效码"); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java index ab3f680f..e2d0b3da 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java @@ -20,6 +20,8 @@ import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.*; import com.nflg.wms.repository.service.*; import jakarta.annotation.Resource; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.ParameterizedTypeReference; import org.springframework.data.redis.core.StringRedisTemplate; @@ -99,6 +101,9 @@ public class NormalPGIControllerService { @Resource private IWmsQcReceiveItemService wmsQcReceiveItemService; + @Resource + private IWmsPackageService wmsPackageService; + /** * 根据订单编号获取订单详情信息，包括订单头信息和订单行项目信息。 *

@@ -111,6 +116,7 @@ public class NormalPGIControllerService { * @throws Exception 查询或业务处理过程中可能抛出的异常 */ public PDAOrderVO getOrderItemByOrderNo(@RequestParam String orderNo) { + /// TODO // 根据订单编号查询订单主表信息 WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getNoteNum, orderNo) .eq(WmsSrmOrder::getIsCompleted, false).one(); @@ -537,4 +543,62 @@ public class NormalPGIControllerService { return srmToken; } + public List getPackageContents(@NotNull @NotBlank String packageCode) { +// List packagePOItems = wmsPackageService.getPackagePOItems(packageCode); +// VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(packagePOItems)).throwMessage("获取打包物料信息异常"); +// +// +// // 根据订单编号查询订单主表信息 +// WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getNoteNum, orderNo) +// .eq(WmsSrmOrder::getIsCompleted, false).one(); +// VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("此收货单[" + orderNo + "] 单号无效"); +// +// PDAOrderVO pdaOrderVO = new PDAOrderVO(); +// // 设置订单头基本信息 +// pdaOrderVO.setNoteNum(order.getNoteNum()); +// pdaOrderVO.setSupplierNum(order.getSupplierNum()); +// pdaOrderVO.setSupplierName(order.getSupplierName()); +// +// // 查询订单行项目列表 +// List orderItemList = wmsSrmOrderItemService.lambdaQuery() +// .eq(WmsSrmOrderItem::getOrderId, order.getId()) +// .list(); +// VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orderItemList)).throwMessage("此收货单[" + orderNo + "] 已完成收货，无需再次操作"); +// +// List orderItemVOList = new ArrayList<>(); +// // 遍历订单行项目，填充详细信息并从 SAP 获取补充数据 +// for (WmsSrmOrderItem item : orderItemList) { +// PDAOrderItemVO itemVO = new PDAOrderItemVO(); +// itemVO.setId(item.getId()); +// itemVO.setPoLineNumber(item.getPoLineNumber()); +// itemVO.setPoNum(item.getPoNum()); +// itemVO.setItemCode(item.getItemCode()); +// itemVO.setItemName(item.getItemName()); +// itemVO.setIsQuality(item.getIsQuality()); +// itemVO.setOrderQty(item.getOrderQty()); +// itemVO.setUomCode(item.getUomCode()); +// itemVO.setLineNumber(item.getLineNumber()); +// itemVO.setDeliveryQty(item.getDeliveryQty().subtract(item.getReceiptQty())); +// // 从 SAP 系统获取物料相关信息 +// SAPSyncParamsDTO syncParamsDTO = sapCommonService.getMaterialInfoInOrder(item.getPoNum(), +// order.getSupplierNum(), item.getItemCode(), item.getPoLineNumber()); +// if (Objects.nonNull(syncParamsDTO)) { +// itemVO.setItemName(syncParamsDTO.getMaktx()); +// itemVO.setUomCode(syncParamsDTO.getMeins()); +// itemVO.setOrderQty(syncParamsDTO.getMenge()); +// itemVO.setReceivedWarehouse(syncParamsDTO.getWarehouseNo()); +// itemVO.setBinNos(syncParamsDTO.getBinNos()); +// itemVO.setLbprt(syncParamsDTO.getLbprt()); +// itemVO.setTransportNum(syncParamsDTO.getTransportNum()); +// // 判断是否质检 +// boolean isQuality = "X".equals(syncParamsDTO.getKzkri()); +// itemVO.setIsQuality(isQuality); +// orderItemVOList.add(itemVO); +// } +// } +// // 设置订单行项目列表到返回对象中 +// pdaOrderVO.setOrderItemVOList(orderItemVOList); + // return pdaOrderVO; + return null; + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackagePOItemDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackagePOItemDTO.java new file mode 100644 index 00000000..3ef94188 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackagePOItemDTO.java @@ -0,0 +1,49 @@ +package com.nflg.wms.common.pojo.dto; + +import com.baomidou.mybatisplus.annotation.Version; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@Accessors(chain = true) +public class PackagePOItemDTO { + /** + * 物料编号 + */ + private String materialCode; + + /** + * 物料描述 + */ + private String materialDescription; + + /** + * 送货单数量 + */ + private BigDecimal orderQty; + + /** + * 打包数量 + */ + private BigDecimal packingQuantity; + + + /** + * 采购单号 + */ + private String poNumber; + + /** + * 仓库 + */ + private String storageLocation; + + /** + * 送货单单号 + */ + private String deliveryNo; + +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingScanningQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingScanningQO.java index 23a761a4..b163cff7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingScanningQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingScanningQO.java @@ -14,7 +14,17 @@ public class PendingScanningQO { private Long barcodeId; /** - * 待扫数量 + * 物料二维码的编码 + */ + private String barcodeCode; + + /** + * 条码类型(物料码、箱码) 0 物料码；1 箱码 + */ + private Short packagingType; + + /** + * 扫码数量 */ private BigDecimal pendingScanQuantity; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingUnScanningQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingUnScanningQO.java index 0168c251..c38b606d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingUnScanningQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingUnScanningQO.java @@ -9,7 +9,7 @@ import java.util.List; @Accessors(chain = true) public class PendingUnScanningQO { /** - * 包装物ID + * 包装的二维码编号 */ - private List barcodeIds; + private String packageCode; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeSearchQO.java index 5b5a7243..8b24715a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QRCodeSearchQO.java @@ -5,6 +5,8 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + @Data @Accessors(chain = true) public class QRCodeSearchQO { @@ -26,5 +28,5 @@ public class QRCodeSearchQO { * OutBound((short) 7, "已出库"), //已被使用，只有退库的时候才会被重新激活 * Hold((short) 8, "已挂起");// 用于仓库转储，出库之后此二维码还需要继续使用，用一个特殊的状态标记 */ - private Short processStage; + private List processStage; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPackage.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPackage.java index 53ab4938..3a3070fc 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPackage.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPackage.java @@ -42,7 +42,7 @@ public class WmsPackage implements Serializable { private Short packageType; /** - * 状态 0 未打包；1 已打包；2 已收货 + * 状态 0 未打包；1 已打包；2 已收货；3 部分收货 */ private Short packageStatus; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPackageItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPackageItem.java index 73259d3c..d6d423aa 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPackageItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPackageItem.java @@ -67,7 +67,12 @@ public class WmsPackageItem implements Serializable { private String deliveryLineNo; /** - * SRM送货单对应的ID号,对应扫描的时候返回的id + * SRM送货单对应的ID号 */ private Long srmOrderItemId; + + /** + * 状态 0 未收货；2 已收货； + */ + private Short packageStatus; } 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 b297fb68..5e37170e 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 @@ -4,6 +4,7 @@ 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.dto.PackagePOItemDTO; import com.nflg.wms.common.pojo.dto.PendingScanningItemDTO; import com.nflg.wms.common.pojo.qo.PackingQO; import com.nflg.wms.common.pojo.qo.PackingSearchQO; @@ -39,4 +40,6 @@ public interface WmsPackageMapper extends BaseMapper { List getPackageInfos(List barcodeIds); List getScanningItems(List barcodeIds); + + List getPackagePOItems(String packageCode); } 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 8120b958..9f0ab0ff 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 @@ -2,6 +2,7 @@ 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.PackagePOItemDTO; import com.nflg.wms.common.pojo.dto.PendingScanningItemDTO; import com.nflg.wms.common.pojo.qo.PackingQO; import com.nflg.wms.common.pojo.qo.PackingSearchQO; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.repository.entity.WmsPackageItem; import com.nflg.wms.repository.entity.WmsQrCodeMaster; import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.util.List; @@ -47,4 +49,6 @@ public interface IWmsPackageService extends IService { List getPackageInfos(List barcodeIds); List getScanningItems(List barcodeIds); + + List getPackagePOItems(@NotNull @NotBlank String packageCode); } 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 341b77dd..be7bfa6e 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 @@ -6,6 +6,7 @@ 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; +import com.nflg.wms.common.pojo.dto.PackagePOItemDTO; import com.nflg.wms.common.pojo.dto.PendingScanningItemDTO; import com.nflg.wms.common.pojo.qo.PackingQO; import com.nflg.wms.common.pojo.qo.PackingSearchQO; @@ -137,5 +138,10 @@ public class WmsPackageServiceImpl extends ServiceImpl getPackagePOItems(String packageCode) { + return baseMapper.getPackagePOItems(packageCode); + } + } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml index 4eeadaba..6d43e126 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml @@ -176,4 +176,22 @@ #{id} + + diff --git a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java index f3962772..9db40f53 100644 --- a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java +++ b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java @@ -33,7 +33,7 @@ public class CodeGeneratorTest { ) .strategyConfig(builder -> { builder - .addInclude("wms_warehouse") //只生成指定表 + .addInclude("wms_package") //只生成指定表 .entityBuilder().idType(IdType.ASSIGN_ID) .enableLombok() .enableChainModel()