业务单添加执行单号;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java

@@ -50,6 +50,10 @@ public class ReservationStockOutOrder extends BaseVOEntity {
     @Excel(name = "出库单号")
     private String outOrderNumber;
 
+    @ApiModelProperty("执行出库单号")
+    @Excel(name = "执行出库单号")
+    private String executionOutOrderNumber;
+
     @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
     @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
     private Integer status;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java

@@ -57,6 +57,10 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     @Excel(name = "出库单号")
     private String outOrderNumber;
 
+    @ApiModelProperty("执行出库单号")
+    @Excel(name = "执行出库单号")
+    private String executionOutOrderNumber;
+
     @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
     @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
     private Integer status;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java

@@ -52,6 +52,10 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @Excel(name = "出库单号")
     private String outOrderNumber;
 
+    @ApiModelProperty("执行出库单号")
+    @Excel(name = "执行出库单号")
+    private String executionOutOrderNumber;
+
     @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
     @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
     private Integer status;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java

@@ -50,6 +50,10 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @Excel(name = "出库单号")
     private String outOrderNumber;
 
+    @ApiModelProperty("执行出库单号")
+    @Excel(name = "执行出库单号")
+    private String executionOutOrderNumber;
+
     @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
     @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
     private Integer status;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -364,6 +364,7 @@ public class ReservationStockOutOrderDomainService {
         for (Long inOrderId : inOrderIds) {
             ReservationStockOutOrder byId = stockOutOrderService.getById(inOrderId);
             String inOrderNumber = byId.getOutOrderNumber();
+            List<String> executionInOrderNumbers = new  ArrayList<>();
             List<ReservationOutMaterialDetail> materialDetailList = outMaterialDetailService.list(new QueryWrapper<ReservationOutMaterialDetail>().lambda().eq(ReservationOutMaterialDetail::getOutOrderNumber, inOrderNumber));
 
             // 按照 warehouseId 分组
@@ -415,8 +416,11 @@ public class ReservationStockOutOrderDomainService {
                 BigDecimal quantity =  details.stream().map(ReservationOutMaterialDetail::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
                 reservationStockInOrder.setQuantity(quantity);
                 executionStockOutOrderService.save(reservationStockInOrder);
+                executionInOrderNumbers.add(reservationStockInOrder.getOutOrderNumber());
                 executionOutMaterialDetailService.saveBatch(inMaterialDetailList);
             });
+            byId.setExecutionOutOrderNumber(String.join(",", executionInOrderNumbers));
+            stockOutOrderService.updateById(byId);
         }
         return update;
     }