发31

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;

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;

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;

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;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java

@@ -520,6 +520,7 @@ public class ReservationStockInOrderDomainService {
             // 按照 warehouseId 分组
             Map<Long, List<ReservationInMaterialDetail>> materialDetailGroupByWarehouse = materialDetailList.stream()
                     .collect(Collectors.groupingBy(ReservationInMaterialDetail::getWarehouseId));
+            List<String> 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);
         }