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

firstleg/src/main/resources/openapi/firstleg-v1.yaml

@@ -2035,7 +2035,7 @@ components:
         version: {type: integer, minimum: 0, description: 柜次版本}
     SmartLoadingPlan:
       type: object
-      required: [id, planNo, status, bookingId, version, canAssign, canEdit, finalCompletionStatus, items]
+      required: [id, planNo, status, bookingId, version, canAssign, canEdit, finalCompletionStatus, coLoadGroups, items]
       properties:
         id: {type: string}
         planNo: {type: string, pattern: '^LP-[0-9]{6}-[0-9]{4}$', example: LP-260818-0001, description: 预装与确认装柜清单共用的稳定编号}
@@ -2051,9 +2051,28 @@ components:
         pdaTaskId: {type: string, nullable: true}
         pdaTaskStatus: {type: string, nullable: true, enum: [LOADING, COMPLETED], description: LOADING task 在增量后保持原 taskId；COMPLETED 永久拒绝增量}
         pdaTaskVersion: {type: integer, minimum: 0, nullable: true, description: 服务端同步后最新 taskVersion；Admin 写操作不提交该值}
+        coLoadGroups:
+          type: array
+          description: 当前计划内同柜不可拆组的完整冻结快照；随计划一次返回，调用方不得按 inboundId 扇出重建
+          items: {$ref: '#/components/schemas/SmartLoadingPlanCoLoadGroup'}
         items:
           type: array
           items: {$ref: '#/components/schemas/SmartLoadingPlanItem'}
+    SmartLoadingPlanCoLoadGroup:
+      type: object
+      required: [groupId, groupNo, lockedPlanId, memberOrderCount, inboundFragmentCount, fullPackageCount, memberInboundIds]
+      properties:
+        groupId: {type: string, pattern: '^[1-9][0-9]*$'}
+        groupNo: {type: string, minLength: 1}
+        lockedPlanId: {type: string, pattern: '^[1-9][0-9]*$'}
+        memberOrderCount: {type: integer, minimum: 1, description: 组内去重订单数}
+        inboundFragmentCount: {type: integer, minimum: 1, description: 组内去重当前有效入仓片段数}
+        fullPackageCount: {type: integer, minimum: 1, description: 全部成员冻结满箱数之和}
+        memberInboundIds:
+          type: array
+          minItems: 1
+          uniqueItems: true
+          items: {type: string, pattern: '^[1-9][0-9]*$'}
     SmartLoadingPlanItem:
       type: object
       required: [id, packageCount, version, pickedPackageCount, minPackageCount, canAdjust, canRemove]