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 9b53870f..a1c79cbe 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 @@ -1304,7 +1304,7 @@ public class NormalPGIController extends BaseController { */ @PostMapping("getPackageOrderItems") @ApiMark(moduleName = "根据送货单单号和大码的ID获取到具体的物料信息", apiName = "根据送货单单号和大码的ID获取到具体的物料信息") - public ApiResult> scanPackage(@Valid @RequestBody PackagePoSearchQO request) { + public ApiResult> getPackageOrderItems(@Valid @RequestBody PackagePoSearchQO request) { return ApiResult.success(wmsPackageService.getPackageOrderItems(request.getPackageId(), request.getDeliveryNo())); } @@ -1313,9 +1313,9 @@ public class NormalPGIController extends BaseController { * @param request id= 大码的ID * @return */ - @PostMapping("getPackageOrderItems") + @PostMapping("getPendingScanningItems") @ApiMark(moduleName = "根据送货单单号和大码的ID获取到具体的物料信息", apiName = "根据送货单单号和大码的ID获取到具体的物料信息") - public ApiResult> scanPackage(@Valid @RequestBody FilterIdQO request) { + public ApiResult> getPendingScanningItems(@Valid @RequestBody FilterIdQO request) { List list = wmsPackageService.getPendingScannings(request.getId()); if (CollectionUtil.isNotEmpty(list)) { list.forEach(vo -> { @@ -1350,14 +1350,25 @@ public class NormalPGIController extends BaseController { VUtil.trueThrowBusinessError(count2 >= 0).throwMessage("存在必须扫码的包装"); List items = wmsPackageService.getScanningItems(request.getBarcodeIds()); //对箱码要做出来，将箱码换成对应的物料码 - List<> + 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) - { + for (PendingScanningItemDTO item : items) { SrmMaterialReceiptQO qo = new SrmMaterialReceiptQO() .setNoteNum(item.getDeliveryNo()) .setLineNumber(item.getDeliveryLineNo()) @@ -1367,14 +1378,15 @@ public class NormalPGIController extends BaseController { .setId(item.getSrmId()) .setReceiptNum(item.getQuantity()); - // .setScanCodes(item.getScanCodes()); + // .setScanCodes(item.getScanCodes()); } - +return ApiResult.success(); } @PostMapping("takeDeliveryConfirmByScan") @ApiMark(moduleName = "需扫码收货", apiName = "需扫码收货") public ApiResult takeDeliveryConfirmByScan(@Valid @RequestBody List request) { + return ApiResult.success(); } } 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 53cd15b4..72a211de 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 @@ -96,7 +96,7 @@ public class PackingController extends BaseController { .eq(WmsPackage::getId, request.getId()) .one(); VUtil.trueThrowBusinessError(ObjectUtil.isNull(wmsPackage)).throwMessage("打包码不存在"); - VUtil.trueThrowBusinessError(wmsPackage.getSupplierId() != UserUtil.getUserId()).throwMessage("非登录供应商，不可编辑"); + // VUtil.trueThrowBusinessError(wmsPackage.getSupplierId() != UserUtil.getUserId()).throwMessage("非登录供应商，不可编辑"); VUtil.trueThrowBusinessError(wmsPackage.getPackageStatus() == 2).throwMessage("已收货，不可以编辑"); packageService.lambdaUpdate().eq(WmsPackage::getId, request.getId()) .set(WmsPackage::getPackageName, request.getPackingName()) @@ -117,10 +117,10 @@ public class PackingController extends BaseController { .in(WmsPackage::getId, request.getId()) .list(); - List suppers = wmsPackage.stream().filter(wmsPackage1 -> - wmsPackage1.getSupplierId().equals(UserUtil.getUserId())) - .collect(Collectors.toList()); - VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(suppers)).throwMessage("存在非当前供应商的包装码"); +// List suppers = wmsPackage.stream().filter(wmsPackage1 -> +// wmsPackage1.getSupplierId().equals(UserUtil.getUserId())) +// .collect(Collectors.toList()); +// VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(suppers)).throwMessage("存在非当前供应商的包装码"); List unPackings = wmsPackage.stream().filter(wmsPackage1 -> @@ -179,7 +179,7 @@ public class PackingController extends BaseController { // 首先判断当前包是否已经收货了 WmsPackage wmsPackage = packageService.lambdaQuery() .eq(WmsPackage::getPackageCode, request.getPackageCode()) - .eq(WmsPackage::getSupplierId, UserUtil.getUserId()) + // .eq(WmsPackage::getSupplierId, UserUtil.getUserId()) .one(); VUtil.trueThrowBusinessError(ObjectUtil.isNull(wmsPackage)).throwMessage("打包码不存在"); VUtil.trueThrowBusinessError(wmsPackage.getPackageStatus() == 2).throwMessage("此打包码已收货"); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PendingScanningItemDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PendingScanningItemDTO.java index a7c4ee2d..c6e7e6ae 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PendingScanningItemDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PendingScanningItemDTO.java @@ -65,4 +65,9 @@ public class PendingScanningItemDTO { * srm传入的送货单项ID */ private Long srmId; + + /** + * 物料码的二维码ID + */ + private Long barcodeId; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml index dc98ea85..4eeadaba 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml @@ -154,22 +154,23 @@