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

mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java

@@ -187,7 +187,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
         if (null == sysUser) {
             throw new ServiceException("sysUser是空值！");
         }
-        BmsInvoiceList bmsInvoiceList = bmsInvoiceListMapper.selectById(bmsInvoiceListDTO.getId());
+        BmsInvoiceList bmsInvoiceList = bmsInvoiceListMapper.selectById(String.valueOf(bmsInvoiceListDTO.getId()));
         if (null == bmsInvoiceList) {
             throw new ServiceException("bmsInvoiceList是空值！");
         }

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

@@ -157,6 +157,24 @@ public class StockOutOrderApi extends BaseController {
         return AjaxResult.success(stockOutOrderApplicationService.getInfoChildren(stockOutOrder.getOutOrderId()));
     }
 
+    /**
+     * 根据来源单号/出库单号(orderNumber)获取出库单详细信息
+     * 方便交接作业单等场景直接用 orderNumber 调用，内部仍然通过 outOrderNumber 精确匹配出库单
+     */
+    @ApiOperation("根据orderNumber获取出库单详情")
+    @GetMapping("/getInfoByOrderNumber")
+    public AjaxResult getInfoByOrderNumber(@RequestParam("orderNumber") String orderNumber) {
+        if (orderNumber == null || orderNumber.trim().isEmpty()) {
+            return AjaxResult.error("orderNumber不能为空");
+        }
+        StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper<StockOutOrder>()
+                .eq(StockOutOrder::getOutOrderNumber, orderNumber));
+        if (stockOutOrder == null) {
+            return AjaxResult.error("出库单不存在");
+        }
+        return AjaxResult.success(stockOutOrderApplicationService.getInfoChildren(stockOutOrder.getOutOrderId()));
+    }
+
     /**
      * 审核出库单
      */