diff --git a/dist.tar.gz b/dist.tar.gz index e742aee5..4981d138 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/camera/camera.ts b/src/api/camera/camera.ts index a329ea2f..d9ca5a59 100644 --- a/src/api/camera/camera.ts +++ b/src/api/camera/camera.ts @@ -50,9 +50,6 @@ export function create(data: { model?: string serial_number?: string stream_type?: string - custom_name?: string - status?: number - remark?: string }) { return request({ url: '/system', @@ -83,9 +80,6 @@ export function update(data: { model?: string serial_number?: string stream_type?: string - custom_name?: string - status?: number - remark?: string }) { return request({ url: '/system', @@ -134,23 +128,3 @@ export function del(data: { id: number }) { isSystemApi: true } as any) } - -/** 设置摄像头 OSD 文字叠加 */ -export function setOsd(data: { - id: number - text: string - x?: number - y?: number -}) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'camera.setOsd', - v, - timestamp: new Date().getTime() - }, - data, - isSystemApi: true - } as any) -} diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index 585e54de..9701faee 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -63,7 +63,8 @@ export type PendingOrderReverseReviewParams = { }; export type PendingOrderAllocateExpressCodeParams = { - orders: Array>; + /** 订单 ID 数组,sys_platform_code / logistics_code 等字段由后端从数据库读取 */ + ids: number[]; }; export type PendingOrderUpdateOrderPlatformParams = { diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index fe071174..ba7943bb 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -303,7 +303,7 @@ async function loadFilterData() { try { const [storesRes, expressRes]: any = await Promise.all([ indexApi.loadStores(), - indexApi.getExpressList({}) + indexApi.getExpressList({ systemOnly: 'true' }) ]) fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const expressData: any = expressRes?.data diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index 52295896..3405b2f5 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -1152,9 +1152,9 @@ function resolveStoreId(raw: unknown): number | undefined { async function loadImportSelectOptions() { try { const [expressRes, sourcePlatformRes, platformRes]: any = await Promise.all([ - indexApi.getExpressList({}), + indexApi.getExpressList({ systemOnly: 'true' }), settingPlatformList({ pagination: { page: 1, pageSize: 500 } }), - indexApi.getPlatformList({}) + indexApi.getPlatformList({ systemOnly: 'true' }) ]) const expressRaw = expressRes?.data?.list || expressRes?.data || [] const sourcePlatformRaw = sourcePlatformRes?.data?.list || sourcePlatformRes?.data || [] diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue index 5854237a..8952d685 100644 --- a/src/views/order/orderManagement/deliveryException.vue +++ b/src/views/order/orderManagement/deliveryException.vue @@ -298,7 +298,7 @@ async function loadFilterData() { try { const [storesRes, expressRes]: any = await Promise.all([ indexApi.loadStores(), - indexApi.getExpressList({}) + indexApi.getExpressList({ systemOnly: 'true' }) ]) fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const expressData: any = expressRes?.data diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 05c5e03f..37b84ac8 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -364,8 +364,8 @@ function mapNameOptions(rawList: any[], nameKeys: string[]) { async function loadOrderMetaOptions() { try { const [expressRes, platformRes, storesRes] = await Promise.all([ - indexApi.getExpressList({}), - indexApi.getPlatformList({}), + indexApi.getExpressList({ systemOnly: 'true' }), + indexApi.getPlatformList({ systemOnly: 'true' }), indexApi.loadStores() ]) const expressData: any = expressRes?.data diff --git a/src/views/order/orderManagement/entrustWarehouse.vue b/src/views/order/orderManagement/entrustWarehouse.vue index 7436538f..39d253b0 100644 --- a/src/views/order/orderManagement/entrustWarehouse.vue +++ b/src/views/order/orderManagement/entrustWarehouse.vue @@ -298,7 +298,7 @@ async function loadFilterData() { try { const [storesRes, expressRes]: any = await Promise.all([ indexApi.loadStores(), - indexApi.getExpressList({}) + indexApi.getExpressList({ systemOnly: 'true' }) ]) fillStoreScanFieldOptions(availableFieldsRef, extractStoreListFromResponse(storesRes)) const expressData: any = expressRes?.data diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 3d796896..03069501 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -712,8 +712,8 @@ async function loadFilterData() { async function loadOrderMetaOptions() { try { const [expressRes, platformRes] = await Promise.all([ - indexApi.getExpressList({}), - indexApi.getPlatformList({}) + indexApi.getExpressList({ systemOnly: 'true' }), + indexApi.getPlatformList({ systemOnly: 'true' }) ]) const expressData: any = expressRes?.data const platformData: any = platformRes?.data diff --git a/src/views/order/orderManagement/outboundOrder.vue b/src/views/order/orderManagement/outboundOrder.vue index aacb0bd6..18174968 100644 --- a/src/views/order/orderManagement/outboundOrder.vue +++ b/src/views/order/orderManagement/outboundOrder.vue @@ -424,8 +424,8 @@ function mapNameOptions(rawList: any[], nameKeys: string[]) { async function loadOrderMetaOptions() { try { const [expressRes, platformRes, storesRes] = await Promise.all([ - indexApi.getExpressList({}), - indexApi.getPlatformList({}), + indexApi.getExpressList({ systemOnly: 'true' }), + indexApi.getPlatformList({ systemOnly: 'true' }), indexApi.loadStores() ]) const expressData: any = expressRes?.data diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index b11f7b15..807d5176 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -957,8 +957,8 @@ function mapNameOptions(rawList: any[], nameKeys: string[]) { async function loadOrderMetaOptions() { try { const [expressRes, platformRes] = await Promise.all([ - indexApi.getExpressList({}), - indexApi.getPlatformList({}) + indexApi.getExpressList({ systemOnly: 'true' }), + indexApi.getPlatformList({ systemOnly: 'true' }) ]) const expressData: any = expressRes?.data const platformData: any = platformRes?.data diff --git a/src/views/order/orderManagement/reviewOrder.vue b/src/views/order/orderManagement/reviewOrder.vue index 133ee1df..8506f618 100644 --- a/src/views/order/orderManagement/reviewOrder.vue +++ b/src/views/order/orderManagement/reviewOrder.vue @@ -284,8 +284,8 @@ function mapNameOptions(rawList: any[], nameKeys: string[]) { async function loadOrderMetaOptions() { try { const [platformRes, expressRes, storesRes] = await Promise.all([ - indexApi.getPlatformList({}), - indexApi.getExpressList({}), + indexApi.getPlatformList({ systemOnly: 'true' }), + indexApi.getExpressList({ systemOnly: 'true' }), indexApi.loadStores() ]) const platformData: any = platformRes?.data diff --git a/src/views/order/orderManagement/utils/toolbar-actions.ts b/src/views/order/orderManagement/utils/toolbar-actions.ts index db63fc89..6183d60d 100644 --- a/src/views/order/orderManagement/utils/toolbar-actions.ts +++ b/src/views/order/orderManagement/utils/toolbar-actions.ts @@ -419,39 +419,13 @@ function normalizeCode(value: unknown) { return String(value ?? '').trim() } -function computeAvailableBusinessKeys(expressNumbers: any, count = 1): number[] { - const used = new Set() - if (Array.isArray(expressNumbers)) { - for (const item of expressNumbers) { - const n = Number(item) - if (Number.isFinite(n) && n > 0 && Number.isInteger(n)) { - used.add(n) - } - } - } - const need = Math.max(1, Number(count) || 1) - const result: number[] = [] - let cursor = 1 - while (result.length < need) { - if (!used.has(cursor)) result.push(cursor) - cursor += 1 - } - return result -} - -function buildAllocateExpressPayload(rows: any[]): Array> { - const out: Array> = [] +function buildAllocateExpressIds(rows: any[]): number[] { + const ids: number[] = [] for (const row of rows) { - const base = { ...row } - const order_id = normalizePositiveIntId(base.order_id ?? base.id) - if (order_id === null) continue - out.push({ - ...base, - order_id, - business_key: computeAvailableBusinessKeys(row.express_numbers, 1) - }) + const id = normalizePositiveIntId(row.order_id ?? row.id) + if (id !== null) ids.push(id) } - return out + return ids } function normalizeAsyncTaskStatus(value: unknown) { @@ -1207,12 +1181,12 @@ export function createPendingToolbarController(params: { if (!rows.length || allocateLoading.value) return allocateLoading.value = true try { - const orders = buildAllocateExpressPayload(rows) - if (!orders.length) { + const ids = buildAllocateExpressIds(rows) + if (!ids.length) { ElMessage.error('没有有效的订单 ID,无法分配快递号') return } - const res = await params.pendingApi.allocateExpressCode({ orders }) + const res = await params.pendingApi.allocateExpressCode({ ids }) const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') if (!ok) { ElMessage.error(res?.message || '分配快递号失败') diff --git a/src/views/order/waveOrder/FallbackOrderListPanel.vue b/src/views/order/waveOrder/FallbackOrderListPanel.vue index 045d9cdf..0d4dc634 100644 --- a/src/views/order/waveOrder/FallbackOrderListPanel.vue +++ b/src/views/order/waveOrder/FallbackOrderListPanel.vue @@ -437,8 +437,8 @@ async function loadFallbackOrderFilterOptions() { try { const [storesRes, expressRes, platformRes] = await Promise.all([ indexApi.loadStores(), - indexApi.getExpressList({}), - indexApi.getPlatformList({}) + indexApi.getExpressList({ systemOnly: 'true' }), + indexApi.getPlatformList({ systemOnly: 'true' }) ]) const storesResAny = storesRes as any diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index f3d70b4d..63a16bf9 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -3102,8 +3102,8 @@ async function loadFallbackOrderFilterOptions() { try { const [storesRes, expressRes, platformRes] = await Promise.all([ indexApi.loadStores(), - indexApi.getExpressList({}), - indexApi.getPlatformList({}) + indexApi.getExpressList({ systemOnly: 'true' }), + indexApi.getPlatformList({ systemOnly: 'true' }) ]) const storesResAny = storesRes as any diff --git a/src/views/order/waveOrder/component/PendingOrderListPanel.vue b/src/views/order/waveOrder/component/PendingOrderListPanel.vue index 492f213a..054585bd 100644 --- a/src/views/order/waveOrder/component/PendingOrderListPanel.vue +++ b/src/views/order/waveOrder/component/PendingOrderListPanel.vue @@ -558,8 +558,8 @@ function unwrapIndexListResponse(res: any): any[] { async function loadOrderMetaOptions() { try { const [expressRes, platformRes] = await Promise.all([ - indexApi.getExpressList({}), - indexApi.getPlatformList({}) + indexApi.getExpressList({ systemOnly: 'true' }), + indexApi.getPlatformList({ systemOnly: 'true' }) ]) const expressRaw = unwrapIndexListResponse(expressRes) const platformRaw = unwrapIndexListResponse(platformRes) diff --git a/src/views/storage/entry/component/entrydetail.vue b/src/views/storage/entry/component/entrydetail.vue index 1d3f9eb0..9dd6a145 100644 --- a/src/views/storage/entry/component/entrydetail.vue +++ b/src/views/storage/entry/component/entrydetail.vue @@ -96,6 +96,7 @@ import DirectInboundImportDialog, { import { canDirectInboundOperate, entrydetail, + isPendingEntryOrderStatus, } from '../entry-config' const props = defineProps<{ @@ -131,8 +132,7 @@ const pagination = reactive({ const canBatchImport = computed(() => { const status = props.row?.order_status ?? entryOrderStatus.value - if (status === null || status === undefined || status === '') return false - return String(status).trim().toUpperCase() === 'CREATED' + return isPendingEntryOrderStatus(status) }) const canDirectInbound = computed(() => { @@ -304,7 +304,7 @@ function openImportDialog(row: DirectInboundImportRow) { function openBatchImportDialog() { if (!canBatchImport.value) { - ElMessage.warning('仅「已创建」状态可使用批量导入') + ElMessage.warning('仅「已创建」或「待入库」状态可使用批量导入') return } importTargetItem.value = null diff --git a/src/views/storage/stockout/stockout-config.ts b/src/views/storage/stockout/stockout-config.ts index 6f1edaaa..5105926d 100644 --- a/src/views/storage/stockout/stockout-config.ts +++ b/src/views/storage/stockout/stockout-config.ts @@ -24,6 +24,7 @@ export const stockoutScanBoxConfig = { } export const statusConfig: Record = { + created: { text: '已创建', tagType: 'success' }, pedding: { text: '待出库', tagType: 'warning' }, pending: { text: '待出库', tagType: 'warning' }, processing: { text: '出库中', tagType: 'primary' }, diff --git a/src/views/store/stores/index.vue b/src/views/store/stores/index.vue index 9a0eb09e..7c62f1d9 100644 --- a/src/views/store/stores/index.vue +++ b/src/views/store/stores/index.vue @@ -1669,8 +1669,8 @@ function mapPolicyPlatformOptions(rawList: any[]) { async function loadPolicySelectOptions() { try { const [expressRes, platformRes]: any = await Promise.all([ - getExpressList({}), - getPlatformList({}) + getExpressList({ systemOnly: 'true' }), + getPlatformList({ systemOnly: 'true' }) ]) const expressRaw = expressRes?.data?.list || expressRes?.data || [] const platformRaw = platformRes?.data?.list || platformRes?.data || [] diff --git a/src/views/system/setting/expressinterface/index.vue b/src/views/system/setting/expressinterface/index.vue index b3ed1d4e..025826d8 100644 --- a/src/views/system/setting/expressinterface/index.vue +++ b/src/views/system/setting/expressinterface/index.vue @@ -27,12 +27,13 @@ 刷新 字段设置 - 共 {{ pagination.total }} 条 + 新增接口配置 + {{ warehouseContextHint }} - 新增接口配置 +