diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java index 3851de647..118ebfa72 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java @@ -451,7 +451,6 @@ public class ReserveStockInOrderDomainService { reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku"); reservationStockInOrder.setOrderTypeName("普通入库"); reservationStockInOrder.setReservationOrderSource("客户预约"); - reservationStockInOrderService.save(reservationStockInOrder); String inOrderNumber = reservationStockInOrder.getInOrderNumber(); List materialDetailList = materialDetailService.list(new QueryWrapper().lambda().eq(ReserveInMaterialDetail::getInOrderNumber, inOrderNumber)); List inMaterialDetailList = new ArrayList<>(); @@ -467,6 +466,9 @@ public class ReserveStockInOrderDomainService { //reservationInMaterialDetail.set inMaterialDetailList.add(reservationInMaterialDetail); } + BigDecimal quantity = materialDetailList.stream().map(ReserveInMaterialDetail::getReserveQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); + reservationStockInOrder.setQuantity(quantity); + reservationStockInOrderService.save(reservationStockInOrder); reservationInMaterialDetailService.saveBatch(inMaterialDetailList); return update; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 380898a9c..978179bc3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -830,7 +830,7 @@ public class PickingOrderApplicationService { } else { item.put("gNo", ""); // 出仓订单行号 } - item.put("gdsMtno", detail.getMaterialCode() != null ? detail.getMaterialCode() : ""); + // 获取物料详情获取单价和币制 if (detail.getMaterialBaseInfoId() != null) { @@ -838,7 +838,7 @@ public class PickingOrderApplicationService { if (materialInfo != null) { item.put("dclUprcAmt", materialInfo.getUnitPrice()); // 申报单价 item.put("dclCurrcd", materialInfo.getCurrency() != null ? materialInfo.getCurrency() : ""); // 申报币制 - + item.put("gdsMtno", materialInfo.getMaterialCode() != null ? materialInfo.getMaterialCode() : ""); // 计算申报总价 BigDecimal unitPrice = materialInfo.getUnitPrice(); BigDecimal pickingQty = detail.getCheckQuantity() != null ? detail.getCheckQuantity() : detail.getQuantity();