Merge branch 'test' into dev
This commit is contained in:
@@ -489,9 +489,10 @@ paths:
|
||||
预计到货日期和订单状态共同作用于全局候选。每个普通入库单返回一行；同柜不可拆组作为一个
|
||||
分页单元返回，groupMembers 包含完整成员，不会跨页或因单个成员命中搜索条件而拆散。
|
||||
平均单箱毛重、净重按整票实测重量除以总箱数，平均单箱体积按剩余规格数量加权。
|
||||
只返回当前具备实际装柜候选资格的 WAIT_SPLIT 数据；PENDING_REVIEW、WAIT_MEASURE、LOADING
|
||||
是统一筛选枚举，但在候选接口中返回空页。LOADED、COMPLETED 与已锁定或成员不完整的组永不返回。
|
||||
分配时仍由目标 planId 接口复核真实渠道、仓库、容量、组锁和并发版本。
|
||||
WAIT_SPLIT 返回 Firstleg 可用箱数；PENDING_REVIEW 返回 Order 权威待审核订单并允许先加入装柜清单。
|
||||
订单审核状态只用于筛选和展示，不直接决定能否占位；已被有效柜次占用、LOADED、COMPLETED、
|
||||
已锁定或成员不完整的组永不返回。分配时仍由目标 planId 接口复核真实渠道、仓库、容量、
|
||||
组锁和并发版本；确认预装/PDA 前必须完成审核与测量并进入 WAIT_SPLIT。
|
||||
parameters:
|
||||
- name: channelGroupCodes
|
||||
in: query
|
||||
@@ -511,8 +512,8 @@ paths:
|
||||
- {name: warehouseId, in: query, required: false, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
|
||||
- {name: customerId, in: query, required: false, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
|
||||
- {name: inboundCode, in: query, required: false, schema: {type: string, maxLength: 40}}
|
||||
- {name: expectedArrivalStart, in: query, required: false, schema: {type: string, format: date}}
|
||||
- {name: expectedArrivalEnd, in: query, required: false, schema: {type: string, format: date}}
|
||||
- {name: createdStart, in: query, required: false, schema: {type: string, format: date}}
|
||||
- {name: createdEnd, in: query, required: false, schema: {type: string, format: date}}
|
||||
- {name: orderStatus, in: query, required: false, schema: {type: string, enum: [PENDING_REVIEW, WAIT_MEASURE, WAIT_SPLIT, LOADING]}}
|
||||
- {name: page, in: query, required: false, schema: {type: integer, minimum: 1, default: 1}}
|
||||
- {name: size, in: query, required: false, schema: {type: integer, minimum: 1, maximum: 200, default: 20}}
|
||||
@@ -525,7 +526,7 @@ paths:
|
||||
summary: 分页查询智能装柜工作台柜次
|
||||
description: >-
|
||||
需要 platform:firstleg:smart-loading:list 权限。与全局候选使用相同的渠道、仓库、客户、入仓码、
|
||||
预计到货日期及订单状态筛选；客户及入仓事实以柜内任一有效装柜明细命中为准，查询不会修改或拆散同柜组。
|
||||
订单创建日期及订单状态筛选；客户及入仓事实以柜内任一有效装柜明细命中为准，查询不会修改或拆散同柜组。
|
||||
只返回 WAIT_LOADING、EDITING 或 LOADING 的 ACTIVE 柜次，COMPLETED 永不返回。
|
||||
parameters:
|
||||
- name: channelGroupCodes
|
||||
@@ -540,8 +541,8 @@ paths:
|
||||
- {name: warehouseId, in: query, required: false, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
|
||||
- {name: customerId, in: query, required: false, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
|
||||
- {name: inboundCode, in: query, required: false, schema: {type: string, maxLength: 40}}
|
||||
- {name: expectedArrivalStart, in: query, required: false, schema: {type: string, format: date}}
|
||||
- {name: expectedArrivalEnd, in: query, required: false, schema: {type: string, format: date}}
|
||||
- {name: createdStart, in: query, required: false, schema: {type: string, format: date}}
|
||||
- {name: createdEnd, in: query, required: false, schema: {type: string, format: date}}
|
||||
- {name: orderStatus, in: query, required: false, schema: {type: string, enum: [PENDING_REVIEW, WAIT_MEASURE, WAIT_SPLIT, LOADING]}}
|
||||
- {name: page, in: query, required: false, schema: {type: integer, minimum: 1, default: 1}}
|
||||
- {name: size, in: query, required: false, schema: {type: integer, minimum: 1, maximum: 200, default: 20}}
|
||||
@@ -613,6 +614,22 @@ paths:
|
||||
content: {application/json: {schema: {$ref: '#/components/schemas/SmartLoadingInboundAssignRequest'}}}
|
||||
responses:
|
||||
'200': {description: 成功或业务失败，data 为最新 SmartLoadingPlan}
|
||||
/api/platform/v1/first-leg/smart-loading/plans/{planId}/pending-review-assignments:
|
||||
post:
|
||||
summary: 将待审核订单加入装柜清单
|
||||
description: >-
|
||||
需要 platform:firstleg:smart-loading:assign 权限。订单审核状态不作为清单占位门禁；服务端以
|
||||
customerId + orderId + inboundCode 重新核验 Order 权威待审核事实，幂等创建或复用 PREPARING
|
||||
入仓投影，并按订单申报箱数、重量和体积建立柜次占位。已被其他有效柜次占用、仓库/渠道不一致、
|
||||
超容量或订单事实变化返回业务冲突且事务零漂移。清单中存在 PREPARING/WAIT_MEASURE 订单时不得
|
||||
确认预装或启动 PDA，审核测量完成并进入 WAIT_SPLIT 后才可继续物理装柜。
|
||||
parameters:
|
||||
- {name: planId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
|
||||
requestBody:
|
||||
required: true
|
||||
content: {application/json: {schema: {$ref: '#/components/schemas/SmartLoadingPendingReviewAssignRequest'}}}
|
||||
responses:
|
||||
'200': {description: 成功或业务失败，data 为最新 SmartLoadingPlan}
|
||||
/api/platform/v1/first-leg/smart-loading/plans/{planId}/items/{itemId}:
|
||||
patch:
|
||||
summary: 调整预装计划明细箱数
|
||||
@@ -1903,6 +1920,16 @@ components:
|
||||
packageCount: {type: integer, minimum: 1, description: 该入仓码本次计划装柜总箱数}
|
||||
expectedVersion: {type: integer, minimum: 0, description: 当前 planVersion}
|
||||
operationId: {type: string, minLength: 1, maxLength: 128}
|
||||
SmartLoadingPendingReviewAssignRequest:
|
||||
type: object
|
||||
required: [customerId, orderId, inboundCode, packageCount, expectedVersion, operationId]
|
||||
properties:
|
||||
customerId: {type: string, pattern: '^[1-9][0-9]*$'}
|
||||
orderId: {type: string, pattern: '^[1-9][0-9]*$'}
|
||||
inboundCode: {type: string, minLength: 1, maxLength: 40}
|
||||
packageCount: {type: integer, minimum: 1, description: 待审核订单本次占用的申报箱数}
|
||||
expectedVersion: {type: integer, minimum: 0, description: 当前 planVersion}
|
||||
operationId: {type: string, minLength: 1, maxLength: 128}
|
||||
SmartLoadingAdjustRequest:
|
||||
type: object
|
||||
required: [packageCount, expectedPlanVersion, expectedItemVersion, operationId]
|
||||
@@ -1984,7 +2011,7 @@ components:
|
||||
properties:
|
||||
accountId: {type: string, pattern: '^[1-9][0-9]*$'}
|
||||
customerId: {type: string, pattern: '^[1-9][0-9]*$', description: 与 accountId 相同的客户技术关联ID}
|
||||
inboundId: {type: string, pattern: '^[1-9][0-9]*$', description: 普通候选ID；组聚合行中为可用于整组分配的稳定代表成员ID}
|
||||
inboundId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: 待审核订单尚无入仓投影时为空；普通可装柜候选为入仓技术ID}
|
||||
orderId: {type: string, pattern: '^[1-9][0-9]*$'}
|
||||
orderNo: {type: string}
|
||||
inboundCode: {type: string}
|
||||
@@ -1997,12 +2024,12 @@ components:
|
||||
destinationWarehouseCode: {type: string, nullable: true}
|
||||
destinationWarehouseName: {type: string, nullable: true}
|
||||
customerName: {type: string}
|
||||
goodsSummary: {type: string}
|
||||
goodsSummary: {type: string, nullable: true}
|
||||
availablePackageCount: {type: integer, minimum: 1, description: 普通行剩余箱数；组行完整成员箱数合计}
|
||||
unitGrossWeightKg: {type: number, minimum: 0}
|
||||
unitNetWeightKg: {type: number, minimum: 0}
|
||||
averageUnitVolumeCbm: {type: number, minimum: 0}
|
||||
availableVolumeCbm: {type: number, minimum: 0}
|
||||
unitGrossWeightKg: {type: number, minimum: 0, nullable: true}
|
||||
unitNetWeightKg: {type: number, minimum: 0, nullable: true}
|
||||
averageUnitVolumeCbm: {type: number, minimum: 0, nullable: true}
|
||||
availableVolumeCbm: {type: number, minimum: 0, nullable: true}
|
||||
coLoadGroupId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
|
||||
groupNo: {type: string, nullable: true}
|
||||
memberCount: {type: integer, minimum: 2, nullable: true}
|
||||
|
||||
Reference in New Issue
Block a user