diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 80401d977..c422f27c6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -498,9 +498,22 @@ public class StockOutOrderDomainService { } /** - * 获取出库单详细信息 + * 获取出库单详细信息(PDA复核管理查询详情) + * 复核场景下与PC端getCheckInfo保持一致,返回拣货下发时的完整数据(树形结构、拣货汇总、批次属性等) */ public StockOutOrderPO getInfoByApp(Long outOrderId) { + StockOutOrder stockOutOrder = stockOutOrderService.getById(outOrderId); + if (stockOutOrder == null) { + throw new ServiceException("出库单不存在"); + } + // 复核场景:与PC端getCheckInfo保持一致,返回拣货下发的完整数据 + if (stockOutOrder.getReview() != null && stockOutOrder.getReview() == 1 + && stockOutOrder.getStatus() != null && (stockOutOrder.getStatus() == 7 || stockOutOrder.getStatus() == 8)) { + StockOutOrderDO stockOutOrderDO = new StockOutOrderDO(); + stockOutOrderDO.setOutOrderNumber(stockOutOrder.getOutOrderNumber()); + return getCheckInfo(stockOutOrderDO); + } + // 非复核场景:保持原有逻辑 StockOutOrderPO stockOutOrderPO = stockOutOrderService.getInfo(outOrderId); OutMaterialDetailDO outMaterialDetailDO = new OutMaterialDetailDO(); outMaterialDetailDO.setOutOrderNumber(stockOutOrderPO.getOutOrderNumber());