diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java index af5b24f08..5d4caca66 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java @@ -22,6 +22,8 @@ import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrder import com.mhd.wms.domain.pickingOrder.repository.facade.IPickingOrderService; import com.mhd.wms.domain.pickingOrder.repository.po.PickingOrderPO; import com.mhd.wms.domain.pickingOrder.repository.todo.PickingOrderDO; +import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; +import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService; import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO; import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO; import com.mhd.wms.interfaces.assember.pickingOrder.PickingOrderAssembler; @@ -68,6 +70,10 @@ public class DeliveTaskImpl extends ServiceImpl im @Resource private StockOutOrderAssembler stockOutOrderAssembler; + + @Autowired + private IStockOutOrderService stockOutOrderService; + /** * 查询下发任务列表 */ @@ -121,6 +127,13 @@ public class DeliveTaskImpl extends ServiceImpl im deliveTaskPO.setCheckQuantity(checkQuantity); } catch (Exception e) { } + StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() + .eq(StockOutOrder::getOutOrderNumber, orderNumber)); + if (stockOutOrder != null){ + deliveTaskPO.setOutOrderNumber(stockOutOrder.getOutOrderNumber()); + deliveTaskPO.setOutOrderStatus(stockOutOrder.getStatus()); + deliveTaskPO.setShipperName(stockOutOrder.getShipperName()); + } } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/po/DeliveTaskPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/po/DeliveTaskPO.java index 14bbd594e..ec477dab0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/po/DeliveTaskPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/po/DeliveTaskPO.java @@ -125,4 +125,13 @@ public class DeliveTaskPO extends BaseVOEntity { @ApiModelProperty("复核数量") private BigDecimal checkQuantity; + @ApiModelProperty("出库单号") + private String outOrderNumber; + + @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") + private Integer outOrderStatus; + + @ApiModelProperty("货主名称") + private String shipperName; + }