From e8f9ccad95b395cbebc1cdb2a8238cd072287112 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sun, 20 Sep 2026 00:31:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(workbench):=20getWorkbenchCount=20?= =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E6=89=93=E5=8C=85=E7=BB=9F=E8=AE=A1=20+=20pa?= =?UTF-8?q?ckOrder=20=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=A4=8D=E6=9F=A5?= =?UTF-8?q?=E8=90=BD=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 workbench.getWorkbenchCount:以工作台 token 鉴权,统计本地 08:00→次日 08:00 班次窗口; 个人工作台统计涉及本人数据(团购波次数量/团购订单数量/散单数量/团散/均件数), 团体工作台统计涉及工作台数据(团购波次数量/团购订单数量/散单数量) - packOrder 打包数量/商品总件数/商品种类数改为服务端复查:散单取订单分表、团购取波次实时统计 (totalOrders + 波次 SKU 聚合 15s 缓存),设备上报仅交叉校验日志;修复散单 sku_count 兜底误读 item_count 列名 - wms_pack_task 新增 (workbench_id, create_time) 复合索引迁移,避免统计查询长跨度扫描慢 SQL - 同步 methods/system.json(0.3.142)/methods/changes/system.json,刷新 AI_METHOD_ROUTING.md - 一并提交上一轮未提交的 order.wave.batchList sync_assignment_status 输出与筛选 --- AI_METHOD_ROUTING.md | 42 ++- app/model/pack_task.js | 1 + app/service/systemMethods/order/wave.js | 56 ++++ app/service/systemMethods/workbench.js | 29 +- app/service/systems/workbench.js | 283 +++++++++++++++++- ...ench-create-time-index-to-wms-pack-task.js | 19 ++ methods/changes/system.json | 61 ++++ methods/system.json | 105 ++++++- 8 files changed, 566 insertions(+), 30 deletions(-) create mode 100644 database/migrations/20260919100000-add-workbench-create-time-index-to-wms-pack-task.js diff --git a/AI_METHOD_ROUTING.md b/AI_METHOD_ROUTING.md index 21bfb0a..3567009 100644 --- a/AI_METHOD_ROUTING.md +++ b/AI_METHOD_ROUTING.md @@ -304,10 +304,10 @@ rg "class .*Service|module.exports" app/service/qimenMethods - 临时清单输出:temp/tmp-service-method-inventory.md -自动生成时间: 2026-09-15T16:36:08.605Z +自动生成时间: 2026-09-19T07:16:48.802Z 扫描范围: app/service/**/*.js -文件数: 212 +文件数: 216 - app/service/api.js (1) - callMethod @@ -323,22 +323,28 @@ rg "class .*Service|module.exports" app/service/qimenMethods - ping, ssoCodeToId, getStoreEmployees - app/service/inbox/ai.js (3) - callDeepSeek, getConversationHistory, processWithAI -- app/service/inbox/functions.js (3) - - registerBuiltinFunctions, register, callFunction +- app/service/inbox/functions.js (4) + - registerBuiltinFunctions, notifyStoreReceiving, register, callFunction - app/service/inbox/groups.js (4) - resolveActiveGroups, isFunctionAvailable, getFunctionList, buildFunctionListText - app/service/inbox/index.js (5) - list, detail, thread, reply, stats - app/service/inbox/message.js (10) - list, _normalizeIds, _normalizeStrings, detail, thread, stats, retry, _repush, retryFailed, retryFailedByWarehouse -- app/service/inbox/processor.js (15) - - _loadGroupInfo, isStaleMessage, process, handleApiMessage, tryBindGroup, writeOutboundReply, isBlocked, invalidateBlockCache, getApiAppCallbackConfig, getApiAppCallbackUrl, pushSystemNotification, extractWarehouseId, extractStoreId, getWarehouseIdFromContext, getStoreIdFromContext +- app/service/inbox/processor.js (17) + - _loadGroupInfo, isStaleMessage, process, handleApiMessage, tryBindGroup, writeOutboundReply, isWarehouseGroup, isBlocked, loadBlockedUserIds, invalidateBlockCache, getApiAppCallbackConfig, getApiAppCallbackUrl, pushSystemNotification, extractWarehouseId, extractStoreId, getWarehouseIdFromContext, getStoreIdFromContext - app/service/inbox/receiver.js (1) - receive - app/service/inbox/rules.js (3) - handle, buildReply, formatStock - app/service/inbox/tools.js (2) - getRecordingComputerId, buildVideoUrl +- app/service/inbox/v2/config.js (3) + - load, invalidate, build +- app/service/inbox/v2/functionSync.js (1) + - sync +- app/service/inbox/v2/rules.js (9) + - handle, _matchKeywords, _groupAllowed, _extractNumbers, join, _buildParams, _noNumberHint, _buildOutcome, _renderReply - app/service/main.js (18) - success, fail, normalizeDate, setInfo, getInfo, isPlainObject, normalizeWhereCondition, normalizeWhereParams, extractWhereValues, prepareWhereContext, findQimenAppWithContract, queryFromDatabase, checkAuth, checkApiPermission, extractApiPermissionState, collectApiPermissionValue, setUserContext, systemInit - app/service/openapi/callback.js (6) @@ -403,8 +409,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods - storeStats, storeSideStoreStats, queryWarehouseStats, mergeStoreStats, emptyStoreStats, warehouseStats, hot_order_rank, express_ratio, storeSideExpressRatio, queryWarehouseExpressRatio, mergeChartData, formatChartData, emptyChartData, platform_distribution, storeSidePlatformDistribution, queryWarehousePlatformDistribution, order_trend - app/service/systemMethods/frontConfig.js (1) - getByDomain -- app/service/systemMethods/inbox.js (13) - - group, message, after_sales, bindCode, groupList, groupQuickList, groupMembers, groupDisable, groupUpdate, groupReset, groupMessages, retry, reply +- app/service/systemMethods/inbox.js (14) + - group, message, v2, after_sales, bindCode, groupList, groupQuickList, groupMembers, groupDisable, groupUpdate, groupReset, groupMessages, retry, reply - app/service/systemMethods/index.js (58) - fastWhereTree, loadStores, loadWarehouses, loadExpressInterfaces, getCOSUploadConfig, getImages, uploadSuccessNotify, recognizeLicensePlate, ReferenceFile, getMessageDetail, test, getI18nMessage, putI18nCollect, extractModule, tryAutoTranslateNewKeys, searchSpace, searchSpaces, listInterfaceTypes, getLocationTypeList, getQimenAppList, getExpressList, getExpressProductTypeList, getPlatformList, getPrintPlatformList, ensureShopPrintPlatformExists, buildShopPrintPlatformInclude, getShopList, requestPddWaybillSearch, requestPddStdTemplates, requestTbWaybillSearch, requestTbCainiaoStdTemplates, requestPolyStdTemplates, getShopExpressList, getCainiaoStfTemplates, normalizeTemplatePlatformCode, normalizeTemplateExpressCode, getExpressPlatformFieldName, getTemplateAllowedExpressCodeSet, filterPrintPlatformTemplateResponseData, getPrintPlatformTemplateCacheKey, requestPrintPlatformTemplateList, resolvePddTemplateWpCodeCandidates, requestPddTemplateSourceList, getPrintPlatformTemplateList, isPlatformOauthReservationDuplicateError, getPlatformOauthReservationCodePrefix, hasPlatformOauthReservationCodePrefix, normalizePlatformOauthReservationCode, generatePlatformOauthReservationCode, createPlatformOauthReservation, getPlatformOauthLink, listenPlatformOauthBind, loginToIm, polyapiAuthorizeUrl, toOrder, getWorkbenchBindCode, LoginWorkbenchByCode, queryUserByToken - app/service/systemMethods/order/archiveOrder.js (2) @@ -435,8 +441,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods - list, reviewOrder - app/service/systemMethods/order/storageAllocation.js (0) - -- app/service/systemMethods/order/wave.js (233) - - buildBatchAllocateExpressTraceId, buildOrderOperationLogRows, batchCreateOrderOperationLogs, buildMachineStructureToken, parseMachineStructureToken, getOrderItemPart, getDefaultWaveQuantity, getMinGroupOrderFetchQuantity, getGroupWavePrefix, getSingleFetchByIdsWavePrefix, getWarehouseSubjectConfig, getWarehouseSubjectConfigValue, normalizeFetchStructureRequests, generateWaveId, getCurrentDatePart, VALUES, getNextWaveNoSequence, buildWaveNo, id, getWaveCreator, extractInsertId, extractLastInsertId, isDuplicateEntryError, resolveWaveScopeByWaveMeta, createWaveBatchReady, buildFetchWhere, fetchSingleStructure, normalizeBoolean, normalizePositiveInteger, normalizeRequiredPositiveInteger, normalizeIdsInput, normalizePagination, normalizeWaveStatusList, normalizeBatchListStorageAssignmentStatusFilter, normalizeBatchListExpressAssignmentStatusFilter, normalizeBatchListPrintAssignmentStatusFilter, normalizeBatchListReviewAssignmentStatusFilter, getBatchListAssignmentFilterSchema, normalizeBatchListAssignmentStatusFilterByType, normalizeBatchListAssignmentStatusFilter, getModelTableSqlName, buildBatchListStorageAssignmentFilterClause, buildBatchListExpressAssignmentFilterClause, buildBatchListPrintAssignmentFilterClause, buildBatchListReviewAssignmentFilterClause, buildBatchListAssignmentStatusFilterClauseByType, buildBatchListAssignmentStatusFilterClause, isEmptyBatchListWhereValue, resolveBatchListFieldCondition, buildBatchListFieldConditionSql, normalizeBatchListDistinguishExpressValue, normalizeBatchListStoreIdCondition, buildBatchListWhereClause, normalizeWavePickTaskListPagination, normalizeWavePickTaskListRequest, buildWavePickTaskListWhereClause, resolveAssignmentStatus, normalizeSkuText, normalizeShopName, parseItemSnapshot, normalizeOrderItemRow, mergeOrderItemDetails, buildItemSummary, buildOrderItemSnapshot, buildItemSnapshotKey, orderMatchesIncludeSku, buildCoarseGroupKey, buildStatusSummary, buildGroupKey, groupOrderFetchList, singleOrderFetchList, waveStrategyList, getWaveStrategyNextFetchOrderCountMap, getWaveStrategyDebugFetchOrderListMap, previewWaveStrategyNextFetchOrderCount, getWaveStrategyMatchedOrderCountFilteredMap, getWaveStrategyMatchedOrderCountTotal, waveStrategyCreate, waveStrategyUpdate, bumpWaveStrategyVersionAndInvalidateCache, getWaveStrategyModel, normalizeWaveStrategyId, normalizeWaveStrategyUpsertPayload, normalizeWaveStrategyWavePrefix, resolveWaveStrategyFetchWavePrefix, patchWaveStrategyIntegerField, validateWaveStrategyAllowedOwners, validateWaveStrategyAllowedExpresses, getWaveStrategyAvailableOwnerSet, getWaveStrategyAvailableExpressSet, applyWaveStrategyMaxSameStructureConstraint, normalizeWaveStrategyFallbackOrderListWhere, resolveWaveStrategyFallbackTrackingNo, resolveWaveStrategyFallbackStoreName, resolveWaveStrategyFallbackSysLogisticsName, buildWaveStrategyFallbackOrderListItem, waveStrategyFallbackOrderList, resolveWaveBatchOwnerStoreNameMap, batchList, wavePickTaskList, batchCancel, batchCancelTaskProgress, batchAllocateExpress, batchAllocateExpressTaskProgress, batchAllocateStorage, batchAllocateStorageTaskProgress, submitWaveStrategyQuickScanForWarehouse, waveStrategyQuickScan, waveStrategyQuickScanTaskProgress, buildWaveStrategyQuickScanOrderWhere, getWaveStrategyQuickScanStrategyRows, getWaveStrategyQuickScanMatchModel, syncWaveStrategyQuickScanMatchedStrategies, cleanupWaveStrategyQuickScanMatchedStrategies, cleanupWaveStrategyQuickScanMatchedStrategiesByOrderIds, enqueueWaveStrategyQuickScanPostOrderChange, executeWaveStrategyQuickScan, runWaveStrategyQuickScanTask, batchUpdateWaveStrategyQuickScanOrders, generateWaveStrategyQuickScanTaskId, normalizeWaveStrategyQuickScanTaskId, getWaveStrategyQuickScanTaskCacheKey, setWaveStrategyQuickScanTaskProgress, getWaveStrategyQuickScanTaskProgress, getWaveStrategyQuickScanWarehouseLockCacheKey, setWaveStrategyQuickScanWarehouseLock, getWaveStrategyQuickScanWarehouseLock, clearWaveStrategyQuickScanWarehouseLock, normalizeWaveStrategyQuickScanVersion, normalizeWaveStrategyQuickScanList, normalizeWaveStrategyQuickScanNumberOrNull, normalizeWaveStrategyQuickScanBoolean, normalizeWaveStrategyQuickScanStringList, getWaveStrategyQuickScanStructureKey, getWaveStrategyQuickScanExpressKey, filterCandidateOrdersByRequireSameExpress, isWaveStrategyQuickScanOrderMatched, getWaveStrategyQuickScanMatchedStrategyIds, isWaveStrategyQuickScanOrderMatchedSingleStrategy, isWaveStrategyQuickScanValueInRange, resolveGroupCandidateOrderIdsForSingleFetch, singleFetchByIds, batchRemoveOrders, resortWaveIndex, batchRemoveExceptionOrders, batchRemoveExceptionOrdersTaskProgress, generateBatchCancelTaskId, normalizeBatchCancelTaskId, generateBatchRemoveExceptionOrdersTaskId, normalizeBatchRemoveExceptionOrdersTaskId, normalizeBatchRemoveExceptionOrdersWaveIds, getBatchRemoveExceptionOrdersTaskCacheKey, setBatchRemoveExceptionOrdersTaskProgress, getBatchRemoveExceptionOrdersTaskProgress, isExceptionRemovableOrder, runBatchRemoveExceptionOrdersTask, normalizeBatchCancelWaveIds, getBatchCancelTaskCacheKey, setBatchCancelTaskProgress, getBatchCancelTaskProgress, runBatchCancelTask, generateBatchAllocateExpressTaskId, normalizeBatchAllocateExpressTaskId, normalizeBatchAllocateExpressWaveIds, getBatchAllocateExpressTaskCacheKey, setBatchAllocateExpressTaskProgress, getBatchAllocateExpressTaskProgress, generateBatchAllocateStorageTaskId, normalizeBatchAllocateStorageTaskId, normalizeBatchAllocateStorageWaveIds, normalizeBatchAllocateStorageTaskCount, buildBatchAllocateStorageRunningProgressPayload, normalizeBatchAllocateStorageOrderIds, getBatchAllocateStorageTaskCacheKey, getBatchAllocateStorageWarehouseLockKey, tryAcquireBatchAllocateStorageWarehouseLock, releaseBatchAllocateStorageWarehouseLock, setBatchAllocateStorageTaskProgress, getBatchAllocateStorageTaskProgress, isMissingBusinessKeyColumnError, runBatchAllocateExpressTask, runBatchAllocateStorageTask, batchAutoGrouping, batchFinishAutoGrouping, generateFetchTaskId, normalizeFetchTaskId, getFetchTaskCacheKey, setFetchTaskProgress, getFetchTaskProgress, fetchTaskProgress, runFetchTask, submitFetchTask, groupFetch, singleFetch, resolveWaveStrategyFetchPickMode, buildWaveStrategyFetchBoxAssignments, prepareWaveStrategyFetchPlan, in, ensureNoActiveWavePickTaskForOperator, normalizeWaveStrategyFetchCreatedBefore, buildWaveStrategyFetchTodayStart, getWaveStrategyFetchCandidateOrders, groupWaveStrategyFetchCandidateOrdersByStructure, buildWaveStrategyFetchOrderSkuMap, selectWaveStrategyFetchOrdersBySkuLimit, createWaveBatchByOrderIdsInTransaction, mergeWaveStrategyFirstPoolSameStructureOrders, autoPopulateWaveStrategyFetchSelections, executeWaveStrategyDirectFetch, createWavePickTaskFromPlan, buildTaskCreatePayload, buildTaskWaveRows, buildTaskOrderRows, buildTaskSkuRows, buildTaskBoxRows, bindPickCartForTask, initTaskCheckpointAndLogs, ensurePickCartAvailable, generateWavePickTaskNo, createWavePickTaskWithRetry, isTaskNoDuplicateError, bulkInsertRows, parseWaveStrategyExistingTaskInfo, waveStrategyFetchPda, cancelWavePickTasksInternal, wavePickTaskCancel, wavePickTaskCancelSelf, waveStrategyFetchAdmin, deleteOrderWaveIndexByOrderIds, deleteOrderWaveIndexByWaveIds, rebuildOrderWaveIndex, replaceOrderWaveIndexByWaveIds, fetch +- app/service/systemMethods/order/wave.js (235) + - buildBatchAllocateExpressTraceId, buildOrderOperationLogRows, batchCreateOrderOperationLogs, buildMachineStructureToken, parseMachineStructureToken, getOrderItemPart, getDefaultWaveQuantity, getMinGroupOrderFetchQuantity, getGroupWavePrefix, getSingleFetchByIdsWavePrefix, getWarehouseSubjectConfig, getWarehouseSubjectConfigValue, normalizeFetchStructureRequests, generateWaveId, getCurrentDatePart, VALUES, getNextWaveNoSequence, buildWaveNo, id, getWaveCreator, extractInsertId, extractLastInsertId, isDuplicateEntryError, resolveWaveScopeByWaveMeta, createWaveBatchReady, buildFetchWhere, fetchSingleStructure, normalizeBoolean, normalizePositiveInteger, normalizeRequiredPositiveInteger, normalizeIdsInput, normalizePagination, normalizeWaveStatusList, normalizeBatchListStorageAssignmentStatusFilter, normalizeBatchListExpressAssignmentStatusFilter, normalizeBatchListPrintAssignmentStatusFilter, normalizeBatchListReviewAssignmentStatusFilter, normalizeBatchListSyncAssignmentStatusFilter, getBatchListAssignmentFilterSchema, normalizeBatchListAssignmentStatusFilterByType, normalizeBatchListAssignmentStatusFilter, getModelTableSqlName, buildBatchListStorageAssignmentFilterClause, buildBatchListExpressAssignmentFilterClause, buildBatchListPrintAssignmentFilterClause, buildBatchListReviewAssignmentFilterClause, buildBatchListSyncAssignmentFilterClause, buildBatchListAssignmentStatusFilterClauseByType, buildBatchListAssignmentStatusFilterClause, isEmptyBatchListWhereValue, resolveBatchListFieldCondition, buildBatchListFieldConditionSql, normalizeBatchListDistinguishExpressValue, normalizeBatchListStoreIdCondition, buildBatchListWhereClause, normalizeWavePickTaskListPagination, normalizeWavePickTaskListRequest, buildWavePickTaskListWhereClause, resolveAssignmentStatus, normalizeSkuText, normalizeShopName, parseItemSnapshot, normalizeOrderItemRow, mergeOrderItemDetails, buildItemSummary, buildOrderItemSnapshot, buildItemSnapshotKey, orderMatchesIncludeSku, buildCoarseGroupKey, buildStatusSummary, buildGroupKey, groupOrderFetchList, singleOrderFetchList, waveStrategyList, getWaveStrategyNextFetchOrderCountMap, getWaveStrategyDebugFetchOrderListMap, previewWaveStrategyNextFetchOrderCount, getWaveStrategyMatchedOrderCountFilteredMap, getWaveStrategyMatchedOrderCountTotal, waveStrategyCreate, waveStrategyUpdate, bumpWaveStrategyVersionAndInvalidateCache, getWaveStrategyModel, normalizeWaveStrategyId, normalizeWaveStrategyUpsertPayload, normalizeWaveStrategyWavePrefix, resolveWaveStrategyFetchWavePrefix, patchWaveStrategyIntegerField, validateWaveStrategyAllowedOwners, validateWaveStrategyAllowedExpresses, getWaveStrategyAvailableOwnerSet, getWaveStrategyAvailableExpressSet, applyWaveStrategyMaxSameStructureConstraint, normalizeWaveStrategyFallbackOrderListWhere, resolveWaveStrategyFallbackTrackingNo, resolveWaveStrategyFallbackStoreName, resolveWaveStrategyFallbackSysLogisticsName, buildWaveStrategyFallbackOrderListItem, waveStrategyFallbackOrderList, resolveWaveBatchOwnerStoreNameMap, batchList, wavePickTaskList, batchCancel, batchCancelTaskProgress, batchAllocateExpress, batchAllocateExpressTaskProgress, batchAllocateStorage, batchAllocateStorageTaskProgress, submitWaveStrategyQuickScanForWarehouse, waveStrategyQuickScan, waveStrategyQuickScanTaskProgress, buildWaveStrategyQuickScanOrderWhere, getWaveStrategyQuickScanStrategyRows, getWaveStrategyQuickScanMatchModel, syncWaveStrategyQuickScanMatchedStrategies, cleanupWaveStrategyQuickScanMatchedStrategies, cleanupWaveStrategyQuickScanMatchedStrategiesByOrderIds, enqueueWaveStrategyQuickScanPostOrderChange, executeWaveStrategyQuickScan, runWaveStrategyQuickScanTask, batchUpdateWaveStrategyQuickScanOrders, generateWaveStrategyQuickScanTaskId, normalizeWaveStrategyQuickScanTaskId, getWaveStrategyQuickScanTaskCacheKey, setWaveStrategyQuickScanTaskProgress, getWaveStrategyQuickScanTaskProgress, getWaveStrategyQuickScanWarehouseLockCacheKey, setWaveStrategyQuickScanWarehouseLock, getWaveStrategyQuickScanWarehouseLock, clearWaveStrategyQuickScanWarehouseLock, normalizeWaveStrategyQuickScanVersion, normalizeWaveStrategyQuickScanList, normalizeWaveStrategyQuickScanNumberOrNull, normalizeWaveStrategyQuickScanBoolean, normalizeWaveStrategyQuickScanStringList, getWaveStrategyQuickScanStructureKey, getWaveStrategyQuickScanExpressKey, filterCandidateOrdersByRequireSameExpress, isWaveStrategyQuickScanOrderMatched, getWaveStrategyQuickScanMatchedStrategyIds, isWaveStrategyQuickScanOrderMatchedSingleStrategy, isWaveStrategyQuickScanValueInRange, resolveGroupCandidateOrderIdsForSingleFetch, singleFetchByIds, batchRemoveOrders, resortWaveIndex, batchRemoveExceptionOrders, batchRemoveExceptionOrdersTaskProgress, generateBatchCancelTaskId, normalizeBatchCancelTaskId, generateBatchRemoveExceptionOrdersTaskId, normalizeBatchRemoveExceptionOrdersTaskId, normalizeBatchRemoveExceptionOrdersWaveIds, getBatchRemoveExceptionOrdersTaskCacheKey, setBatchRemoveExceptionOrdersTaskProgress, getBatchRemoveExceptionOrdersTaskProgress, isExceptionRemovableOrder, runBatchRemoveExceptionOrdersTask, normalizeBatchCancelWaveIds, getBatchCancelTaskCacheKey, setBatchCancelTaskProgress, getBatchCancelTaskProgress, runBatchCancelTask, generateBatchAllocateExpressTaskId, normalizeBatchAllocateExpressTaskId, normalizeBatchAllocateExpressWaveIds, getBatchAllocateExpressTaskCacheKey, setBatchAllocateExpressTaskProgress, getBatchAllocateExpressTaskProgress, generateBatchAllocateStorageTaskId, normalizeBatchAllocateStorageTaskId, normalizeBatchAllocateStorageWaveIds, normalizeBatchAllocateStorageTaskCount, buildBatchAllocateStorageRunningProgressPayload, normalizeBatchAllocateStorageOrderIds, getBatchAllocateStorageTaskCacheKey, getBatchAllocateStorageWarehouseLockKey, tryAcquireBatchAllocateStorageWarehouseLock, releaseBatchAllocateStorageWarehouseLock, setBatchAllocateStorageTaskProgress, getBatchAllocateStorageTaskProgress, isMissingBusinessKeyColumnError, runBatchAllocateExpressTask, runBatchAllocateStorageTask, batchAutoGrouping, batchFinishAutoGrouping, generateFetchTaskId, normalizeFetchTaskId, getFetchTaskCacheKey, setFetchTaskProgress, getFetchTaskProgress, fetchTaskProgress, runFetchTask, submitFetchTask, groupFetch, singleFetch, resolveWaveStrategyFetchPickMode, buildWaveStrategyFetchBoxAssignments, prepareWaveStrategyFetchPlan, in, ensureNoActiveWavePickTaskForOperator, normalizeWaveStrategyFetchCreatedBefore, buildWaveStrategyFetchTodayStart, getWaveStrategyFetchCandidateOrders, groupWaveStrategyFetchCandidateOrdersByStructure, buildWaveStrategyFetchOrderSkuMap, selectWaveStrategyFetchOrdersBySkuLimit, createWaveBatchByOrderIdsInTransaction, mergeWaveStrategyFirstPoolSameStructureOrders, autoPopulateWaveStrategyFetchSelections, executeWaveStrategyDirectFetch, createWavePickTaskFromPlan, buildTaskCreatePayload, buildTaskWaveRows, buildTaskOrderRows, buildTaskSkuRows, buildTaskBoxRows, bindPickCartForTask, initTaskCheckpointAndLogs, ensurePickCartAvailable, generateWavePickTaskNo, createWavePickTaskWithRetry, isTaskNoDuplicateError, bulkInsertRows, parseWaveStrategyExistingTaskInfo, waveStrategyFetchPda, cancelWavePickTasksInternal, wavePickTaskCancel, wavePickTaskCancelSelf, waveStrategyFetchAdmin, deleteOrderWaveIndexByOrderIds, deleteOrderWaveIndexByWaveIds, rebuildOrderWaveIndex, replaceOrderWaveIndexByWaveIds, fetch - app/service/systemMethods/outbound.js (1) - autoOutbound - app/service/systemMethods/pick.js (14) @@ -531,8 +537,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods - getWarehouseZones, getWarehouseTree, getChildren, create, update, delete, detail, checkBarcodeUnique, toggleActive, getPath, getPickPath, updateRackPosition, recalculatePickPath, updateNeighbors, getAreaRacks, getSpacesByRack, createRackWithSpaces, getSpaceInfo, updateSpaceInfo, getBatchFieldValue, hasBatchField, normalizeBatchString, getCurrentWarehouseCode, batchUpdateSpaceInfo, exportRackSpaces - app/service/systemMethods/waybill/warehouse.js (9) - list, detail, export, exportTaskProgress, generateExportTaskId, normalizeExportTaskId, getExportTaskCacheKey, setExportTaskProgress, getExportTaskProgress -- app/service/systemMethods/workbench.js (16) - - list, detail, create, update, delete, business, bindCamera, bind, getWorkbenchInfo, resetLoginCode, removeMember, bindMember, packOrder, finishPack, sendWeight, queryOrder +- app/service/systemMethods/workbench.js (17) + - list, detail, create, update, delete, business, bindCamera, bind, getWorkbenchInfo, resetLoginCode, removeMember, bindMember, packOrder, finishPack, sendWeight, queryOrder, getWorkbenchCount - app/service/systems/account_platform.js (11) - getActiveInclude, getPrimaryRoleBinding, formatActiveContext, switchActiveRole, getActiveRoleByPlatform, getMultiplePlatformActiveRoles, getAllPlatformActives, clearPlatformActive, clearPlatformCache, getAvailableRoles, getCurrentContext - app/service/systems/afterSale.js (46) @@ -569,8 +575,10 @@ rg "class .*Service|module.exports" app/service/qimenMethods - getImages, ReferenceFile - app/service/systems/inbound_direct_log.js (15) - getItems, _addSingleItem, _bindReceivingDetail, addItem, removeItem, commit, notifyEntryOrderCompleted, _queryCompletedEntryItems, _buildCompletedItemLines, buildEntryOrderConfirmRequest, _sendOpenApiCallback, operationLog, qimenEntrySync, _syncReceivingStorageStatus, _applyReceivingStockOccupancy -- app/service/systems/inbox/group.js (10) - - list, quickList, members, disable, update, reset, validateExpressInterfaces, validateSystemExpressCode, findGroupsByExpress, findStoreAfterSalesGroups +- app/service/systems/inbox/group.js (11) + - list, quickList, members, disable, update, reset, validateExpressInterfaces, validateSystemExpressCode, findGroupsByExpress, findStoreAfterSalesGroups, findStoreGroups +- app/service/systems/inbox/v2.js (41) + - wid, _invalidate, _op, _assertWritableSubType, _findSubType, _page, type, _typeList, _typeCreate, _typeUpdate, _typeDelete, subType, _subTypeList, _subTypeCreate, _subTypeUpdate, _subTypeDelete, keyword, _keywordList, _keywordDupDescribe, _keywordCreate, _keywordUpdate, _keywordDelete, numberRule, _numberRuleList, function, _functionList, _functionUpdate, reply, _replySave, _replyRestore, _replyMerged, _replyCreate, _replyUpdate, _replyDelete, relation, _relFunctionList, _relFunctionSet, _relRuleList, _relRuleSet, _relGroupList, _relGroupSet - app/service/systems/intercept_auto_confirm.js (10) - withPatchedCtxUser, listCurrentWarehouseIds, NOW, buildCandidateWhereSql, Date, matchesAutoConfirmCriteria, resolveCurrentTableName, scanCandidateOrderIds, confirmInterceptForOrderIds, runAutoConfirm - app/service/systems/license_plate.js (7) @@ -723,8 +731,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods - closeFinishedWaves, normalizeConfirmIntervalMs, readEmptyConfirmState, writeEmptyConfirmState - app/service/systems/waybill.js (5) - toOrder, list, detail, export, buildWaybillExportFile -- app/service/systems/workbench.js (65) - - list, detail, create, update, delete, bindCamera, business, _countWaveOrders, _countWaveOrdersCached, SUM, _sumWaveItemsTotal, _sumWaveItemsTotalCached, _getWaveOrderIds, Set, _buildPackChangeSummary, _writePackOperationLog, _updateOrderPackStatus, _packOrder, resolvePackTaskEndTime, _finishPack, _resetPackOsd, _sendWeight, _writeWeighOpLog, _aggregateWaveItems, _fetchWaveItemsSummary, _fetchOrderItemsDetail, _queryOrder, getWorkbenchBindClientCacheKey, getWorkbenchBindCodeCacheKey, getWorkbenchTokenCacheKey, generateRandomChars, generateWorkbenchToken, generateWorkbenchLoginCode, normalizeWorkbenchBindCode, generateUniqueWorkbenchLoginCode, createUniqueWorkbenchClientCode, createUniqueWorkbenchBindCode, buildWorkbenchBindState, getWorkbenchBindRemainingSeconds, setWorkbenchBindState, createWorkbenchBindSession, refreshWorkbenchBindCode, formatWorkbenchBindData, waitForWorkbenchBindComplete, getWorkbenchBindCode, formatWorkbenchTokenInfo, listWorkbenchMembers, listCurrentPackTasks, buildCurrentPackingInfo, invalidateWorkbenchTokenCacheByWorkbenchId, buildWorkbenchTokenInfo, bindWorkbench, getWorkbenchInfoByToken, loginWorkbenchByCode, resetLoginCode, clearExpiredWorkbenchTokens, resolveWorkbenchContext, resolveWorkbenchByToken, packOrderByToken, finishPackByToken, sendWeightByToken, queryOrderByToken, normalizeWorkbenchMemberIds, removeWorkbenchMember, bindWorkbenchMember +- app/service/systems/workbench.js (69) + - list, detail, create, update, delete, bindCamera, business, _countWaveOrders, _countWaveOrdersCached, SUM, _sumWaveItemsTotal, _sumWaveItemsTotalCached, _getWaveOrderIds, Set, _buildPackChangeSummary, _writePackOperationLog, _updateOrderPackStatus, _packOrder, resolvePackTaskEndTime, _finishPack, _resetPackOsd, _sendWeight, _writeWeighOpLog, _aggregateWaveItems, _fetchWaveItemsSummary, _fetchOrderItemsDetail, _queryOrder, getWorkbenchBindClientCacheKey, getWorkbenchBindCodeCacheKey, getWorkbenchTokenCacheKey, generateRandomChars, generateWorkbenchToken, generateWorkbenchLoginCode, normalizeWorkbenchBindCode, generateUniqueWorkbenchLoginCode, createUniqueWorkbenchClientCode, createUniqueWorkbenchBindCode, buildWorkbenchBindState, getWorkbenchBindRemainingSeconds, setWorkbenchBindState, createWorkbenchBindSession, refreshWorkbenchBindCode, formatWorkbenchBindData, waitForWorkbenchBindComplete, getWorkbenchBindCode, formatWorkbenchTokenInfo, listWorkbenchMembers, listCurrentPackTasks, buildCurrentPackingInfo, invalidateWorkbenchTokenCacheByWorkbenchId, buildWorkbenchTokenInfo, bindWorkbench, getWorkbenchInfoByToken, _round2, _formatPackCountTime, buildWorkbenchPackCountTimeRange, getWorkbenchCountByToken, loginWorkbenchByCode, resetLoginCode, clearExpiredWorkbenchTokens, resolveWorkbenchContext, resolveWorkbenchByToken, packOrderByToken, finishPackByToken, sendWeightByToken, queryOrderByToken, normalizeWorkbenchMemberIds, removeWorkbenchMember, bindWorkbenchMember - app/service/warehouse.js (7) - resolveWarehouseMethod, getWarehouseMethodService, dispatchWarehouseMethod, validateWarehouseParams, parseJsonBody, normalizeSignFields, processRequest - app/service/warehouseMethods/inbox.js (2) @@ -775,6 +783,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods + + diff --git a/app/model/pack_task.js b/app/model/pack_task.js index fe2319f..af74192 100644 --- a/app/model/pack_task.js +++ b/app/model/pack_task.js @@ -130,6 +130,7 @@ module.exports = app => { { name: 'idx_warehouse_id', fields: [ 'warehouse_id' ] }, { name: 'idx_warehouse_create_time', fields: [ 'warehouse_id', 'create_time' ] }, { name: 'idx_workbench_id', fields: [ 'workbench_id' ] }, + { name: 'idx_workbench_create_time', fields: [ 'workbench_id', 'create_time' ] }, { name: 'idx_wave_id', fields: [ 'wave_id' ] }, { name: 'idx_waybill_code', fields: [ 'waybill_code' ] }, { name: 'idx_pack_mode_status', fields: [ 'pack_mode', 'status' ] }, diff --git a/app/service/systemMethods/order/wave.js b/app/service/systemMethods/order/wave.js index e9d9db7..e8e463a 100644 --- a/app/service/systemMethods/order/wave.js +++ b/app/service/systemMethods/order/wave.js @@ -98,6 +98,17 @@ const BATCH_LIST_ASSIGNMENT_FILTER_SCHEMAS = Object.freeze({ statsColumnPrefix: 'review', withErrorStatus: true, }), + sync: Object.freeze({ + fieldName: 'sync_assignment_status', + enumMap: Object.freeze({ + unsynced: 'none', + partially_synced: 'partial', + synced: 'finished', + }), + caseInsensitive: true, + statsColumnPrefix: 'sync', + withErrorStatus: true, + }), }); class WaveService extends OrderBaseService { @@ -1405,6 +1416,16 @@ class WaveService extends OrderBaseService { return this.normalizeBatchListAssignmentStatusFilterByType(value, 'review'); } + /** + * 规范化波次列表同步状态筛选值(英文枚举)。 + * + * @param {string} value 入参筛选值。 + * @return {string} 规范化后的筛选值,未传时返回空字符串。 + */ + normalizeBatchListSyncAssignmentStatusFilter(value) { + return this.normalizeBatchListAssignmentStatusFilterByType(value, 'sync'); + } + /** * 根据类型获取波次分配状态筛选配置。 * @@ -1542,6 +1563,16 @@ class WaveService extends OrderBaseService { return this.buildBatchListAssignmentStatusFilterClauseByType(statusFilter, 'review'); } + /** + * 构建波次列表同步状态筛选 SQL 条件。 + * + * @param {string} statusFilter 同步状态筛选值(none/partial/finished)。 + * @return {{ sql: string, replacements: Object }} SQL 条件片段与参数。 + */ + buildBatchListSyncAssignmentFilterClause(statusFilter = '') { + return this.buildBatchListAssignmentStatusFilterClauseByType(statusFilter, 'sync'); + } + /** * 按类型构建波次列表分配状态筛选 SQL 条件。 * @@ -1993,6 +2024,7 @@ class WaveService extends OrderBaseService { 'express_assignment_status', 'print_assignment_status', 'review_assignment_status', + 'sync_assignment_status', 'store_id', ]; @@ -2198,6 +2230,10 @@ class WaveService extends OrderBaseService { 'review_assignment_status', value => this.normalizeBatchListReviewAssignmentStatusFilter(value) ); + const syncAssignmentStatus = resolveAssignmentStatusFilter( + 'sync_assignment_status', + value => this.normalizeBatchListSyncAssignmentStatusFilter(value) + ); return { sql: conditions.length > 0 ? `\n AND ${conditions.join('\n AND ')}` : '', @@ -2206,6 +2242,7 @@ class WaveService extends OrderBaseService { expressAssignmentStatus, printAssignmentStatus, reviewAssignmentStatus, + syncAssignmentStatus, storeIds: storeIdCondition.ids, storeIdOperator: storeIdCondition.operator, }; @@ -5033,6 +5070,7 @@ class WaveService extends OrderBaseService { const expressAssignmentFilterClause = this.buildBatchListExpressAssignmentFilterClause(whereClause.expressAssignmentStatus); const printAssignmentFilterClause = this.buildBatchListPrintAssignmentFilterClause(whereClause.printAssignmentStatus); const reviewAssignmentFilterClause = this.buildBatchListReviewAssignmentFilterClause(whereClause.reviewAssignmentStatus); + const syncAssignmentFilterClause = this.buildBatchListSyncAssignmentFilterClause(whereClause.syncAssignmentStatus); const onlyTodo = Number(requestData.only_todo || 0); const baseBatchWhereSql = ` warehouse_id = :warehouseId @@ -5097,6 +5135,9 @@ class WaveService extends OrderBaseService { SUM(CASE WHEN od.recheck_status = 'fin' THEN 1 ELSE 0 END) AS review_fin_count, SUM(CASE WHEN od.recheck_status = 'error' THEN 1 ELSE 0 END) AS review_error_count, SUM(CASE WHEN od.recheck_status NOT IN ('fin', 'error') THEN 1 ELSE 0 END) AS review_none_count, + SUM(CASE WHEN od.sync_status = 'fin' THEN 1 ELSE 0 END) AS sync_fin_count, + SUM(CASE WHEN od.sync_status = 'error' THEN 1 ELSE 0 END) AS sync_error_count, + SUM(CASE WHEN od.sync_status IS NULL OR od.sync_status NOT IN ('fin', 'error') THEN 1 ELSE 0 END) AS sync_none_count, SUM(CASE WHEN od.pick_status = 'none' THEN 1 ELSE 0 END) AS pick_none_count, SUM(CASE WHEN od.pick_status = 'fin' THEN 1 ELSE 0 END) AS pick_fin_count, SUM(CASE WHEN od.pick_status = 'error' THEN 1 ELSE 0 END) AS pick_error_count, @@ -5119,6 +5160,7 @@ class WaveService extends OrderBaseService { ${expressAssignmentFilterClause.sql} ${printAssignmentFilterClause.sql} ${reviewAssignmentFilterClause.sql} + ${syncAssignmentFilterClause.sql} ${onlyTodo === 1 ? '\n AND COALESCE(wave_order_stats.order_total, 0) - COALESCE(wave_order_stats.review_fin_count, 0) > 0' : ''} `; @@ -5154,6 +5196,9 @@ class WaveService extends OrderBaseService { COALESCE(wave_order_stats.pick_none_count, 0) AS pick_none_count, COALESCE(wave_order_stats.pick_fin_count, 0) AS pick_fin_count, COALESCE(wave_order_stats.pick_error_count, 0) AS pick_error_count, + COALESCE(wave_order_stats.sync_none_count, 0) AS sync_none_count, + COALESCE(wave_order_stats.sync_fin_count, 0) AS sync_fin_count, + COALESCE(wave_order_stats.sync_error_count, 0) AS sync_error_count, COALESCE(wave_order_stats.owner_distinct_count, 0) AS owner_distinct_count, wave_order_stats.owner_store_id, COALESCE(wave_order_stats.owner_named_count, 0) AS owner_named_count @@ -5177,6 +5222,7 @@ class WaveService extends OrderBaseService { ...expressAssignmentFilterClause.replacements, ...printAssignmentFilterClause.replacements, ...reviewAssignmentFilterClause.replacements, + ...syncAssignmentFilterClause.replacements, ...(storeIdFilter.length > 0 ? { whereStoreIds: storeIdFilter } : {}), limit: pageSize, offset, @@ -5191,6 +5237,7 @@ class WaveService extends OrderBaseService { ...expressAssignmentFilterClause.replacements, ...printAssignmentFilterClause.replacements, ...reviewAssignmentFilterClause.replacements, + ...syncAssignmentFilterClause.replacements, ...(storeIdFilter.length > 0 ? { whereStoreIds: storeIdFilter } : {}), }, }), @@ -5233,6 +5280,9 @@ class WaveService extends OrderBaseService { const pickErrorCount = Number(batch && batch.pick_error_count || 0); const reviewFinCount = Number(batch && batch.review_fin_count || 0); const reviewErrorCount = Number(batch && batch.review_error_count || 0); + const syncNoneCount = Number(batch && batch.sync_none_count || 0); + const syncFinCount = Number(batch && batch.sync_fin_count || 0); + const syncErrorCount = Number(batch && batch.sync_error_count || 0); const unreviewedOrderCount = orderCount - reviewFinCount; const ownerDistinctCount = Number(batch && batch.owner_distinct_count || 0); const ownerNamedCount = Number(batch && batch.owner_named_count || 0); @@ -5290,6 +5340,12 @@ class WaveService extends OrderBaseService { error: '拣货异常', }), review_assignment_status: reviewAssignmentStatus, + sync_assignment_status: this.resolveAssignmentStatus(orderCount, syncNoneCount, syncFinCount, syncErrorCount, { + none: '未同步', + partial: '部分同步', + finished: '已同步', + error: '同步异常', + }), unreviewed_order_count: unreviewedOrderCount, store_name: ownerName, }; diff --git a/app/service/systemMethods/workbench.js b/app/service/systemMethods/workbench.js index f29a605..74f51f8 100644 --- a/app/service/systemMethods/workbench.js +++ b/app/service/systemMethods/workbench.js @@ -5,10 +5,10 @@ const MainService = require('../main'); class WorkbenchService extends MainService { constructor(ctx) { super(ctx); - const _noNeedLogin = 'business,getWorkbenchInfo,removeMember,bindMember,packOrder,finishPack,sendWeight,queryOrder'; - const _noNeedRight = 'list,detail,business,getWorkbenchInfo,removeMember,bindMember,packOrder,finishPack,sendWeight,queryOrder'; + const _noNeedLogin = 'business,getWorkbenchInfo,removeMember,bindMember,packOrder,finishPack,sendWeight,queryOrder,getWorkbenchCount'; + const _noNeedRight = 'list,detail,business,getWorkbenchInfo,removeMember,bindMember,packOrder,finishPack,sendWeight,queryOrder,getWorkbenchCount'; const _noNeedLog = 'list,detail,getWorkbenchInfo,removeMember,bindMember'; - const _noNeedAuth = 'list,detail,business,getWorkbenchInfo,removeMember,bindMember,packOrder,finishPack,sendWeight,queryOrder'; + const _noNeedAuth = 'list,detail,business,getWorkbenchInfo,removeMember,bindMember,packOrder,finishPack,sendWeight,queryOrder,getWorkbenchCount'; this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth); } @@ -333,6 +333,29 @@ class WorkbenchService extends MainService { return this.fail(error.message); } } + + /** + * 当前工作台班次打包统计(免登录、免鉴权,以工作台 token 鉴权,仓库与工作台由服务端注入)。 + * 统计窗口:本地时间当日 08:00 至次日 08:00,早于 08:00 时为昨日 08:00 至今日 08:00。 + * @param {Object} data - { token } + */ + async getWorkbenchCount(data) { + const { service } = this; + try { + const { token } = data || {}; + const result = await service.systems.workbench.getWorkbenchCountByToken({ token }); + if (result && result.success) { + return this.success('ok', result); + } + const statusCode = result && result.statusCode; + return this.fail( + result && result.message ? result.message : '获取工作台统计失败', + statusCode ? { code: statusCode } : undefined + ); + } catch (error) { + return this.fail(error.message); + } + } } module.exports = WorkbenchService; diff --git a/app/service/systems/workbench.js b/app/service/systems/workbench.js index 65415b5..fb8829a 100644 --- a/app/service/systems/workbench.js +++ b/app/service/systems/workbench.js @@ -865,6 +865,55 @@ class WorkbenchService extends Service { const parsedPackStatus = Number.parseInt(packStatus, 10); const normalizedPackStatus = Number.isFinite(parsedPackStatus) ? parsedPackStatus : 1; + // 服务端复查落库口径:打包数量/商品总件数/商品种类数均以服务端为准, + // 散单取订单分表(orderRow),团购取波次实时统计(totalOrders + 波次商品 SKU 聚合), + // 设备端上报值仅作交叉校验日志,不直接落库,防止前端输入失真。 + let packQuantity = 1; + let packItemQuantity = Number(orderRow.items_total) || 0; + let packSkuCount = Number(orderRow.items_count) || 0; + + if (isSandan === 0) { + // 团购:打包数量 = 波次实时订单数(步骤2 已统计,异常兜底 1) + packQuantity = Number.isFinite(totalOrders) && totalOrders > 0 ? totalOrders : 1; + // 团购:商品总件数/商品种类数 = 波次商品 SKU 聚合(15s 短缓存兜底,异常降级为扫描订单值) + let waveItemsSummary = []; + try { + waveItemsSummary = await this._fetchWaveItemsSummary(warehouseId, waveId); + } catch (summaryErr) { + ctx.logger.warn('[Workbench._packOrder] 波次商品聚合失败,商品件数降级为扫描订单值: %s', summaryErr.message); + } + if (Array.isArray(waveItemsSummary) && waveItemsSummary.length > 0) { + packSkuCount = waveItemsSummary.length; + const waveItemsTotal = waveItemsSummary.reduce((sum, item) => sum + (Number(item.plan_qty) || 0), 0); + if (waveItemsTotal > 0) { + packItemQuantity = waveItemsTotal; + } + } + } + + // 交叉校验:设备端上报值与服务端复查不一致时仅记日志,落库以服务端为准 + const deviceWaveTotal = (waveTotalOrders !== undefined && waveTotalOrders !== null && waveTotalOrders !== '') + ? parseInt(waveTotalOrders) + : 0; + const deviceItemsTotal = (itemsTotal !== undefined && itemsTotal !== null && itemsTotal !== '') + ? parseInt(itemsTotal) + : 0; + const deviceItemsCount = (itemsCount !== undefined && itemsCount !== null && itemsCount !== '') + ? parseInt(itemsCount) + : 0; + if (isSandan === 0 && Number.isFinite(deviceWaveTotal) && deviceWaveTotal > 0 && deviceWaveTotal !== packQuantity) { + ctx.logger.info('[Workbench._packOrder] 打包数量复查不一致 waveId=%d 设备端=%d 服务端=%d(以服务端为准)', + waveId, deviceWaveTotal, packQuantity); + } + if (Number.isFinite(deviceItemsTotal) && deviceItemsTotal > 0 && deviceItemsTotal !== packItemQuantity) { + ctx.logger.info('[Workbench._packOrder] 商品总件数复查不一致 orderId=%d waveId=%d 设备端=%d 服务端=%d(以服务端为准)', + orderId, waveId, deviceItemsTotal, packItemQuantity); + } + if (Number.isFinite(deviceItemsCount) && deviceItemsCount > 0 && deviceItemsCount !== packSkuCount) { + ctx.logger.info('[Workbench._packOrder] 商品种类数复查不一致 orderId=%d waveId=%d 设备端=%d 服务端=%d(以服务端为准)', + orderId, waveId, deviceItemsCount, packSkuCount); + } + const packData = { order_id: orderId, warehouse_id: warehouseId, @@ -874,9 +923,9 @@ class WorkbenchService extends Service { waybill_code: null, // 后续可从 order_express 补 pack_mode: isSandan === 0 ? 2 : 1, // 1=散单 2=团购 status: normalizedPackStatus, - pack_quantity: waveTotalOrders !== undefined ? parseInt(waveTotalOrders) || 0 : 1, - item_quantity: itemsTotal !== undefined ? parseInt(itemsTotal) || 0 : (orderRow.items_total || 0), - sku_count: itemsCount !== undefined ? parseInt(itemsCount) || 0 : (orderRow.item_count || 0), + pack_quantity: packQuantity, + item_quantity: packItemQuantity, + sku_count: packSkuCount, start_time: new Date(packTimeMs), end_time: normalizedPackStatus >= 2 ? new Date(packTimeMs) : null, device_ids: deviceIds, @@ -2761,6 +2810,234 @@ class WorkbenchService extends Service { } } + /** + * 统计数值保留 2 位小数(四舍五入)。 + * @param {number} value 原始数值 + * @return {number} 保留 2 位小数后的数值 + */ + _round2(value) { + return Math.round(Number(value) * 100) / 100; + } + + /** + * 格式化时间为 'YYYY-MM-DD HH:mm:ss'(本地时间,供接口返回展示)。 + * @param {Date} date 日期对象 + * @return {string} 格式化后的时间字符串 + */ + _formatPackCountTime(date) { + const pad = n => String(n).padStart(2, '0'); + return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ` + + `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`; + } + + /** + * 计算打包统计时间窗口(班次口径): + * 本地时间当日 08:00 至次日 08:00(左闭右开); + * 当前本地时间早于 08:00 时,窗口为昨日 08:00 至今日 08:00。 + * @return {{startTime: Date, endTime: Date}} 窗口起止时间 + */ + buildWorkbenchPackCountTimeRange() { + const now = new Date(); + let startTime = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 8, 0, 0, 0); + if (now.getTime() < startTime.getTime()) { + startTime = new Date(startTime.getTime() - 86400000); + } + return { startTime, endTime: new Date(startTime.getTime() + 86400000) }; + } + + /** + * 通过 token 获取当前工作台的班次打包统计(供 workbench.getWorkbenchCount)。 + * + * 统一走 resolveWorkbenchContext 校验:无 token 返回 401、token 无效返回 403; + * 仓库与工作台均由 token 解析注入,禁止前端传值。 + * + * 统计窗口:本地时间当日 08:00 → 次日 08:00;当前时间早于 08:00 时为昨日 08:00 → 今日 08:00。 + * - 个人工作台(type=personal):统计「涉及本人」的打包数据(本人 = 工作台成员 user_id, + * 范围 = 本工作台产生的任务 ∪ 本人作为打包人参与的任务),返回: + * group_wave_count 团购波次数量(pack_mode=2 且 wave_id>0 去重)、 + * group_order_count 团购订单数量(团购任务 pack_quantity 求和)、 + * single_order_count 散单数量(pack_mode=1 任务数)、 + * group_single_ratio 团散(团购波次数/散单数,保留 2 位小数,散单为 0 时 null)、 + * avg_piece_count 均件数(本人打包任务按 订单数量/人数 折算后求和,保留 2 位小数: + * 本人作为打包人参与的任务按任务实际打包人数均分,本工作台单人任务整单计入)。 + * - 团体工作台(type=group):统计「涉及本工作台」的打包数据,返回: + * group_wave_count 团购波次数量、group_order_count 团购订单数量(团购任务 pack_quantity 快照求和)、 + * single_order_count 散单数量。 + * + * 只查 wms_pack_task / wms_pack_task_packer,全部走现有/配套索引 + * (idx_warehouse_create_time / idx_workbench_create_time / uix_pack_task_account), + * 不做订单分表实时统计,避免慢 SQL。 + * + * @param {Object} [data={}] - { token } + * @return {Promise} { success, code, data, message, statusCode } + */ + async getWorkbenchCountByToken(data = {}) { + const { ctx, app } = this; + const { Op } = app.Sequelize; + try { + const rawToken = typeof data.token === 'string' ? data.token.trim() : ''; + + // 统一 token 校验(无 token 401、无效 403),解析成功后写入 ctx 备用 + const resolved = await this.resolveWorkbenchContext(rawToken); + if (!resolved.success) return resolved; + + const workbench = resolved.data; + const workbenchId = Number(workbench.id); + const warehouseId = Number(workbench.warehouse_id || 0); + const isGroup = workbench.type === 'group'; + const { startTime, endTime } = this.buildWorkbenchPackCountTimeRange(); + + // 窗口内打包任务:团体工作台只取本工作台(走 idx_workbench_create_time), + // 个人工作台取本仓库窗口内全部任务(走 idx_warehouse_create_time)再按人过滤。 + const taskWhere = { + warehouse_id: warehouseId, + create_time: { [Op.gte]: startTime, [Op.lt]: endTime }, + }; + if (isGroup) { + taskWhere.workbench_id = workbenchId; + } + const tasks = await ctx.model.PackTask.findAll({ + where: taskWhere, + attributes: [ 'id', 'wave_id', 'pack_mode', 'pack_quantity', 'workbench_id' ], + raw: true, + }); + + // 团体工作台:按本工作台任务直接统计 + if (isGroup) { + const groupTasks = tasks.filter(task => Number(task.pack_mode) === 2); + const singleTasks = tasks.filter(task => Number(task.pack_mode) === 1); + const waveIdSet = new Set(groupTasks.map(task => Number(task.wave_id)).filter(id => id > 0)); + const groupOrderCount = groupTasks.reduce((sum, task) => sum + (Number(task.pack_quantity) || 0), 0); + + return { + success: true, + code: 200, + data: { + workbench_id: workbenchId, + workbench_type: workbench.type, + time_range: { + start_time: this._formatPackCountTime(startTime), + end_time: this._formatPackCountTime(endTime), + }, + group_wave_count: waveIdSet.size, + group_order_count: groupOrderCount, + single_order_count: singleTasks.length, + }, + message: 'ok', + }; + } + + // 个人工作台:本人 = 工作台成员 user_id(个人工作台通常只有一名成员) + let personUserId = null; + try { + const members = await this.listWorkbenchMembers(workbenchId); + const userIds = members + .map(member => Number(member.user_id)) + .filter(id => Number.isInteger(id) && id > 0); + personUserId = userIds.length > 0 ? userIds[0] : null; + } catch (memberErr) { + ctx.logger.warn('[Workbench.getWorkbenchCount] 查询工作台成员失败,按本工作台任务统计: %s', memberErr.message); + } + + // 本工作台产生的任务 + const workbenchTaskIds = new Set( + tasks.filter(task => Number(task.workbench_id) === workbenchId).map(task => Number(task.id)) + ); + + // 本人作为打包人参与的任务(分批 IN 查询,避免单次 IN 列表过长) + const participatedTaskIds = new Set(); + const taskIds = tasks.map(task => Number(task.id)); + if (personUserId !== null && taskIds.length > 0) { + const batchSize = 500; + for (let offset = 0; offset < taskIds.length; offset += batchSize) { + const idChunk = taskIds.slice(offset, offset + batchSize); + const packerRows = await ctx.model.PackTaskPacker.findAll({ + where: { pack_task_id: { [Op.in]: idChunk }, account_id: personUserId }, + attributes: [ 'pack_task_id' ], + raw: true, + }); + for (const row of packerRows) { + participatedTaskIds.add(Number(row.pack_task_id)); + } + } + } + + // 统计对象任务集合:本工作台任务 ∪ 本人作为打包人参与的任务 + const personalTaskIdSet = new Set([ ...workbenchTaskIds, ...participatedTaskIds ]); + + // 统计各任务的打包人数(供均件数折算使用) + const packerCountMap = new Map(); + if (personalTaskIdSet.size > 0) { + const personalIds = [ ...personalTaskIdSet ]; + const batchSize = 500; + for (let offset = 0; offset < personalIds.length; offset += batchSize) { + const idChunk = personalIds.slice(offset, offset + batchSize); + const packerRows = await ctx.model.PackTaskPacker.findAll({ + where: { pack_task_id: { [Op.in]: idChunk } }, + attributes: [ 'pack_task_id' ], + raw: true, + }); + for (const row of packerRows) { + const key = Number(row.pack_task_id); + packerCountMap.set(key, (packerCountMap.get(key) || 0) + 1); + } + } + } + + const personalTasks = tasks.filter(task => personalTaskIdSet.has(Number(task.id))); + const groupTasks = personalTasks.filter(task => Number(task.pack_mode) === 2); + const singleTasks = personalTasks.filter(task => Number(task.pack_mode) === 1); + const waveIdSet = new Set(groupTasks.map(task => Number(task.wave_id)).filter(id => id > 0)); + const groupOrderCount = groupTasks.reduce((sum, task) => sum + (Number(task.pack_quantity) || 0), 0); + + // 均件数:本人打包的每个任务按 订单数量/人数 折算后求和(保留 2 位小数): + // 本人作为打包人参与的任务按任务实际打包人数均分(缺省 1); + // 本工作台任务未记录到本人时视为单人打包(整单计入本人)。 + let avgPieceCount = 0; + for (const task of personalTasks) { + const taskId = Number(task.id); + const orderCount = Number(task.pack_mode) === 2 ? (Number(task.pack_quantity) || 0) : 1; + if (orderCount <= 0) continue; + if (participatedTaskIds.has(taskId)) { + const packerCount = packerCountMap.get(taskId) || 1; + avgPieceCount += orderCount / packerCount; + } else if (workbenchTaskIds.has(taskId)) { + avgPieceCount += orderCount; + } + } + + const singleOrderCount = singleTasks.length; + const groupWaveCount = waveIdSet.size; + + return { + success: true, + code: 200, + data: { + workbench_id: workbenchId, + workbench_type: workbench.type, + time_range: { + start_time: this._formatPackCountTime(startTime), + end_time: this._formatPackCountTime(endTime), + }, + group_wave_count: groupWaveCount, + group_order_count: groupOrderCount, + single_order_count: singleOrderCount, + group_single_ratio: singleOrderCount > 0 ? this._round2(groupWaveCount / singleOrderCount) : null, + avg_piece_count: this._round2(avgPieceCount), + }, + message: 'ok', + }; + } catch (error) { + app.coreLogger.error(`获取工作台打包统计失败: ${error.message}`); + return { + success: false, + code: 0, + data: null, + message: '获取工作台打包统计失败,请稍后重试', + }; + } + } + /** * 通过 login_code 获取工作台 token(供 index.LoginWorkbenchByCode)。 * 按 wms_workbench.login_code 查询;查无工作台返回失败(403); diff --git a/database/migrations/20260919100000-add-workbench-create-time-index-to-wms-pack-task.js b/database/migrations/20260919100000-add-workbench-create-time-index-to-wms-pack-task.js new file mode 100644 index 0000000..84c167c --- /dev/null +++ b/database/migrations/20260919100000-add-workbench-create-time-index-to-wms-pack-task.js @@ -0,0 +1,19 @@ +'use strict'; + +/** + * workbench.getWorkbenchCount 慢查询优化配套索引。 + * 班次统计按 (workbench_id, create_time) 过滤窗口内打包任务,原 idx_workbench_id 单列索引 + * 命中后仍需过滤该工作台全部历史行,新增 (workbench_id, create_time) 复合索引 + * 使窗口过滤走索引范围扫描,避免长跨度扫描导致慢 SQL。 + */ +module.exports = { + async up(queryInterface) { + await queryInterface.addIndex('wms_pack_task', [ 'workbench_id', 'create_time' ], { + name: 'idx_workbench_create_time', + }); + }, + + async down(queryInterface) { + await queryInterface.removeIndex('wms_pack_task', 'idx_workbench_create_time'); + }, +}; diff --git a/methods/changes/system.json b/methods/changes/system.json index 07599f2..f6d5aed 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,4 +1,65 @@ [ + { + "version": "2026.09.19-workbench-packOrder-server-side-verification", + "date": "2026-09-19", + "type": "enhance", + "summary": "workbench.packOrder 落库数量改为服务端复查:打包数量/商品总件数/商品种类数不再取设备端上报值,散单取订单分表(orderRow),团购取波次实时统计(totalOrders + 波次商品 SKU 聚合 _fetchWaveItemsSummary),设备端 wave_total_orders/items_count/items_total 仅作交叉校验日志;修复团购波次打包数量落 0/1 的失真问题。", + "methods": [ + "workbench.packOrder" + ], + "notes": [ + "代码:app/service/systems/workbench.js _packOrder 步骤6 改为服务端复查口径:packQuantity 散单固定 1、团购取 totalOrders(>0 否则 1);packItemQuantity/packSkuCount 散单取 orderRow.items_total/items_count(注:分表列名为 items_count 而非 item_count,此前兜底读 item_count 导致散单 sku_count 兜底落 0,已一并修正),团购取 _fetchWaveItemsSummary(15s 短缓存)聚合 rows.length 与 plan_qty 求和,聚合失败降级为扫描订单值", + "交叉校验:设备端上报值与服务端不一致时仅 ctx.logger.info 告警(打包数量/商品总件数/商品种类数三组),落库始终以服务端为准", + "开发库数据回填:temp/fix-dev-pack-task-quantities.cjs 已按新口径重算 wms_pack_task 存量 30 条并更新 19 条(保留 update_time、不删行;散单/团购各自取服务端口径,旧 6 月订单缺失的 6 条跳过)", + "背景:原语义 pack_quantity=wave_total_orders(缺省 1、传 0 落 0),服务端实时波次订单数未回写,导致列表/统计口径失真", + "methods/system.json:workbench.packOrder 参数 wave_total_orders/items_count/items_total 描述同步服务端复查口径;版本 0.3.140 -> 0.3.141(docMeta.version),updatedAt 保持 2026-09-19" + ] + }, + { + "version": "2026.09.19-workbench-getWorkbenchCount-avg-piece-count", + "date": "2026-09-19", + "type": "enhance", + "summary": "workbench.getWorkbenchCount 个人工作台返回调整:新增 group_order_count(团购订单数量,团购任务 pack_quantity 求和,个人/团体工作台均返回);均件数 avg_piece_count 口径改为本人打包任务按 订单数量/人数 折算求和(本人作为打包人参与的任务按任务实际打包人数均分、缺省 1,本工作台单人任务整单计入),不再只统计打包人数≥2 的任务,单人打包 500 单波次可正确得到 500。", + "methods": [ + "workbench.getWorkbenchCount" + ], + "notes": [ + "代码:app/service/systems/workbench.js getWorkbenchCountByToken 个人分支:新增 groupOrderCount(groupTasks 对 pack_quantity 求和);均件数循环改为 participatedTaskIds 按 packerCount(缺省 1)均分、workbenchTaskIds 未记本人时整单计入", + "methods/system.json:getWorkbenchCount response 更新 avg_piece_count/group_order_count 描述;版本 0.3.141 -> 0.3.142(docMeta.version),updatedAt 保持 2026-09-19" + ] + }, + { + "version": "2026.09.19-workbench-getWorkbenchCount", + "date": "2026-09-19", + "type": "enhance", + "summary": "新增 workbench.getWorkbenchCount 当前工作台班次打包统计(免登录/免权限/免鉴权,以工作台 token 鉴权):统计窗口为本地时间当日 08:00 至次日 08:00,早于 08:00 时为昨日 08:00 至今日 08:00;个人工作台(type=personal)统计涉及本人(工作台成员 user_id)的打包数据,返回团购波次数量/散单数量/团散(团购波次数/散单数 2 位小数)/均件数(多人打包任务按 订单数量/人数 折算求和 2 位小数);团体工作台(type=group)返回团购波次数量/团购订单数量(pack_quantity 快照求和)/散单数量。", + "methods": [ + "workbench.getWorkbenchCount" + ], + "notes": [ + "代码:app/service/systems/workbench.js 新增 getWorkbenchCountByToken(resolveWorkbenchContext 统一 token 校验,无 token 401/无效 403)与辅助方法 buildWorkbenchPackCountTimeRange(8 点班次窗口)/ _round2 / _formatPackCountTime", + "个人统计:窗口内本仓库任务走 idx_warehouse_create_time;本人参与任务通过 wms_pack_task_packer(account_id=成员 user_id,分批 IN 500)与 uix_pack_task_account 索引判定;统计范围 = 本工作台任务 ∪ 本人作为打包人参与的任务;均件数只折算本人参与的多人打包(打包人数≥2)任务", + "团体统计:workbench_id+create_time 走新增 idx_workbench_create_time 索引", + "索引:数据库迁移 20260919100000-add-workbench-create-time-index-to-wms-pack-task.js 为 wms_pack_task 新增 (workbench_id, create_time) 复合索引,避免窗口统计长跨度扫描导致慢 SQL;模型 app/model/pack_task.js indexes 同步补充", + "methods/system.json:工作台模块新增 workbench.getWorkbenchCount 条目;版本 0.3.138 -> 0.3.139(docMeta.version),updatedAt 保持 2026-09-19" + ] + }, + { + "version": "2026.09.19-wave-batchList-sync-assignment-status", + "date": "2026-09-19", + "type": "enhance", + "summary": "order.wave.batchList 响应新增 sync_assignment_status(同步状态,取值:未同步/部分同步/已同步/同步异常),并支持 where.sync_assignment_status 筛选(英文枚举 unsynced/partially_synced/synced,仅 eq,error 并入未同步集合)。", + "methods": [ + "order.wave.batchList" + ], + "notes": [ + "代码:app/service/systemMethods/order/wave.js BATCH_LIST_ASSIGNMENT_FILTER_SCHEMAS 新增 sync 类型(fieldName=sync_assignment_status,enumMap unsynced/partially_synced/synced → none/partial/finished,caseInsensitive=true,statsColumnPrefix=sync,withErrorStatus=true)", + "聚合:wave_order_stats 子查询新增 sync_none_count/sync_fin_count/sync_error_count,按订单 sync_status(padding/fin/error)聚合;none 口径为 sync_status IS NULL 或 NOT IN ('fin','error'),与 review 统计口径一致", + "输出:list[].sync_assignment_status 复用 resolveAssignmentStatus,error 优先判定为同步异常,labels 为未同步/部分同步/已同步/同步异常", + "筛选:buildBatchListWhereClause allowedFields 新增 sync_assignment_status,仅支持 eq;normalizeBatchListSyncAssignmentStatusFilter/buildBatchListSyncAssignmentFilterClause 复用通用 schema 链路", + "methods/system.json:batchList description/where/response 同步 sync_assignment_status 说明;版本 0.3.137 -> 0.3.138(docMeta.version),updatedAt 保持 2026-09-19" + ] + }, { "version": "2026.09.19-workbench-getWorkbenchInfo-wave-items-summary", "date": "2026-09-19", diff --git a/methods/system.json b/methods/system.json index bec64b5..64fd03b 100644 --- a/methods/system.json +++ b/methods/system.json @@ -1,7 +1,7 @@ { "module": "system", "description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内", - "version": "0.3.137", + "version": "0.3.142", "updatedAt": "2026-09-19", "headers": [ { @@ -30746,7 +30746,7 @@ "list": [ { "method": "order.wave.batchList", - "description": "波次列表查询。仅使用当前登录操作者仓库上下文(禁止传入 warehouse_id/warehouseId)。支持 where 白名单过滤,固定查询 wave_status=0/1;返回波次基础信息及分配状态汇总(storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status)。支持 only_todo=1 仅返回仍有未复核订单的波次,并返回复核状态汇总(review_assignment_status)与未复核数量(unreviewed_order_count)。列表每条记录返回货主信息 store_name:当波次内所有订单均为同一货主(store_id)时返回货主名称,否则返回“混合”。货主名称优先取合约表 wms_store_warehouse.store_remask(货主备注名称),无合约或备注为空时回退 wms_store.company_name(公司全称)。where 中各字段支持裸值与 {operator,value,type} 标准结构(eq/ne/gt/lt/ge/le/in/notin/between/notbetween/like/contains/notlike/startswith/endswith/isnull/isnotnull;未显式传 operator 时保持历史默认语义:wave_no/creator/logistics_name/item_part/item_snapshot_key/item_detail_machine 默认模糊,其余默认等值),详见 where 参数说明。", + "description": "波次列表查询。仅使用当前登录操作者仓库上下文(禁止传入 warehouse_id/warehouseId)。支持 where 白名单过滤,固定查询 wave_status=0/1;返回波次基础信息及分配状态汇总(storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status / sync_assignment_status)。支持 only_todo=1 仅返回仍有未复核订单的波次,并返回复核状态汇总(review_assignment_status)与未复核数量(unreviewed_order_count)。列表每条记录返回货主信息 store_name:当波次内所有订单均为同一货主(store_id)时返回货主名称,否则返回“混合”。货主名称优先取合约表 wms_store_warehouse.store_remask(货主备注名称),无合约或备注为空时回退 wms_store.company_name(公司全称)。where 中各字段支持裸值与 {operator,value,type} 标准结构(eq/ne/gt/lt/ge/le/in/notin/between/notbetween/like/contains/notlike/startswith/endswith/isnull/isnotnull;未显式传 operator 时保持历史默认语义:wave_no/creator/logistics_name/item_part/item_snapshot_key/item_detail_machine 默认模糊,其余默认等值),详见 where 参数说明。", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -30777,7 +30777,7 @@ "type": "object", "required": false, "source": "body", - "description": "筛选白名单字段(object,可选)。仅支持下列字段过滤,且禁止传入 warehouse_id / warehouseId。\n【操作符传参】每个字段均支持「裸值」或「标准结构 {'operator':'eq','value':'...','type':'text'}」两种写法;未显式传 operator 时按该字段默认语义(见下方括号)。支持的操作符:eq、ne、gt、lt、ge、le、in、notin、between、notbetween、like、contains、notlike、startswith、endswith、isnull、isnotnull,按字段分组允许:\n- 数值类(wave_id、wave_type、wave_status、source、total_orders、processed_orders 及 total_orders_min/max、processed_orders_min/max):eq/ne/gt/lt/ge/le/in/notin/between/notbetween/isnull/isnotnull;\n- 文本类(wave_no、creator、logistics_name、item_part_type、item_part、item_snapshot_key、item_detail_machine):eq/ne/like/contains/notlike/startswith/endswith/in/notin/isnull/isnotnull;\n- 布尔类(distinguish_express):eq/ne/in/notin;\n- 分配/复核状态类(storage_assignment_status、express_assignment_status、print_assignment_status、review_assignment_status):仅 eq;\n- 货主(store_id):eq/in/ne/notin。\nvalue 支持数组:like/contains/startswith/endswith 多值按 OR 展开,notlike 多值按 AND 展开;in/notin 要求 value 为非空数组;eq 传数组等价于 in;between/notbetween 要求 value 为长度 2 的数组(也接受 {start,end} / {from,to})。\n【字段清单】(括号内为未显式传 operator 时的默认语义)\n- wave_id(等值)\n- wave_no(模糊)\n- wave_type(等值)\n- wave_status(等值,接口固定叠加状态 0/1)\n- creator(模糊)\n- logistics_name(模糊)\n- item_part_type(等值)\n- item_part(模糊)\n- item_snapshot_key(模糊)\n- item_detail_machine(模糊)\n- distinguish_express(等值,value 兼容 true/false/1/0)\n- total_orders / processed_orders(等值,新增:波次订单总数/已处理数,可直接用 between 等操作符)\n- total_orders_min / total_orders_max(范围,等价于 total_orders 的 ge / le)\n- processed_orders_min / processed_orders_max(范围,等价于 processed_orders 的 ge / le)\n- express_assignment_status(等值,string,可选,英文枚举,取值:unassigned、partially_assigned、assigned;语义:按快递分配聚合判断,assigned 表示聚合后全部 fin,partially_assigned 表示部分已分配且不含 error,unassigned 表示全 none 或包含 error(异常并入未分配集合))。\n- print_assignment_status(等值,string,可选,英文枚举,取值:unprinted、partially_printed、printed;语义:按打印分配聚合判断,printed 表示聚合后全部已打印)。\n- storage_assignment_status(等值,string,可选,取值:未分配、部分分配、已分配;默认不传不做限制)。过滤语义:已分配=聚合后全部 fin;部分分配=不含 error,且既不是全 none,也不是全 fin;未分配=全 none 或包含 error(异常并入未分配筛选集合)。说明:返回字段 storage_assignment_status 的展示值保持不变,包含 error 时仍可显示“分配异常”;此处 where 的过滤语义会把异常计入“未分配”,以避免把过滤语义与展示值混淆。\n- source(可选,number)来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。\n说明:express_assignment_status 与 print_assignment_status 要求使用英文枚举值;storage_assignment_status 仍向后兼容中文展示值。若传入的枚举值不在允许集合内,接口会返回 400(参数校验失败),并在 message 中说明错误字段与允许取值。\n- review_assignment_status(等值,string,可选,英文枚举:unreviewed、partially_reviewed、reviewed;分别表示未复核、部分复核、已复核)。\n- store_id(货主ID,可选,正整数,支持单值/数组/{operator,value} 结构,如 {\"operator\":\"\",\"value\":[1000281,1000000]};语义:默认 eq/in 返回包含任一筛选货主订单的波次,含混合货主波次;ne/notin 返回不包含所选货主订单的波次;不支持 like 等文本操作符)。" + "description": "筛选白名单字段(object,可选)。仅支持下列字段过滤,且禁止传入 warehouse_id / warehouseId。\n【操作符传参】每个字段均支持「裸值」或「标准结构 {'operator':'eq','value':'...','type':'text'}」两种写法;未显式传 operator 时按该字段默认语义(见下方括号)。支持的操作符:eq、ne、gt、lt、ge、le、in、notin、between、notbetween、like、contains、notlike、startswith、endswith、isnull、isnotnull,按字段分组允许:\n- 数值类(wave_id、wave_type、wave_status、source、total_orders、processed_orders 及 total_orders_min/max、processed_orders_min/max):eq/ne/gt/lt/ge/le/in/notin/between/notbetween/isnull/isnotnull;\n- 文本类(wave_no、creator、logistics_name、item_part_type、item_part、item_snapshot_key、item_detail_machine):eq/ne/like/contains/notlike/startswith/endswith/in/notin/isnull/isnotnull;\n- 布尔类(distinguish_express):eq/ne/in/notin;\n- 分配/复核状态类(storage_assignment_status、express_assignment_status、print_assignment_status、review_assignment_status、sync_assignment_status):仅 eq;\n- 货主(store_id):eq/in/ne/notin。\nvalue 支持数组:like/contains/startswith/endswith 多值按 OR 展开,notlike 多值按 AND 展开;in/notin 要求 value 为非空数组;eq 传数组等价于 in;between/notbetween 要求 value 为长度 2 的数组(也接受 {start,end} / {from,to})。\n【字段清单】(括号内为未显式传 operator 时的默认语义)\n- wave_id(等值)\n- wave_no(模糊)\n- wave_type(等值)\n- wave_status(等值,接口固定叠加状态 0/1)\n- creator(模糊)\n- logistics_name(模糊)\n- item_part_type(等值)\n- item_part(模糊)\n- item_snapshot_key(模糊)\n- item_detail_machine(模糊)\n- distinguish_express(等值,value 兼容 true/false/1/0)\n- total_orders / processed_orders(等值,新增:波次订单总数/已处理数,可直接用 between 等操作符)\n- total_orders_min / total_orders_max(范围,等价于 total_orders 的 ge / le)\n- processed_orders_min / processed_orders_max(范围,等价于 processed_orders 的 ge / le)\n- express_assignment_status(等值,string,可选,英文枚举,取值:unassigned、partially_assigned、assigned;语义:按快递分配聚合判断,assigned 表示聚合后全部 fin,partially_assigned 表示部分已分配且不含 error,unassigned 表示全 none 或包含 error(异常并入未分配集合))。\n- print_assignment_status(等值,string,可选,英文枚举,取值:unprinted、partially_printed、printed;语义:按打印分配聚合判断,printed 表示聚合后全部已打印)。\n- storage_assignment_status(等值,string,可选,取值:未分配、部分分配、已分配;默认不传不做限制)。过滤语义:已分配=聚合后全部 fin;部分分配=不含 error,且既不是全 none,也不是全 fin;未分配=全 none 或包含 error(异常并入未分配筛选集合)。说明:返回字段 storage_assignment_status 的展示值保持不变,包含 error 时仍可显示“分配异常”;此处 where 的过滤语义会把异常计入“未分配”,以避免把过滤语义与展示值混淆。\n- source(可选,number)来源过滤:0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务;不传则不过滤。\n说明:express_assignment_status 与 print_assignment_status 要求使用英文枚举值;storage_assignment_status 仍向后兼容中文展示值。若传入的枚举值不在允许集合内,接口会返回 400(参数校验失败),并在 message 中说明错误字段与允许取值。\n- review_assignment_status(等值,string,可选,英文枚举:unreviewed、partially_reviewed、reviewed;分别表示未复核、部分复核、已复核)。\n- sync_assignment_status(等值,string,可选,英文枚举:unsynced、partially_synced、synced;分别表示未同步、部分同步、已同步;按订单 sync_status 聚合判断,synced 表示聚合后全部 fin,partially_synced 表示部分已同步且不含 error,unsynced 表示全未同步或包含 error(异常并入未同步集合))。\n- store_id(货主ID,可选,正整数,支持单值/数组/{operator,value} 结构,如 {\"operator\":\"\",\"value\":[1000281,1000000]};语义:默认 eq/in 返回包含任一筛选货主订单的波次,含混合货主波次;ne/notin 返回不包含所选货主订单的波次;不支持 like 等文本操作符)。" } ], "response": [ @@ -30785,7 +30785,7 @@ "name": "list", "type": "array", "required": true, - "description": "波次列表,包含波次基础信息与状态汇总(order_count / storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status / unreviewed_order_count)。其中 pick_assignment_status 按订单 pick_status 聚合判定,取值:未拣货/部分拣货/已拣货/拣货异常。每条记录新增字段 source(number):来源标识,0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务。每条记录新增字段 store_name(string):货主信息,当波次内所有订单均为同一货主(store_id)时返回货主名称,否则返回“混合”;货主名称优先取合约表 wms_store_warehouse.store_remask(货主备注名称),无合约或备注为空时回退 wms_store.company_name(公司全称)。" + "description": "波次列表,包含波次基础信息与状态汇总(order_count / storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status / sync_assignment_status / unreviewed_order_count)。其中 pick_assignment_status 按订单 pick_status 聚合判定,取值:未拣货/部分拣货/已拣货/拣货异常。sync_assignment_status 按订单 sync_status 聚合判定,取值:未同步/部分同步/已同步/同步异常(error 并入未同步集合)。每条记录新增字段 source(number):来源标识,0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务。每条记录新增字段 store_name(string):货主信息,当波次内所有订单均为同一货主(store_id)时返回货主名称,否则返回“混合”;货主名称优先取合约表 wms_store_warehouse.store_remask(货主备注名称),无合约或备注为空时回退 wms_store.company_name(公司全称)。" }, { "name": "pagination", @@ -34455,7 +34455,7 @@ }, { "method": "workbench.packOrder", - "description": "工作台打包上报(免登录、免权限、免鉴权,以工作台 token 鉴权):仓库与工作台均由服务端从 token 解析注入(body 传入 warehouse_id/workbench_id 一律忽略,禁止前端传值),入参发货单号、波次号、状态、打包时间、波次总订单数、SKU 品种数、商品总件数、打包人员;按发货单号定位订单(current→dispatch 分表),同一工作台存在上一个未结束任务时先关闭(同步回写旧订单打包状态,并将工作台绑定摄像头 OSD 复位为「无任务」,新任务 OSD 在其后串行下发避免被复位覆盖),散单按 order_id、团购按 wave_no 去重后创建打包任务(wms_pack_task,缺失/非法 status 归一化为 1=打包中),写入打包人员(wms_pack_task_packer)与 operator_text、下发 OSD 到工作台绑定摄像头(散单显示运单号、团购显示波次号+订单总量,并写 Redis osd_{workbenchId} 缓存)、写操作日志;打包状态变更后主动失效对应工作台 token 缓存,保证 getWorkbenchInfo 尽快返回最新打包信息;团购单(isSandan=0)响应附 batch 波次信息(波次订单数为 current+dispatch 分表实时统计);拦截流程中的订单不允许打包(散单直接拒绝、团购波次静默跳过并视为完成);保留系统日志(systemInit 未声明免日志);成功返回 flag=success、code=200", + "description": "工作台打包上报(免登录、免权限、免鉴权,以工作台 token 鉴权):仓库与工作台均由服务端从 token 解析注入(body 传入 warehouse_id/workbench_id 一律忽略,禁止前端传值),入参发货单号、波次号、状态、打包时间、波次总订单数、SKU 品种数、商品总件数、打包人员(以上数量以服务端复查为准,设备上报仅交叉校验);按发货单号定位订单(current→dispatch 分表),同一工作台存在上一个未结束任务时先关闭(同步回写旧订单打包状态,并将工作台绑定摄像头 OSD 复位为「无任务」,新任务 OSD 在其后串行下发避免被复位覆盖),散单按 order_id、团购按 wave_no 去重后创建打包任务(wms_pack_task,缺失/非法 status 归一化为 1=打包中),写入打包人员(wms_pack_task_packer)与 operator_text、下发 OSD 到工作台绑定摄像头(散单显示运单号、团购显示波次号+订单总量,并写 Redis osd_{workbenchId} 缓存)、写操作日志;打包状态变更后主动失效对应工作台 token 缓存,保证 getWorkbenchInfo 尽快返回最新打包信息;团购单(isSandan=0)响应附 batch 波次信息(波次订单数为 current+dispatch 分表实时统计);拦截流程中的订单不允许打包(散单直接拒绝、团购波次静默跳过并视为完成);保留系统日志(systemInit 未声明免日志);成功返回 flag=success、code=200", "isNeedAuth": false, "isNeedLogin": false, "isNeedRight": false, @@ -34501,21 +34501,21 @@ "type": "number", "required": false, "source": "body", - "description": "波次总订单数(写入 pack_quantity,缺省 1)" + "description": "波次总订单数(仅交叉校验日志,落库以服务端复查为准:团购取 current+dispatch 分表实时统计的波次订单数)" }, { "name": "items_count", "type": "number", "required": false, "source": "body", - "description": "SKU 品种数(写入 sku_count,缺省取订单 item_count)" + "description": "SKU 品种数(仅交叉校验日志,落库以服务端复查为准:散单取订单 item_count、团购取波次商品 SKU 聚合数)" }, { "name": "items_total", "type": "number", "required": false, "source": "body", - "description": "商品总件数(写入 item_quantity,缺省取订单 items_total)" + "description": "商品总件数(仅交叉校验日志,落库以服务端复查为准:散单取订单 items_total、团购取波次商品 SKU 聚合件数)" }, { "name": "users", @@ -35203,6 +35203,95 @@ "message": "未在待处理或配送表中找到订单 [id=xxx, warehouse=xxx](业务失败,返回 flag=failure、code=0)" } ] + }, + { + "method": "workbench.getWorkbenchCount", + "description": "当前工作台班次打包统计(免登录、免权限、免鉴权,以工作台 token 鉴权):仓库与工作台均由服务端从 token 解析注入;统计窗口为本地时间当日 08:00 至次日 08:00,当前时间早于 08:00 时窗口为昨日 08:00 至今日 08:00;个人工作台(type=personal)统计涉及本人的打包数据(本人=工作台成员 user_id,范围=本工作台产生的任务∪本人作为打包人参与的任务),返回团购波次数量/团购订单数量(团购任务 pack_quantity 求和)/散单数量/团散(团购波次数/散单数,2位小数,散单为0时null)/均件数(本人打包任务按订单数量/人数折算求和,2位小数:本人作为打包人参与的任务按实际打包人数均分、本工作台单人任务整单计入);团体工作台(type=group)统计涉及本工作台的打包数据,返回团购波次数量/团购订单数量(团购任务 pack_quantity 快照求和)/散单数量;统计只查 wms_pack_task/wms_pack_task_packer 并走配套索引(idx_warehouse_create_time/idx_workbench_create_time/uix_pack_task_account),不做订单分表实时统计,避免慢 SQL;成功返回 flag=success、code=200", + "isNeedAuth": false, + "isNeedLogin": false, + "isNeedRight": false, + "headers": [], + "params": [ + { + "name": "token", + "type": "string", + "required": true, + "source": "body", + "description": "工作台 token(64 位,工作台身份凭证;仓库与工作台由服务端从 token 解析注入)" + } + ], + "response": [ + { + "name": "workbench_id", + "type": "number", + "required": true, + "description": "工作台ID" + }, + { + "name": "workbench_type", + "type": "string", + "required": true, + "description": "工作台类型:personal-个人工作台 group-团体工作台" + }, + { + "name": "time_range", + "type": "object", + "required": true, + "description": "统计时间窗口" + }, + { + "name": "time_range.start_time", + "type": "string", + "required": true, + "description": "窗口开始时间(本地时间,格式 YYYY-MM-DD HH:mm:ss)" + }, + { + "name": "time_range.end_time", + "type": "string", + "required": true, + "description": "窗口结束时间(本地时间,格式 YYYY-MM-DD HH:mm:ss)" + }, + { + "name": "group_wave_count", + "type": "number", + "required": true, + "description": "团购波次数量(pack_mode=2 且 wave_id>0 按 wave_id 去重)" + }, + { + "name": "single_order_count", + "type": "number", + "required": true, + "description": "散单数量(pack_mode=1 任务数,每任务对应 1 单)" + }, + { + "name": "group_single_ratio", + "type": "number", + "required": false, + "description": "团散(仅个人工作台返回):团购波次数/散单数,保留 2 位小数;散单数为 0 时返回 null" + }, + { + "name": "avg_piece_count", + "type": "number", + "required": false, + "description": "均件数(仅个人工作台返回):本人打包任务按 订单数量/人数 折算后求和,保留 2 位小数;本人作为打包人参与的任务按任务实际打包人数均分(缺省 1),本工作台单人任务整单计入" + }, + { + "name": "group_order_count", + "type": "number", + "required": false, + "description": "团购订单数量(个人/团体工作台均返回):团购任务 pack_quantity 求和(服务端复查口径)" + } + ], + "errors": [ + { + "code": "401", + "message": "工作台 token 不能为空(返回 flag=failure、code=401)" + }, + { + "code": "403", + "message": "工作台不存在或 token 无效(返回 flag=failure、code=403)" + } + ] } ] },