diff --git a/src/api/fulfillment.js b/src/api/fulfillment.js index 4e979a5..3fdaef1 100644 --- a/src/api/fulfillment.js +++ b/src/api/fulfillment.js @@ -24,6 +24,8 @@ export function normalizeDispatchTask(value) { dispatchNo: String(value?.dispatchNo || ''), vehiclePlate: String(value?.vehiclePlate || ''), status: String(value?.status || ''), + canDepart: value?.canDepart === true, + departBlockReason: String(value?.departBlockReason || ''), items: asList(value?.items).map((item) => ({ ...item, dispatchItemId: String(item?.dispatchItemId || ''), diff --git a/src/pages/dispatch/dispatch.vue b/src/pages/dispatch/dispatch.vue index d1d17ff..70925f8 100644 --- a/src/pages/dispatch/dispatch.vue +++ b/src/pages/dispatch/dispatch.vue @@ -69,7 +69,8 @@ 发车门禁 服务端仍显示 {{ remainingPackages }} 箱未拣,不允许发车。 该排车任务已执行发车,不可重复提交。 - 拣货已完成且全部箱数核平,服务端将再次校验出库单和托盘门禁。 + {{ current.departBlockReason || '当前排车暂不满足发车条件,请刷新后重试。' }} + 拣货已完成且全部箱数核平,可以发车。 @@ -108,7 +109,7 @@ canPick() { return this.selectedPosition && Number(this.packages) > 0 && Number(this.packages) <= this.selectedRemaining && !this.pickingCompleted }, canCompleteStage() { return Boolean(this.current) && !this.pickingCompleted }, canComplete() { return this.plannedPackages > 0 && this.remainingPackages === 0 }, - canDepart() { return this.pickingCompleted && this.allPicked && !this.departed } + canDepart() { return this.pickingCompleted && this.allPicked && this.current?.canDepart === true && !this.departed } }, onShow() { if (!requireSession()) return diff --git a/tests/fulfillment-workflows.test.mjs b/tests/fulfillment-workflows.test.mjs index 1accbb0..1ee7cfb 100644 --- a/tests/fulfillment-workflows.test.mjs +++ b/tests/fulfillment-workflows.test.mjs @@ -78,10 +78,12 @@ test('fulfillment API calls the frozen list detail pick complete and depart rout }) test('dispatch and outbound adapters retain stable business identifiers and count progress', () => { - const dispatch = normalizeDispatchTask({ taskNo: 'DPT-1', dispatchNo: 'DSP-1', items: [{ dispatchItemId: 8, palletNo: 'PLT-1', scheduledPackages: 5, pickedPackages: 2, positions: [{ id: 9, availablePackages: 5, pickedPackages: 2 }] }] }) + const dispatch = normalizeDispatchTask({ taskNo: 'DPT-1', dispatchNo: 'DSP-1', canDepart: false, departBlockReason: '请先在平台完成“转派送”', items: [{ dispatchItemId: 8, palletNo: 'PLT-1', scheduledPackages: 5, pickedPackages: 2, positions: [{ id: 9, availablePackages: 5, pickedPackages: 2 }] }] }) assert.equal(dispatch.dispatchNo, 'DSP-1') assert.equal(dispatch.items[0].palletNo, 'PLT-1') assert.equal(dispatch.items[0].positions[0].availablePackages, 5) + assert.equal(dispatch.canDepart, false) + assert.equal(dispatch.departBlockReason, '请先在平台完成“转派送”') const outbound = normalizeOutboundTask({ task: { taskNo: 'OUT-TASK-1', outboundNo: 'OUT-1', status: 'PENDING' }, items: [{ outboundPalletItemId: 3, palletNo: 'PLT-2', skuCode: 'SKU-1', inboundCode: 'INB-1', packageCount: 4, pickedPackageCount: 1, status: 'PARTIAL_PICKED', positions: [{ inventoryPositionId: 7, palletNo: 'PLT-2', cartonMark: 'BOX-1', skuCode: 'SKU-1', inboundCode: 'INB-1', availablePackages: 3, pickedPackages: 1 }] }] }) assert.equal(outbound.taskNo, 'OUT-TASK-1') @@ -130,7 +132,8 @@ test('pages expose loading empty error offline and permission diagnostics with g assert.match(dispatch, /completeDispatchPicking/) assert.match(dispatch, /this\.remainingPackages === 0/) assert.doesNotMatch(dispatch, /partialReason|reason \}/) - assert.match(dispatch, /this\.pickingCompleted && this\.allPicked && !this\.departed/) + assert.match(dispatch, /this\.pickingCompleted && this\.allPicked && this\.current\?\.canDepart === true && !this\.departed/) + assert.match(dispatch, /current\.departBlockReason/) assert.match(dispatch, /this\.selectedPosition\?\.availablePackages \|\| 0/) assert.doesNotMatch(dispatch, /availablePackages - (?:this\.)?selectedPosition.*pickedPackages/) assert.match(dispatch, /departDispatch/)