java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/gateway/WarehouseResourceGateway.java
#	scripts/admin-test-env-modules/phase3-container-documents-contract.test.mjs
#	scripts/admin-test-env-modules/phase4-overseas-pda.mjs
This commit is contained in:
ouyangxq
2026-09-09 03:00:48 +08:00
parent 045d0d815b c5862db98d
commit 71580da8d7
20 changed files with 383 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
+14 -7
View File
@@ -1669,7 +1669,7 @@ components:
timestamp: { type: string, format: date-time }
ReceivingInbound:
type: object
required: [inboundCode, destinationType, plannedPalletCount, totalPackages, receivedPackages, pendingPackages, palletMergeRequired]
required: [inboundCode, destinationType, plannedPalletCount, totalPackages, receivedPackages, pendingPackages, assigned, mergeAllowed, urgent]
properties:
inboundCode: { type: string }
destinationType: { type: string, enum: [FBA, OVERSEAS] }
@@ -1683,8 +1683,10 @@ components:
totalPackages: { type: integer }
receivedPackages: { type: integer }
pendingPackages: { type: integer }
palletMergeRequired: { type: boolean, description: 尾程订单是否要求PDA合托提醒 }
palletMergeHint: { type: string, nullable: true, description: 标记合托时供PDA直接展示的中文提示 }
assigned: { type: boolean, description: 入库计划是否已分配 }
mergeAllowed: { type: boolean, description: 入库计划是否允许现场选择合托；true不代表强制合托 }
urgent: { type: boolean, description: 入库计划是否加急 }
mergeHint: { type: string, nullable: true, description: 允许合托时供PDA直接展示的非强制中文提示 }
ReceivingWarehouseProfile:
type: object
required: [warehouseId, warehouseCode, warehouseName]
@@ -1764,7 +1766,7 @@ components:
compatible: { type: boolean }
ReceivingReceipt:
type: object
required: [result, containerNo, inboundCode, destinationType, palletCode, acceptedPackages, receivedPackages, pendingPackages, sessionStatus, palletMergeRequired]
required: [result, containerNo, inboundCode, destinationType, palletCode, acceptedPackages, receivedPackages, pendingPackages, sessionStatus, assigned, mergeAllowed, urgent]
properties:
result: { type: string }
containerNo: { type: string }
@@ -1775,8 +1777,10 @@ components:
receivedPackages: { type: integer }
pendingPackages: { type: integer }
sessionStatus: { type: string, enum: [SIGNED, RECEIVING] }
palletMergeRequired: { type: boolean }
palletMergeHint: { type: string, nullable: true }
assigned: { type: boolean }
mergeAllowed: { type: boolean, description: 现场可选择合托，不作为实收或完成门禁 }
urgent: { type: boolean }
mergeHint: { type: string, nullable: true }
ReceivingCandidateListApiResponse:
allOf:
- { $ref: '#/components/schemas/ReceivingApiResponseBase' }
@@ -2431,7 +2435,7 @@ components:
properties: { records: { type: array, items: { $ref: '#/components/schemas/InboundPlanSummary' } } }
InboundPlanSummary:
type: object
required: [lineId, planId, planNo, customerId, orderId, inboundCode, overseasWarehouseCode, overseasWarehouseName, packageCount, pickedPackageCount, palletCount, status, createdAt, version]
required: [lineId, planId, planNo, customerId, orderId, inboundCode, overseasWarehouseCode, overseasWarehouseName, packageCount, pickedPackageCount, palletCount, assigned, mergeAllowed, urgent, status, createdAt, version]
properties:
lineId: { type: string, pattern: '^[0-9]+$' }
planId: { type: string, pattern: '^[0-9]+$' }
@@ -2451,6 +2455,9 @@ components:
pickedPackageCount: { type: integer }
volumeCbm: { type: number, nullable: true }
palletCount: { type: integer }
assigned: { type: boolean, description: 入库计划是否已分配 }
mergeAllowed: { type: boolean, description: 入库计划是否允许现场选择合托；不作为强制门禁 }
urgent: { type: boolean, description: 入库计划是否加急 }
status: { type: string }
appointmentNo: { type: string, nullable: true }
appointmentStatus: { type: string, nullable: true }