Merge remote-tracking branch 'origin/dev' into dev

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java

@@ -10,6 +10,8 @@ import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationSer
 import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder;
 import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
+import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
+import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
 import com.mhd.wms.domain.stockOutOrder.repository.listener.ExcelParseService;
 import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
@@ -49,6 +51,9 @@ public class StockOutOrderApi extends BaseController {
     @Autowired
     private IHandoverTaskOrderService handoverTaskOrderService;
 
+    @Autowired
+    private IStockOutOrderService stockOutOrderService;
+
     /**
      * 分页查询出库单列表
      */
@@ -143,9 +148,13 @@ public class StockOutOrderApi extends BaseController {
     @GetMapping(value = "/getInfoOutOrderNumber")
     public AjaxResult getInfoOutOrderNumber(String outOrderNumber)
     {
-        HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getOne(new LambdaQueryWrapper<HandoverTaskOrder>()
-                .eq(HandoverTaskOrder::getTaskNumber, outOrderNumber));
-        return AjaxResult.success(stockOutOrderApplicationService.getInfoChildren(handoverTaskOrder.getHandoverTaskOrderId()));
+        // 根据出库单号查询出库单，再按出库单ID查询详情，保证与出库管理页面一致
+        StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper<StockOutOrder>()
+                .eq(StockOutOrder::getOutOrderNumber, outOrderNumber));
+        if (stockOutOrder == null) {
+            return AjaxResult.error("出库单不存在");
+        }
+        return AjaxResult.success(stockOutOrderApplicationService.getInfoChildren(stockOutOrder.getOutOrderId()));
     }
 
     /**