diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index 2208ce98..e2ff4f72 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -132,6 +132,7 @@ export type PendingOrderAllocateStorageProgressResponse = { }; export type PendingOrderSyncOrderIdsParams = { + /** 订单 ID 列表;支持数组、逗号字符串或单个 ID(兼容多种别名,至少传一项) */ order_ids?: Array | string | number; orderIds?: Array | string | number; ids?: Array | string | number; @@ -140,6 +141,17 @@ export type PendingOrderSyncOrderIdsParams = { id?: number | string; }; +/** syncOrderIds 响应(SN 管理订单 is_sn_mgmt=Y 会被拦截并标记失败,需改用单订单回传) */ +export type PendingOrderSyncOrderIdsResponse = { + flag: string; + code: number; + message: string; + data?: { + order_ids?: Array; + [key: string]: unknown; + }; +}; + export function orderPendingOrderList(data: PendingOrderListParams = {}): Promise { return request({ url: "/system", @@ -280,7 +292,7 @@ export function orderPendingOrderAllocateStorageProgress( export function orderPendingOrderSyncOrderIds( data: PendingOrderSyncOrderIdsParams, -): Promise { +): Promise { return request({ url: "/system", method: "post", diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index 455167d0..a799a262 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -27,6 +27,10 @@ export type WaveBatchListWhere = { storage_assignment_status?: string /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ source?: number + /** 英文枚举:unsynced | partially_synced | synced */ + sync_assignment_status?: 'unsynced' | 'partially_synced' | 'synced' + /** 英文枚举:unreviewed | partially_reviewed | reviewed */ + review_assignment_status?: 'unreviewed' | 'partially_reviewed' | 'reviewed' } export type WaveBatchListParams = { @@ -34,6 +38,8 @@ export type WaveBatchListParams = { page?: number pageSize?: number } + /** 是否仅返回仍有未复核订单的波次,默认 0;传 1/true 时仅返回 unreviewed_order_count > 0 的波次 */ + only_todo?: number | boolean | string /** 白名单见 WaveBatchListWhere;与列表页动态 where 构建兼容 */ where?: WaveBatchListWhere | Record } @@ -54,6 +60,9 @@ export type WaveBatchListItem = Record & { print_assignment_status?: string /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ source?: number + sync_assignment_status?: string + review_assignment_status?: string + unreviewed_order_count?: number } export type WaveBatchListResponse = { diff --git a/src/api/pick/pick.ts b/src/api/pick/pick.ts index d6366bc1..97c6717c 100644 --- a/src/api/pick/pick.ts +++ b/src/api/pick/pick.ts @@ -4,12 +4,19 @@ const v = '1.0' /** pick.query 请求参数(与 module pick 一致) */ export type PickQueryParams = { - waybill_code: string - full_display?: boolean + keyword: string } -/** 按运单号查询波次拣货信息(pick.query) */ -export function pickQuery(data: PickQueryParams): Promise { +export type PickQueryResponse = { + task_id: number + status: string + tip: string +} + +/** 按 keyword(运单号或波次号)获取或创建拣货任务(pick.query) */ +export function pickQuery( + data: PickQueryParams +): Promise }> { return request({ url: '/system', method: 'post', @@ -27,8 +34,16 @@ export type PickWavePickTaskDetailParams = { task_id: number } +/** 拣货任务主表精简字段(含中间态进度语义) */ +export type PickWavePickTaskDetailTask = Record & { + is_completed?: boolean + progress?: Record +} + export type PickWavePickTaskDetailResponse = { - task?: Record + task?: PickWavePickTaskDetailTask + /** 与 task.is_completed 含义一致,便于前端直接判断 */ + is_completed?: boolean boxes?: Array> picking_details?: Array> picking_summary?: Record @@ -52,7 +67,69 @@ export function pickWavePickTaskDetail( } as any) } +export type PickWavePickTaskSubmitParams = { + task_id: number + payload?: Record +} + +export type PickWavePickTaskSubmitResponse = { + task_id: number + status: string + is_completed: boolean + progress: Record +} + +/** pick.wavePickTaskSubmit:提交拣货任务中间态 */ +export function pickWavePickTaskSubmit( + data: PickWavePickTaskSubmitParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pick.wavePickTaskSubmit', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export type PickWavePickTaskCompleteParams = { + task_id: number + mode?: number + order_ids?: Array +} + +export type PickWavePickTaskCompleteResponse = { + task_id: number + mode: number + confirmed_order_ids: Array + is_completed: boolean + progress: Record +} + +/** pick.wavePickTaskComplete:完全提交拣货任务 */ +export function pickWavePickTaskComplete( + data: PickWavePickTaskCompleteParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pick.wavePickTaskComplete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + export const pick = { query: pickQuery, - wavePickTaskDetail: pickWavePickTaskDetail + wavePickTaskDetail: pickWavePickTaskDetail, + wavePickTaskSubmit: pickWavePickTaskSubmit, + wavePickTaskComplete: pickWavePickTaskComplete } diff --git a/src/api/pickcart/pickcart.ts b/src/api/pickcart/pickcart.ts new file mode 100644 index 00000000..b99ab0b2 --- /dev/null +++ b/src/api/pickcart/pickcart.ts @@ -0,0 +1,248 @@ +import request from '@/utils/request' + +const v = '1.0' + +export type PickCartScanParams = { + cart_code: string +} + +export type PickCartScanResponse = { + cart_id: number + warehouse_id: number + cart_code: string + cart_name?: string + status: number + current_task_id?: number | null + current_task_no?: string | null +} + +export type PickCartBindTaskCartParams = { + task_id: number + cart_id?: number + cart_code?: string +} + +export type PickCartBindTaskCartResponse = { + task_id: number + task_no: string + cart: Record +} + +export type PickCartCreateParams = { + cart_code: string + cart_name?: string + status?: number +} + +export type PickCartCreateResponse = { + cart_id: number + cart_code: string + cart_name?: string + status: number +} + +export type PickCartUpdateParams = { + cart_id: number + cart_code?: string + cart_name?: string + status?: number +} + +export type PickCartUpdateResponse = PickCartCreateResponse + +export type PickCartDeleteParams = { + cart_id: number +} + +export type PickCartDeleteResponse = { + cart_id: number + deleted: boolean +} + +export type PickCartDetailParams = { + cart_id: number +} + +export type PickCartDetailResponse = PickCartScanResponse + +export type PickCartListParams = { + pagination?: { + page?: number + pageSize?: number + } + where?: { + keyword?: string + status?: number + current_task_id?: number + } +} + +export type PickCartListResponse = { + list: PickCartDetailResponse[] + pagination: { + page?: number + pageSize?: number + total?: number + totalPages?: number + } +} + +export type PickCartCodeDuplicateCheckParams = { + cart_code: string + exclude_cart_id?: number +} + +export type PickCartCodeDuplicateCheckResponse = { + duplicated: boolean + cart_id?: number | null + cart_code?: string | null + cart_name?: string | null + status?: number | null +} + +/** pickCart.scan:按拣货车条码/编码查询拣货车信息 */ +export function pickCartScan( + data: PickCartScanParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.scan', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** pickCart.bindTaskCart:绑定拣货任务与拣货车 */ +export function pickCartBindTaskCart( + data: PickCartBindTaskCartParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.bindTaskCart', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** pickCart.create:创建拣货车 */ +export function pickCartCreate( + data: PickCartCreateParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.create', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** pickCart.update:更新拣货车 */ +export function pickCartUpdate( + data: PickCartUpdateParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.update', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** pickCart.delete:删除拣货车 */ +export function pickCartDelete( + data: PickCartDeleteParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.delete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** pickCart.detail:查询拣货车详情 */ +export function pickCartDetail( + data: PickCartDetailParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.detail', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** pickCart.list:分页查询拣货车列表 */ +export function pickCartList( + data: PickCartListParams = {} +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.list', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** pickCart.codeDuplicateCheck:拣货车编码查重 */ +export function pickCartCodeDuplicateCheck( + data: PickCartCodeDuplicateCheckParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.codeDuplicateCheck', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export const pickCart = { + scan: pickCartScan, + bindTaskCart: pickCartBindTaskCart, + create: pickCartCreate, + update: pickCartUpdate, + delete: pickCartDelete, + detail: pickCartDetail, + list: pickCartList, + codeDuplicateCheck: pickCartCodeDuplicateCheck +} diff --git a/src/lang/en-US.ts b/src/lang/en-US.ts index 2acd7787..77c3b965 100644 --- a/src/lang/en-US.ts +++ b/src/lang/en-US.ts @@ -63,6 +63,7 @@ export default { 'shops':'Shops', 'packageMaterial':'Package Material', 'packageSupplier':'Package Supplier', + 'pickcart':'Pickcart', }, "login": { "title": "Login", diff --git a/src/lang/zh-CN.ts b/src/lang/zh-CN.ts index 9f9a2fd5..1b13d6eb 100644 --- a/src/lang/zh-CN.ts +++ b/src/lang/zh-CN.ts @@ -64,6 +64,7 @@ export default { 'shops':'店铺管理', 'packageMaterial':'包材管理', 'packageSupplier':'包装供应商', + 'pickcart':'拣货车', }, "login": { "title": "登录", diff --git a/src/router/map.ts b/src/router/map.ts index e8a00f88..30e3b58a 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -41,4 +41,5 @@ export const componentMap: Record = { 'system/setting/shops/index':() => import('@/views/system/setting/shops/index.vue'), 'material/packageMaterial/index':() => import('@/views/material/packageMaterial/index.vue'), 'material/packageSupplier/index':() => import('@/views/material/packageSupplier/index.vue'), + 'system/setting/pickcart/index':() => import('@/views/system/setting/pickcart/index.vue'), }; \ No newline at end of file diff --git a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue index 19864da5..fc7fe6fb 100644 --- a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue +++ b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue @@ -19,6 +19,11 @@ {{ translateOrderField('sync_status', detail.sync_status) }} + + + {{ translateOrderField('inspection_status', detail.inspection_status) }} + + {{ translateOrderField('storage_status', detail.storage_status) }} diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 27c9eef4..e08332db 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -671,6 +671,7 @@ export const reviewColums = [ { prop: 'mobile', label: '手机号', width: '120' }, { prop: 'status', label: '订单状态', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, + { prop: 'inspection_status', label: '复核', width: '100' }, { prop: 'is_urgency', label: '紧急', width: '80' }, { prop: 'logistics_name', label: '物流公司', width: '120' }, { prop: 'items_total', label: '商品总数', width: '100' }, diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index d2f704e6..c1f36746 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -149,6 +149,12 @@ + + @@ -343,6 +349,15 @@ const tableSize = ref('small') const buildPendingColumns = () => { const source = Array.isArray(pendingCloums) ? [...pendingCloums] : [] + const inspectionColumn = { prop: 'inspection_status', label: '复核', width: '100' } + if (!source.some((col: any) => String(col?.prop || '') === 'inspection_status')) { + const insertAfterIndex = source.findIndex((col: any) => String(col?.prop || '') === 'sync_status') + if (insertAfterIndex >= 0) { + source.splice(insertAfterIndex + 1, 0, inspectionColumn) + } else { + source.push(inspectionColumn) + } + } if (source.some((col: any) => String(col?.prop || '') === 'print_status')) { return source } diff --git a/src/views/order/orderManagement/reviewOrder.vue b/src/views/order/orderManagement/reviewOrder.vue index 0eca81f8..ae1d3001 100644 --- a/src/views/order/orderManagement/reviewOrder.vue +++ b/src/views/order/orderManagement/reviewOrder.vue @@ -74,6 +74,12 @@ + + + + + + + + + + + + + +