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

# Conflicts: # lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchBolMapper.java
2026-10-20 14:35:19 +08:00
parent a870b920fe e0c0316487
commit da6b4685d7
34 changed files with 1898 additions and 83 deletions
@@ -874,7 +874,7 @@ paths:
  /api/platform/v1/last-leg/dispatches/{dispatchNo}/prints/bol:
    get:
      summary: 生成排车 BOL PDF
-      description: 权限 platform:overseas-warehouse:dispatch:list；服务端按目的 FBA 仓分组并分页生成固定 A4 PDF，浏览器不直接访问内部打印服务。
+      description: 权限 platform:overseas-warehouse:dispatch:list；服务端按目的地与预约号归集BOL，同目的地同预约号跨客户合并，不同预约号分别生成BOL并独立分页；无预约号也能打印且预约栏留空，同目的地空号合并。本次仍返回包含各份BOL的一个固定A4 PDF，浏览器不直接访问内部打印服务，打印不改变货物客户归属。
      security: [{ bearerAuth: [] }]
      parameters: [{ name: dispatchNo, in: path, required: true, schema: { type: string } }]
      responses: