优化

2026-08-17 16:17:25 +08:00
parent db43e3049a
commit ed8b01b9e3
5 changed files with 64 additions and 25 deletions
@@ -170,7 +170,7 @@
 					<text class="remote-error" role="alert">{{ remoteError }}</text>
 					<button class="evidence-retry-btn" :disabled="remoteLoading" @tap="refreshTask">刷新任务</button>
 				</view>
-				<button class="submit-btn" aria-label="提交拣货完成" :disabled="submitting || pickingCompleted || !summary.canSubmit" @tap="submitPicking">
+				<button class="submit-btn" aria-label="提交拣货完成" :disabled="submitting || (!pickingCompleted && !summary.canSubmit)" @tap="submitPicking">
 					{{ submitting ? '正在提交…' : submitButtonText }}
 				</button>
 			</view>
@@ -470,10 +470,10 @@
 				return ''
 			},
 			 submitButtonText() {
-				return this.pickingCompleted ? '该柜次已完成' : this.summary.buttonText
+				return this.pickingCompleted ? '继续装柜取证' : this.summary.buttonText
 			},
 			submitStatusHint() {
-				if (this.pickingCompleted) return '本柜次任务已完成'
+				if (this.pickingCompleted) return '拣货已完成，请继续装柜取证'
 				if (!this.summary.canSubmit) return '请先处理至少一件'
 				if (this.summary.pending > 0) return '提交时需选择原因'
 				return `已处理 ${this.summary.processed}/${this.summary.total}`
@@ -1045,7 +1045,7 @@
 					this.currentBox.currentContainerNo = task.currentContainerNo
 					const remoteTask = normalizePickingTask(task)
 					this.assignmentVersion = remoteTask.assignment?.version ?? remoteTask.assignmentVersion ?? (remoteTask.workflowStatus === 'UNASSIGNED' ? 0 : null)
-					if (this.assignmentVersion === null) throw new Error('任务领取状态尚未同步，请刷新重试')
+					if (remoteTask.workflowStatus !== 'AWAITING_REVIEW' && this.assignmentVersion === null) throw new Error('任务领取状态尚未同步，请刷新重试')
 					let claimed = null
 					if (remoteTask.workflowStatus === 'UNASSIGNED') {
 						const operationId = `claim-${session.currentUser?.id || 'operator'}-${this.remoteTaskId}-${task.loadingPlanId}-${task.containerBookingId}`
@@ -1083,7 +1083,10 @@
 						this.debugSubmit('refresh.incremental', { previousTaskVersion, taskVersion: this.pickingVersion, addedItemIds, pickingCompleted: this.pickingCompleted })
 						if (addedItemIds.length) this.showToast(`已同步 ${addedItemIds.length} 条新增待拣明细`, 'warning')
 					}
-					if (this.loadingStageReady) await this.loadLoadingEvidence()
+					if (this.loadingStageReady) {
+						this.activeStage = 'evidence'
+						await this.loadLoadingEvidence()
+					}
 				} catch (error) {
 					if (requestId !== this.taskRequestId) return
 					this.debugSubmit('refresh.error', { requestId, message: error.message || '', code: error.code || '', statusCode: error.statusCode || '', requestIdFromServer: error.requestId || '', traceId: error.traceId || '' })
@@ -1436,9 +1439,15 @@
 				this.closeOverlay(false)
 				this.requestBoxSwitch(entry.index)
 			},
-			submitPicking() {
+			async submitPicking() {
+				if (this.pickingCompleted) {
+					await this.syncRemoteTask()
+					if (this.loadingStageReady) this.activeStage = 'evidence'
+					else this.showToast('装柜状态尚未同步，请刷新重试', 'warning')
+					return
+				}
 				if (!this.requirePickingOperation()) return
-				if (!this.summary.canSubmit || this.pickingCompleted) return
+				if (!this.summary.canSubmit) return
 				if (this.summary.pending > 0) {
 					this.selectedIncompleteReason = ''
 					this.openOverlay('submitConfirm')
@@ -1465,13 +1474,6 @@
 					try {
 						if (!this.remoteTaskId) throw new Error('尚未进入服务端拣货任务，请联网刷新后重试')
 						if (this.pickingVersion === null) throw new Error(VERSION_SYNC_MESSAGE)
-						const operationIdentity = stableTaskOperationIdentity(this.draftIdentity())
-						const submitId = this.submitId || stableOperationId('submit', operationIdentity, { itemStates: this.itemStates, partialQuantities: this.partialQuantities, incompleteReason })
-						this.submitId = submitId
-						const warehouseId = this.currentBox.warehouseId || session.currentUser?.warehouseId || session.currentUser?.warehouse
-						const inventorySnapshot = await this.refreshInventorySnapshot()
-						this.debugSubmit('submit.inventory-snapshot', { snapshotTokenLength: inventorySnapshot?.snapshotToken ? String(inventorySnapshot.snapshotToken).length : 0, taskVersion: inventorySnapshot?.version ?? null })
-						if (!inventorySnapshot?.snapshotToken) throw new Error('库存快照未同步，请刷新任务后重试')
 						const actions = this.currentBox.items.map((item) => {
 							if (item.itemStatus && !['PENDING', 'PICKING'].includes(item.itemStatus)) return null
 							const status = this.itemState(item)
@@ -1482,6 +1484,20 @@
 							if (incompleteReason) return { type: 'SKIP', itemId, reason: `${incompleteReason}（提交时确认未拣）`, version: Number(item.version || 0) }
 							return null
 						}).filter(Boolean)
+						if (!actions.length) {
+							this.debugSubmit('submit.empty-refresh', { serverItemStatuses: this.currentBox.items.map((item) => item.itemStatus || null) })
+							await this.syncRemoteTask()
+							if (this.loadingStageReady) this.activeStage = 'evidence'
+							else this.showToast('没有可提交的待拣明细，已刷新任务', 'warning')
+							return
+						}
+						const operationIdentity = stableTaskOperationIdentity(this.draftIdentity())
+						const submitId = this.submitId || stableOperationId('submit', operationIdentity, { itemStates: this.itemStates, partialQuantities: this.partialQuantities, incompleteReason })
+						this.submitId = submitId
+						const warehouseId = this.currentBox.warehouseId || session.currentUser?.warehouseId || session.currentUser?.warehouse
+						const inventorySnapshot = await this.refreshInventorySnapshot()
+						this.debugSubmit('submit.inventory-snapshot', { snapshotTokenLength: inventorySnapshot?.snapshotToken ? String(inventorySnapshot.snapshotToken).length : 0, taskVersion: inventorySnapshot?.version ?? null })
+						if (!inventorySnapshot?.snapshotToken) throw new Error('库存快照未同步，请刷新任务后重试')
 						this.debugSubmit('submit.batch', { localItemIds: this.currentBox.items.map((item) => item.id), actionItemIds: actions.map((action) => action.itemId), actionCount: actions.length })
 						const submittedTask = await submitContainerPickingBatch({ taskId: this.remoteTaskId, loadingPlanId: this.currentBox.loadingPlanId, containerBookingId: this.currentBox.containerBookingId, version: Number(this.pickingVersion) }, actions, { warehouseId, operationId: submitId, inventorySnapshotToken: inventorySnapshot?.snapshotToken })
 						this.debugSubmit('submit.success', { itemCount: actions.length, workflowStatus: submittedTask?.workflowStatus || null, taskStatus: submittedTask?.taskStatus || null })