From f1967dd40f1ac419afacb419076b3b4ea5d492d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 6 Aug 2026 09:15:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=9131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ReservationStockInOrder.java | 4 ++++ .../repository/po/ReservationStockInOrderPO.java | 4 ++++ .../repository/todo/ReservationStockInOrderDO.java | 4 ++++ .../repository/todo/ReservationStockInOrderDTO.java | 4 ++++ .../service/ReservationStockInOrderDomainService.java | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java index 1cc8956c4..f61291f28 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java @@ -61,6 +61,10 @@ public class ReservationStockInOrder extends BaseVOEntity { @Excel(name = "入库单号") private String inOrderNumber; + @ApiModelProperty("执行入库单号") + @Excel(name = "执行入库单号") + private String executionInOrderNumber; + @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭") @Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java index 26172a6f4..0fbd2e06a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java @@ -63,6 +63,10 @@ public class ReservationStockInOrderPO extends BaseVOEntity { @Excel(name = "入库单号") private String inOrderNumber; + @ApiModelProperty("执行入库单号") + @Excel(name = "执行入库单号") + private String executionInOrderNumber; + @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") @Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java index 642436946..fe2eb7cc2 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java @@ -59,6 +59,10 @@ public class ReservationStockInOrderDO extends BaseVOEntity { @Excel(name = "入库单号") private String inOrderNumber; + @ApiModelProperty("执行入库单号") + @Excel(name = "执行入库单号") + private String executionInOrderNumber; + @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") @Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java index 9c672d7c8..fb0ff4f6f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java @@ -59,6 +59,10 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO { @Excel(name = "入库单号") private String inOrderNumber; + @ApiModelProperty("执行入库单号") + @Excel(name = "执行入库单号") + private String executionInOrderNumber; + @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") @Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index 14b3cf3eb..82f89c3ac 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -520,6 +520,7 @@ public class ReservationStockInOrderDomainService { // 按照 warehouseId 分组 Map> materialDetailGroupByWarehouse = materialDetailList.stream() .collect(Collectors.groupingBy(ReservationInMaterialDetail::getWarehouseId)); + List executionInOrderNumbers = new ArrayList<>(); materialDetailGroupByWarehouse.forEach((warehouseId, details) -> { Long topOrgId = reservationStockInOrderMapper.getTopOrgId(warehouseId); Long orgId = reservationStockInOrderMapper.getOrgId(warehouseId); @@ -570,8 +571,11 @@ public class ReservationStockInOrderDomainService { BigDecimal quantity = details.stream().map(ReservationInMaterialDetail::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); reservationStockInOrder.setQuantity(quantity); executionStockInOrderService.save(reservationStockInOrder); + executionInOrderNumbers.add(reservationStockInOrder.getInOrderNumber()); executionInMaterialDetailService.saveBatch(inMaterialDetailList); }); + byId.setExecutionInOrderNumber(String.join(",", executionInOrderNumbers)); + stockInOrderService.updateById(byId); }