From cb53b606bba6b8570c85260c2f590b57e225681c Mon Sep 17 00:00:00 2001 From: zhangke Date: Wed, 27 Aug 2025 22:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=B8=B4=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=89=8D=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=81=94=E8=B0=83=EF=BC=8C=E5=B1=8F=E8=94=BDSAP?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/NormalPGIController.java | 484 +++++++++--------- .../admin/controller/NormalQMController.java | 8 +- .../service/NormalPGIControllerService.java | 13 +- .../wms/admin/service/SAPCommonService.java | 23 +- .../common/pojo/qo/SRMOrderReceiveItemQO.java | 2 +- .../wms/common/pojo/qo/SRMOrderSearchQO.java | 1 + .../nflg/wms/common/pojo/vo/QCReceiptVO.java | 4 +- .../nflg/wms/common/pojo/vo/SrmOrderVO.java | 6 + .../repository/entity/WmsSrmOrderItem.java | 2 +- .../resources/mapper/WmsSrmOrderMapper.xml | 2 +- .../srm/receive/controller/SRMController.java | 45 +- 11 files changed, 327 insertions(+), 263 deletions(-) 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 ff7bde43..d6d8640f 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 @@ -1,7 +1,7 @@ package com.nflg.wms.admin.controller; /** - 普通物料收货单 + * 普通物料收货单 */ import cn.hutool.core.collection.CollectionUtil; @@ -42,6 +42,10 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +/** + * 普通物料收货单 + */ + @RestController @RequestMapping("/pgi/normal") public class NormalPGIController extends BaseController { @@ -101,19 +105,6 @@ public class NormalPGIController extends BaseController { return ApiResult.success(srmOrderItemVOS); } - /** - * PDA扫描送货单号获取送货单详情 - * @param - * @return - */ - //PDA 扫码获取收货信息 - @GetMapping("getOrderItemByOrderNo") - @ApiMark(moduleName = "送货单管理", apiName = "PDA扫描送货单号获取送货单详情") - public ApiResult getOrderItemByOrderNo(@RequestParam String orderNo) { - PDAOrderVO pdaOrderVO = normalPGIControllerService.getOrderItemByOrderNo(orderNo); - return ApiResult.success(pdaOrderVO); - } - /** * 获取扫码的详情信息 * @param orderItemId @@ -128,6 +119,246 @@ public class NormalPGIController extends BaseController { return ApiResult.success(pdas); } + /** + * 扫描送货单号获取送货单详情（PDA） + * @param + * @return + */ + //PDA 扫码获取收货信息 + @GetMapping("PDA/getOrderItemByOrderNo") + @ApiMark(moduleName = "送货单管理", apiName = "PDA扫描送货单号获取送货单详情") + public ApiResult getOrderItemByOrderNo(@RequestParam String orderNo) { + PDAOrderVO pdaOrderVO = normalPGIControllerService.getOrderItemByOrderNo(orderNo); + return ApiResult.success(pdaOrderVO); + } + + /** + * 收货确认(PDA使用) + * + * @param request + * @return + */ + //收货确认 + @PostMapping("PDA/takeDelivery") + @ApiMark(moduleName = "送货单管理", apiName = "收货确认") + public ApiResult takeDelivery(@Valid @RequestBody List request) { + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("收货参数为空"); + WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getNoteNum, request.get(0).getNoteNum()).one(); + VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在"); + List sapSyncParamsDTOS = getSapSyncParamsDTOS(request, order); + WmsPoReceipt wmsPoReceipt = new WmsPoReceipt() + .setCreateTime(LocalDateTime.now()) + .setId(IdUtil.getSnowflakeNextId()) + .setOrderNo(order.getNoteNum()) + .setCreateUserName(UserUtil.getUserName()) + .setCreateUserId(UserUtil.getUserId()) + .setFactoryCode(order.getIuCode()) + .setIsCompleted(false); + + WmsQcReceive wmsQcReceive = new WmsQcReceive() + .setCreateTime(LocalDateTime.now()) + .setId(IdUtil.getSnowflakeNextId()) + .setIsCompleted((short) 0) + .setOrderNo(order.getNoteNum()) + .setCreateUserName(UserUtil.getUserName()) + .setFactoryCode(order.getIuCode()) + .setCreateUserId(UserUtil.getUserId()); + + List wmsPoReceiptItems = new ArrayList<>(); + + List wmsQcReceiveItems = new ArrayList<>(); + + List srmMaterialReceiptScanCodes = new ArrayList<>(); + List qcMaterialSyncDTOS = new ArrayList<>(); + + + for (SrmMaterialReceiptQO item : request) { + if (item.getReceiptNum().equals(BigDecimal.ZERO)) + continue; + + SAPSyncParamsDTO materialInfoInOrder = sapSyncParamsDTOS.stream() + .filter(sapSyncParamsDTO -> + sapSyncParamsDTO.getEbeln().equals(item.getPoNum()) + && sapSyncParamsDTO.getEbelp().equals(item.getPoLineNumber())) + .findFirst() + .orElse(null); + + //数量验证(判断收货数量是否大于了未收数量) + VUtil.trueThrowBusinessError(item.getReceiptNum().compareTo(materialInfoInOrder.getTransportNum()) > 0).throwMessage("物料收货数量[" + item.getReceiptNum() + "]大于了未收数量[" + materialInfoInOrder.getTransportNum() + "]，订单号：" + item.getPoNum()); + //序列号和批次号验证 + List codes = normalPGIControllerService.validateScanCodes(item, materialInfoInOrder); + if (CollectionUtil.isNotEmpty(codes)) { + srmMaterialReceiptScanCodes.addAll(codes); + } + boolean isQuality = materialInfoInOrder.getKzkri().equals("X"); + // 如果是质检单 + if (isQuality) { + setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId()); + } else { + setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder); + } + } + normalPGIControllerService.takeDelivery(wmsPoReceipt, wmsQcReceive, wmsPoReceiptItems, wmsQcReceiveItems, srmMaterialReceiptScanCodes, qcMaterialSyncDTOS, order.getId()); + return ApiResult.success(); + } + + /** + * 普通物料的上架任务（PDA） + * + * @return + */ + @GetMapping("PDA/task") + @ApiMark(moduleName = "送货单管理", apiName = "普通物料上架任务") + public ApiResult> takeDelivery(@Valid @RequestBody String orederNo) { + List wmsPoReceipts = wmsPoReceiptItemService.getTask(orederNo); + if (CollectionUtil.isNotEmpty(wmsPoReceipts)) { + return ApiResult.success(Convert.toList(PoReceiveTaskVO.class, wmsPoReceipts)); + } + return ApiResult.success(new ArrayList<>()); + } + + + /** + * 上架任务详情（PDA） + * */ + @GetMapping("PDA/task/item") + @ApiMark(moduleName = "送货单管理", apiName = "普通上架物料详情") + public ApiResult> takeDeliveryItem(@Valid @RequestBody Long taskId) { + List wmsPoReceipts = wmsPoReceiptItemService.lambdaQuery() + .eq(WmsPoReceiptItem::getReceiveId, taskId) + .list(); + if (CollectionUtil.isNotEmpty(wmsPoReceipts)) { + return ApiResult.success(Convert.toList(PoReceiveTaskItemVO.class, wmsPoReceipts)); + } else { + return ApiResult.success(new ArrayList<>()); + } + } + + /** + * 采购物料入库确认（PDA） + * @param request + * @return + */ + @PostMapping("PDA/task/confirm") + @ApiMark(moduleName = "送货单管理", apiName = "普通物料任务上架确认") + public ApiResult takeDeliveryConfirm(@Valid @RequestBody PoReceiveTaskConfirmQO request) { + + //首先判断是否已经确认 + WmsPoReceipt wmsPoReceipt = wmsPoReceiptService.getById(request.getTaskId()); + VUtil.trueThrowBusinessError(Objects.isNull(wmsPoReceipt)).throwMessage("收货单不存在"); + VUtil.trueThrowBusinessError(Objects.equals(wmsPoReceipt.getIsCompleted(), true)).throwMessage("此任务已入库"); + List uniqueIds = request.getItems().stream() + .map(PoReceiveTaskItemConfirmQO::getId) // 提取每个对象的 ID + .distinct() // 去重 + .collect(Collectors.toList()); + + List wmsPoReceiptItems = wmsPoReceiptItemService.lambdaQuery() + .in(WmsPoReceiptItem::getId, uniqueIds) + .list(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(wmsPoReceiptItems)).throwMessage("获取入库详情失败"); + List receiptItems = new ArrayList<>(); + List storageLocationDTOS = new ArrayList<>(); + List inventories = new ArrayList<>(); + List zwm3A17DTOS = new ArrayList<>(); + + for (WmsPoReceiptItem item : wmsPoReceiptItems) { + PoReceiveTaskItemConfirmQO qo = request.getItems().stream() + .filter(q -> q.getId().equals(item.getId())) + .findFirst() + .orElse(null); + if (Objects.isNull(qo)) + continue; + item.setCrossQty(qo.getCrossQty()); + item.setReceivedWarehouse(qo.getReceivedWarehouse()); + item.setInQty(item.getReceiptNum()); + item.setUpdateTime(LocalDateTime.now()); + item.setUpdateUserId(UserUtil.getUserId()); + item.setUpdateUserName(UserUtil.getUserName()); + receiptItems.add(item); + //储位处理 + if (!qo.getStorageLocation().equals(qo.getStorageLocationNew())) { + List bins = Arrays.asList(item.getStorageLocation().split("/")); + storageLocationDTOS.add(new StorageLocationDTO() + .setBinNos(bins) + .setMaterialNo(item.getItemCode()) + .setWarehouseNo(item.getReceivedWarehouse()) + .setFactory(wmsPoReceipt.getFactoryCode()) + ); + } + + // SAP 和条码处理 + //传入SAP的信息 + ZWM3A17DTO zwm3A17DTO = zwm3A17DTOS.stream() + .filter(zwm3A17DTO1 -> zwm3A17DTO1.getEbeln().equals(item.getPoNum())) + .findFirst() + .orElse(null); + if (Objects.isNull(zwm3A17DTO)) { + zwm3A17DTO = new ZWM3A17DTO() + .setEbeln(item.getPoNum()) + .setUsnam(UserUtil.getUserName()) + .setItem1(new ArrayList<>()) + .setItem2(new ArrayList<>()); + zwm3A17DTOS.add(zwm3A17DTO); + } + + List item1 = zwm3A17DTO.getItem1(); + List item2 = zwm3A17DTO.getItem2(); + + List scanCode = srmMaterialReceiptScanCodesRepository.findByOrderItemId(item.getOrderItemId().toString()); + if (CollectionUtil.isEmpty(scanCode)) { + scanCode.forEach(code -> { + // 库存 + InventoryDTO inventoryDTO = new InventoryDTO() + .setMaterialNo(item.getItemCode()) + .setFactoryNo(wmsPoReceipt.getFactoryCode()) + .setWarehouseNo(item.getReceivedWarehouse()) + .setBatchNumber(code.getBatchNumber()) + .setNum(code.getCodeNum()); + inventories.add(inventoryDTO); + + item1.add(new ZWM3A17Item1DTO() + .setEBELP(item.getPoLineNumber()) + .setMATNR(item.getItemCode()) + .setERFMG(code.getCodeNum()) + .setMEINS(item.getUomCode()) + .setCHARG(code.getBatchNumber()) + .setWERKS(wmsPoReceipt.getFactoryCode()) + .setLGORT(item.getReceivedWarehouse()) + .setKZKRI("") + ); + + item2.add(new ZWM3A17Item2DTO() + .setEBELP(item.getPoLineNumber()) + .setFLAG("") + .setFLAG(code.getSerialNumbers())); + }); + } else { + // 库存 + InventoryDTO inventoryDTO = new InventoryDTO() + .setMaterialNo(item.getItemCode()) + .setFactoryNo(wmsPoReceipt.getFactoryCode()) + .setWarehouseNo(item.getReceivedWarehouse()) + .setBatchNumber("") + .setNum(item.getInQty()); + inventories.add(inventoryDTO); + + item1.add(new ZWM3A17Item1DTO() + .setEBELP(item.getPoLineNumber()) + .setMATNR(item.getItemCode()) + .setERFMG(item.getInQty()) + .setMEINS(item.getUomCode()) + .setCHARG("") + .setWERKS(wmsPoReceipt.getFactoryCode()) + .setLGORT(item.getReceivedWarehouse()) + .setKZKRI("") + ); + } + } + normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId()); + return ApiResult.success(); + } + + private List getSapSyncParamsDTOS(List request, WmsSrmOrder order) { List> uniqueCombinations = request.stream() .map(item -> Triple.of(item.getPoNum(), order.getSupplierNum(), item.getItemCode())) @@ -294,7 +525,7 @@ public class NormalPGIController extends BaseController { content.setLineVOList(new ArrayList<>()); dto.setContent(content); dto.setCode("SCAN_RCV_RECEIVE_TO_SRM"); - qcDto.setPushDto(srmPushDto); + qcDto.setPushDto(dto); } srmPushDto = qcDto.getPushDto(); @@ -331,229 +562,6 @@ public class NormalPGIController extends BaseController { qcDto.getReceiptIds().add(qmsReceiptItem.getId()); } - - /** - * 收货确认(PDA使用) - * - * @param request - * @return - */ - //收货确认 - @PostMapping("takeDelivery") - @ApiMark(moduleName = "送货单管理", apiName = "收货确认") - public ApiResult takeDelivery(@Valid @RequestBody List request) { - VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("收货参数为空"); - WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getId, request.get(0).getNoteNum()).one(); - VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在"); - List sapSyncParamsDTOS = getSapSyncParamsDTOS(request, order); - WmsPoReceipt wmsPoReceipt = new WmsPoReceipt() - .setCreateTime(LocalDateTime.now()) - .setId(IdUtil.getSnowflakeNextId()) - .setOrderNo(order.getNoteNum()) - .setCreateUserName(UserUtil.getUserName()) - .setCreateUserId(UserUtil.getUserId()) - .setFactoryCode(order.getIuCode()) - .setIsCompleted(false); - - WmsQcReceive wmsQcReceive = new WmsQcReceive() - .setCreateTime(LocalDateTime.now()) - .setId(IdUtil.getSnowflakeNextId()) - .setIsCompleted((short) 0) - .setOrderNo(order.getNoteNum()) - .setCreateUserName(UserUtil.getUserName()) - .setFactoryCode(order.getIuCode()) - .setCreateUserId(UserUtil.getUserId()); - - List wmsPoReceiptItems = new ArrayList<>(); - - List wmsQcReceiveItems = new ArrayList<>(); - - List srmMaterialReceiptScanCodes = new ArrayList<>(); - List qcMaterialSyncDTOS = new ArrayList<>(); - - - for (SrmMaterialReceiptQO item : request) { - if (item.getReceiptNum().equals(BigDecimal.ZERO)) - continue; - - SAPSyncParamsDTO materialInfoInOrder = sapSyncParamsDTOS.stream() - .filter(sapSyncParamsDTO -> - sapSyncParamsDTO.getEbeln().equals(item.getPoNum()) - && sapSyncParamsDTO.getEbelp().equals(item.getPoLineNumber())) - .findFirst() - .orElse(null); - - //数量验证(判断收货数量是否大于了未收数量) - VUtil.trueThrowBusinessError(item.getReceiptNum().compareTo(materialInfoInOrder.getTransportNum()) > 0).throwMessage("物料收货数量[" + item.getReceiptNum() + "]大于了未收数量[" + materialInfoInOrder.getTransportNum() + "]，订单号：" + item.getPoNum()); - //序列号和批次号验证 - List codes = normalPGIControllerService.validateScanCodes(item, materialInfoInOrder); - if (CollectionUtil.isNotEmpty(codes)) { - srmMaterialReceiptScanCodes.addAll(codes); - } - boolean isQuality = materialInfoInOrder.getKzkri().equals("X"); - // 如果是质检单 - if (isQuality) { - setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId()); - } else { - setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder); - } - } - normalPGIControllerService.takeDelivery(wmsPoReceipt, wmsQcReceive, wmsPoReceiptItems, wmsQcReceiveItems, srmMaterialReceiptScanCodes, qcMaterialSyncDTOS, order.getId()); - return ApiResult.success(); - } - - /** - * 获取SRM同步参数 - * - * @param request - * @param order - * @return - */ - - @GetMapping("task") - @ApiMark(moduleName = "送货单管理", apiName = "普通物料上架任务") - public ApiResult> takeDelivery(@Valid @RequestBody String orederNo) { - List wmsPoReceipts = wmsPoReceiptItemService.getTask(orederNo); - if (CollectionUtil.isNotEmpty(wmsPoReceipts)) { - return ApiResult.success(Convert.toList(PoReceiveTaskVO.class, wmsPoReceipts)); - } - return ApiResult.success(new ArrayList<>()); - } - - - @GetMapping("task/item") - @ApiMark(moduleName = "送货单管理", apiName = "普通上架物料详情") - public ApiResult> takeDeliveryItem(@Valid @RequestBody Long taskId) { - List wmsPoReceipts = wmsPoReceiptItemService.lambdaQuery() - .eq(WmsPoReceiptItem::getReceiveId, taskId) - .list(); - if (CollectionUtil.isNotEmpty(wmsPoReceipts)) { - return ApiResult.success(Convert.toList(PoReceiveTaskItemVO.class, wmsPoReceipts)); - } else { - return ApiResult.success(new ArrayList<>()); - } - } - - @PostMapping("task/confirm") - @ApiMark(moduleName = "送货单管理", apiName = "普通物料任务上架确认") - public ApiResult takeDeliveryConfirm(@Valid @RequestBody PoReceiveTaskConfirmQO request) { - - //首先判断是否已经确认 - WmsPoReceipt wmsPoReceipt = wmsPoReceiptService.getById(request.getTaskId()); - VUtil.trueThrowBusinessError(Objects.isNull(wmsPoReceipt)).throwMessage("收货单不存在"); - VUtil.trueThrowBusinessError(Objects.equals(wmsPoReceipt.getIsCompleted(), true)).throwMessage("此任务已入库"); - List uniqueIds = request.getItems().stream() - .map(PoReceiveTaskItemConfirmQO::getId) // 提取每个对象的 ID - .distinct() // 去重 - .collect(Collectors.toList()); - - List wmsPoReceiptItems = wmsPoReceiptItemService.lambdaQuery() - .in(WmsPoReceiptItem::getId, uniqueIds) - .list(); - VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(wmsPoReceiptItems)).throwMessage("获取入库详情失败"); - List receiptItems = new ArrayList<>(); - List storageLocationDTOS = new ArrayList<>(); - List inventories = new ArrayList<>(); - List zwm3A17DTOS = new ArrayList<>(); - - for (WmsPoReceiptItem item : wmsPoReceiptItems) { - PoReceiveTaskItemConfirmQO qo = request.getItems().stream() - .filter(q -> q.getId().equals(item.getId())) - .findFirst() - .orElse(null); - if (Objects.isNull(qo)) - continue; - item.setCrossQty(qo.getCrossQty()); - item.setReceivedWarehouse(qo.getReceivedWarehouse()); - item.setInQty(item.getReceiptNum()); - item.setUpdateTime(LocalDateTime.now()); - item.setUpdateUserId(UserUtil.getUserId()); - item.setUpdateUserName(UserUtil.getUserName()); - receiptItems.add(item); - //储位处理 - if (!qo.getStorageLocation().equals(qo.getStorageLocationNew())) { - List bins = Arrays.asList(item.getStorageLocation().split("/")); - storageLocationDTOS.add(new StorageLocationDTO() - .setBinNos(bins) - .setMaterialNo(item.getItemCode()) - .setWarehouseNo(item.getReceivedWarehouse()) - .setFactory(wmsPoReceipt.getFactoryCode()) - ); - } - - // SAP 和条码处理 - //传入SAP的信息 - ZWM3A17DTO zwm3A17DTO = zwm3A17DTOS.stream() - .filter(zwm3A17DTO1 -> zwm3A17DTO1.getEbeln().equals(item.getPoNum())) - .findFirst() - .orElse(null); - if (Objects.isNull(zwm3A17DTO)) { - zwm3A17DTO = new ZWM3A17DTO() - .setEbeln(item.getPoNum()) - .setUsnam(UserUtil.getUserName()) - .setItem1(new ArrayList<>()) - .setItem2(new ArrayList<>()); - zwm3A17DTOS.add(zwm3A17DTO); - } - - List item1 = zwm3A17DTO.getItem1(); - List item2 = zwm3A17DTO.getItem2(); - - List scanCode = srmMaterialReceiptScanCodesRepository.findByOrderItemId(item.getOrderItemId().toString()); - if (CollectionUtil.isEmpty(scanCode)) { - scanCode.forEach(code -> { - // 库存 - InventoryDTO inventoryDTO = new InventoryDTO() - .setMaterialNo(item.getItemCode()) - .setFactoryNo(wmsPoReceipt.getFactoryCode()) - .setWarehouseNo(item.getReceivedWarehouse()) - .setBatchNumber(code.getBatchNumber()) - .setNum(code.getCodeNum()); - inventories.add(inventoryDTO); - - item1.add(new ZWM3A17Item1DTO() - .setEBELP(item.getPoLineNumber()) - .setMATNR(item.getItemCode()) - .setERFMG(code.getCodeNum()) - .setMEINS(item.getUomCode()) - .setCHARG(code.getBatchNumber()) - .setWERKS(wmsPoReceipt.getFactoryCode()) - .setLGORT(item.getReceivedWarehouse()) - .setKZKRI("") - ); - - item2.add(new ZWM3A17Item2DTO() - .setEBELP(item.getPoLineNumber()) - .setFLAG("") - .setFLAG(code.getSerialNumbers())); - }); - } else { - // 库存 - InventoryDTO inventoryDTO = new InventoryDTO() - .setMaterialNo(item.getItemCode()) - .setFactoryNo(wmsPoReceipt.getFactoryCode()) - .setWarehouseNo(item.getReceivedWarehouse()) - .setBatchNumber("") - .setNum(item.getInQty()); - inventories.add(inventoryDTO); - - item1.add(new ZWM3A17Item1DTO() - .setEBELP(item.getPoLineNumber()) - .setMATNR(item.getItemCode()) - .setERFMG(item.getInQty()) - .setMEINS(item.getUomCode()) - .setCHARG("") - .setWERKS(wmsPoReceipt.getFactoryCode()) - .setLGORT(item.getReceivedWarehouse()) - .setKZKRI("") - ); - } - } - normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId()); - return ApiResult.success(); - } - - /**** //一键收货 diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java index 0e4a0a46..32e66afc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java @@ -75,11 +75,11 @@ public class NormalQMController extends BaseController { } /** - * 质检物料上架任务 + * 质检物料上架任务（PDA） * @param orderNo * @return */ - @GetMapping("task") + @GetMapping("/PDA/task") @ApiMark(moduleName = "质检物料管理", apiName = "质检物料上架任务") public ApiResult> getTasks(@RequestParam String orderNo) { List tasks = wmsQcReceiveService.getTasks(orderNo); @@ -89,7 +89,7 @@ public class NormalQMController extends BaseController { /** * 质检物料上架物料详情 * **/ - @GetMapping("task/item") + @GetMapping("PDA/task/item") @ApiMark(moduleName = "质检物料管理", apiName = "质检任务上架物料详情") public ApiResult> getTaskItem(@Valid @NotNull @RequestParam Long taskId) { List tasks = normalQMControllerService.getTaskItem(taskId); @@ -99,7 +99,7 @@ public class NormalQMController extends BaseController { /** * 质检物料上架任务确认 * **/ - @PostMapping("task/confirm") + @PostMapping("PDA/task/confirm") @ApiMark(moduleName = "质检物料管理", apiName = "质检任务上架确认") public ApiResult confirm(@Valid @RequestBody List request) { if (CollectionUtil.isEmpty(request)) 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 74e0281b..f7f4ea41 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 @@ -113,7 +113,8 @@ public class NormalPGIControllerService { */ public PDAOrderVO getOrderItemByOrderNo(@RequestParam String orderNo) { // 根据订单编号查询订单主表信息 - WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getNoteNum, orderNo).eq(WmsSrmOrder::getIsCompleted, false).one(); + WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getNoteNum, orderNo) + .eq(WmsSrmOrder::getIsCompleted, false).one(); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("此收货单[" + orderNo + "] 单号无效"); PDAOrderVO pdaOrderVO = new PDAOrderVO(); @@ -140,7 +141,8 @@ public class NormalPGIControllerService { itemVO.setIsQuality(item.getIsQuality()); itemVO.setOrderQty(item.getOrderQty()); itemVO.setUomCode(item.getUomCode()); - itemVO.setDeliveryQty(item.getDeliveryQty().multiply(item.getReceiptQty())); + itemVO.setLineNumber(item.getLineNumber()); + itemVO.setDeliveryQty(item.getDeliveryQty().subtract(item.getReceiptQty())); // 从 SAP 系统获取物料相关信息 SAPSyncParamsDTO syncParamsDTO = sapCommonService.getMaterialInfoInOrder(item.getPoNum(), order.getSupplierNum(), item.getItemCode()); if (Objects.nonNull(syncParamsDTO)) { @@ -213,7 +215,7 @@ public class NormalPGIControllerService { //生成普通物料的入库待检单，并修改送货单相应的收货数量 if (CollectionUtil.isNotEmpty(wmsPoReceiptItems)) { - wmsPoReceipt.setInNum(basdeSerialNumberControllerService.generateSerialNumber(1)); + wmsPoReceipt.setInNum(basdeSerialNumberControllerService.generateSerialNumber(2)); wmsPoReceiptService.save(wmsPoReceipt); wmsPoReceiptItemService.saveBatch(wmsPoReceiptItems); @@ -223,7 +225,7 @@ public class NormalPGIControllerService { } //生成质检物料的入库待检单，并修改送货单相应的收货数量 if (CollectionUtil.isNotEmpty(wmsQcReceiveItems)) { - wmsQcReceive.setInNo(basdeSerialNumberControllerService.generateSerialNumber(2)); + wmsQcReceive.setInNo(basdeSerialNumberControllerService.generateSerialNumber(1)); wmsQcReceiveService.save(wmsQcReceive); wmsQcReceiveItemService.saveBatch(wmsQcReceiveItems); for (WmsQcReceiveItem wmsQcReceiveItem : wmsQcReceiveItems) { @@ -241,7 +243,7 @@ public class NormalPGIControllerService { if (CollectionUtil.isNotEmpty(srmMaterialReceiptScanCodes)) { srmMaterialReceiptCanCodesRepository.insert(srmMaterialReceiptScanCodes); } - +/** 调试暂时关闭 if (CollectionUtil.isNotEmpty(qcMaterialSyncDTOS)) { for (QCMaterialSyncDTO dto : qcMaterialSyncDTOS) { //导入SAP @@ -262,6 +264,7 @@ public class NormalPGIControllerService { } } } + */ } @Transactional diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java index 6fdf2e5d..99332a0d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java @@ -9,6 +9,7 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -21,6 +22,25 @@ public class SAPCommonService { private SapService sapService; public SAPSyncParamsDTO getMaterialInfoInOrder(String orderNo, String supplierNo, String materialNo) { + + SAPSyncParamsDTO dto = new SAPSyncParamsDTO(); + dto.setMaktx("物料描述"); + dto.setEbelp("1"); + dto.setMatnr(materialNo); + dto.setMenge(new BigDecimal(100)); + dto.setWemng(new BigDecimal(10)); + dto.setMeins("PC"); + dto.setEbeln(orderNo); + dto.setTransportNum(new BigDecimal(80)); + dto.setMatkl("物料组"); + dto.setWgbez("物料描述"); + dto.setWerks("1010"); + dto.setLbprt("1"); + dto.setKzkri(""); + dto.setWarehouseNo("122222"); + dto.setBinNos("2121"); + return dto; + /** //获取订单信息 SAPMaterialInfoInOrderDTO materialInfoInOrder = CollectionUtil.get(sapService.zim004(orderNo, supplierNo, materialNo), 0); VUtil.trueThrowBusinessError(Objects.isNull(materialInfoInOrder)).throwMessage("无法获取到有效订单信息" + orderNo); @@ -43,7 +63,7 @@ public class SAPCommonService { //获取仓库信息 List warehouseNos = new ArrayList<>(); warehouseNos.add(materialInfoInOrder.getWarehouseNo()); - List materialNos=new ArrayList<>(); + List materialNos = new ArrayList<>(); materialNos.add(materialInfoInOrder.getMatnr()); List list = sapService.zwm3A01(materialInfoInOrder.getWerks(), warehouseNos, materialNos, null, null); if (!CollectionUtil.isEmpty(list)) { @@ -53,6 +73,7 @@ public class SAPCommonService { syncParams.setBinNos(dbWarehouse.getBinNos()); } return syncParams; + */ } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveItemQO.java index deba0c06..a43178fb 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveItemQO.java @@ -55,7 +55,7 @@ public class SRMOrderReceiveItemQO { /** * 送货单行状态 */ - private Integer noteLineStatus; + private String noteLineStatus; /** * 采购订单类型 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java index eb41fc28..57c8fbe0 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java @@ -25,4 +25,5 @@ public class SRMOrderSearchQO extends SearchBaseQO { * 物料编号 */ private String itemCode; + } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java index 9e3a6585..5a53c850 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateTime; import lombok.Data; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + @Data @Accessors(chain = true) public class QCReceiptVO { @@ -63,7 +65,7 @@ public class QCReceiptVO { /** * 收货时间 */ - private DateTime receiveTime; + private LocalDateTime receiveTime; /** * 收货人 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java index 87eebe84..ad2bf977 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java @@ -2,9 +2,15 @@ package com.nflg.wms.common.pojo.vo; import lombok.Data; +import java.time.LocalDateTime; + @Data public class SrmOrderVO { + /** + * 送货单ID + */ + private long Id; /** * 送货单号 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrderItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrderItem.java index 6a8b1e17..0558d06b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrderItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrderItem.java @@ -84,7 +84,7 @@ public class WmsSrmOrderItem implements Serializable { /** * 送货单行状态 */ - private Short noteLineStatus; + private String noteLineStatus; /** * 采购订单类型 diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml index 32bbd747..2c6fcd54 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml @@ -2,7 +2,7 @@