This commit is contained in:
yin 2026-06-23 18:24:16 +08:00
parent d1eecae3b1
commit 2c0d0225f1
18 changed files with 857 additions and 189 deletions

Binary file not shown.

View File

@ -370,6 +370,12 @@ export function warehouseSearch(data: {
store_id?: number
with_stock?: boolean
is_batch?: boolean
/** 传 "combo" 时搜索组合商品 */
mode?: 'combo' | string
/** mode="combo" 时按组合商品 ID 精确查询 */
id?: number
/** mode="combo" 时按自定义编码模糊查询 */
custom_code?: string
}) {
return request({
url: '/system',

View File

@ -21,7 +21,30 @@ export type StorageEntryListParams = {
sort?: StorageEntryListSort
}
export function getEntryList(data: StorageEntryListParams = {}): Promise<any> {
export type StorageEntryListResponse = {
code?: number
message?: string
list?: Record<string, unknown>[]
pagination?: {
page?: number
pageSize?: number
total?: number
totalPages?: number
hasPrevious?: boolean
hasNext?: boolean
}
summary?: {
total?: number
pending?: number
creating?: number
created?: number
completed?: number
cancelled?: number
}
data?: Partial<StorageEntryListResponse>
}
export function getEntryList(data: StorageEntryListParams = {}): Promise<StorageEntryListResponse> {
return request({
url: '/system',
method: 'post',
@ -63,12 +86,27 @@ export type EntryDetailItem = {
[key: string]: unknown
}
export type EntryOrderReceivingBinding = {
id?: number
receiving_id?: number
receiving?: {
id?: number
receiving_number?: string
status?: string
storage_status?: string
created_at?: string
[key: string]: unknown
}
[key: string]: unknown
}
export type EntryOrderDetail = {
entry_order_code?: string
purchase_order_code?: string
store_name?: string
order_status?: string
items?: EntryDetailItem[]
receivingBindings?: EntryOrderReceivingBinding[]
[key: string]: unknown
}
@ -94,7 +132,25 @@ export function getEntryDetail(data: GetEntryDetailParams): Promise<GetEntryDeta
})
}
export function cancelEntry(data:any): Promise<any> {
export type CancelEntryParams = {
/** 入库单ID,兼容旧调用;与 ids 二选一。若同时传入 ids,以 ids 为准 */
id?: number
/** 入库单ID数组,用于批量作废;必须为非空数组 */
ids?: number[]
}
export type CancelEntryResponse = {
code?: number
message?: string
id?: number
ids?: number[]
data?: {
id?: number
ids?: number[]
}
}
export function cancelEntry(data: CancelEntryParams): Promise<CancelEntryResponse> {
return request({
url: '/system',
method: 'post',
@ -239,3 +295,220 @@ export function getEntryPrintData(
data
})
}
export type DirectInboundGetItemsParams = {
/** 入库单号 */
entry_order_code: string
}
export type DirectInboundEntryOrder = {
id?: number
entry_order_code?: string
order_type?: string
order_status?: string
source_type?: string
warehouse_id?: number
store_id?: number
remark?: string
[key: string]: unknown
}
export type DirectInboundLog = {
id?: number
stock_id?: number
quantity?: number
inbound_type?: string
remark?: string
/** 存放库位ID,关联 wms_location_space.id */
space_id?: number
created_at?: string
warehouse_item_code?: string
warehouse_item_name?: string
[key: string]: unknown
}
export type DirectInboundItem = {
id?: number
stock_id?: number
count?: number
received_quantity?: number
direct_inbound_quantity?: number
remaining_quantity?: number
pending_binding_total?: number
bindings?: EntryDetailBinding[]
direct_logs?: DirectInboundLog[]
[key: string]: unknown
}
export type DirectInboundSummary = {
total_items?: number
total_planned?: number
total_direct_inbound?: number
[key: string]: unknown
}
export type DirectInboundGetItemsResponse = {
code?: number
message?: string
entryOrder?: DirectInboundEntryOrder
items?: DirectInboundItem[]
direct_logs?: DirectInboundLog[]
summary?: DirectInboundSummary
data?: {
entryOrder?: DirectInboundEntryOrder
items?: DirectInboundItem[]
direct_logs?: DirectInboundLog[]
summary?: DirectInboundSummary
}
}
/** 获取入库单的导入/PDA 入库信息 */
export function getDirectInboundItems(
data: DirectInboundGetItemsParams
): Promise<DirectInboundGetItemsResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.entry.getDirectInboundItems',
v,
timestamp: new Date().getTime()
},
data
})
}
export type DirectInboundAddItemBatchEntry = {
stock_id: number
quantity: number
inbound_type: 'import' | 'pda' | string
space_id?: number
remark?: string
}
export type DirectInboundAddItemSingleParams = {
entry_order_code: string
stock_id: number
quantity: number
inbound_type: 'import' | 'pda' | string
space_id?: number
remark?: string
}
export type DirectInboundAddItemBatchParams = {
entry_order_code: string
items: DirectInboundAddItemBatchEntry[]
}
export type DirectInboundAddItemParams =
| DirectInboundAddItemSingleParams
| DirectInboundAddItemBatchParams
export type DirectInboundAddItemResultEntry = {
id?: number
stock_id?: number
quantity?: number
inbound_type?: string
space_id?: number
plan_quantity?: number
existing_before?: number
existing_after?: number
remaining?: number
[key: string]: unknown
}
export type DirectInboundAddItemResponse = {
code?: number
message?: string
id?: number
stock_id?: number
quantity?: number
inbound_type?: string
plan_quantity?: number
existing_before?: number
existing_after?: number
remaining?: number
count?: number
total_quantity?: number
items?: DirectInboundAddItemResultEntry[]
data?: Partial<DirectInboundAddItemResponse>
}
/** 按商品增量添加导入/PDA 入库记录(支持单条与批量) */
export function addDirectInboundItem(
data: DirectInboundAddItemParams
): Promise<DirectInboundAddItemResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.entry.addDirectInboundItem',
v,
timestamp: new Date().getTime()
},
data
})
}
export type DirectInboundCommitParams = {
entry_order_code: string
}
export type DirectInboundCommitResponse = {
code?: number
message?: string
id?: number
entry_order_code?: string
order_status?: string
sync_status?: string
items_count?: number
total_quantity?: number
data?: Partial<DirectInboundCommitResponse>
}
/** 提交确认完成导入/PDA 入库 */
export function commitDirectInbound(
data: DirectInboundCommitParams
): Promise<DirectInboundCommitResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.entry.commitDirectInbound',
v,
timestamp: new Date().getTime()
},
data
})
}
export type DirectInboundRemoveItemParams = {
/** 入库记录ID(wms_inbound_direct_log.id) */
id: number
}
export type DirectInboundRemoveItemResponse = {
code?: number
message?: string
id?: number
stock_id?: number
quantity?: number
inbound_type?: string
data?: Partial<DirectInboundRemoveItemResponse>
}
/** 移除一条导入/PDA 入库记录(仅限未提交的入库单) */
export function removeDirectInboundItem(
data: DirectInboundRemoveItemParams
): Promise<DirectInboundRemoveItemResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.entry.removeDirectInboundItem',
v,
timestamp: new Date().getTime()
},
data
})
}

View File

@ -18,7 +18,7 @@ export function getInventoryList(data: any): Promise<any> {
}
export function quickPutaway(data: { receiving_id: number; id?: number }): Promise<any> {
const body: Record<string, any> = { ...data }
const body: Record<string, unknown> = { ...data }
if (body.receiving_id === undefined && body.id != null) {
body.receiving_id = Number(body.id)
}
@ -35,11 +35,39 @@ export function quickPutaway(data: { receiving_id: number; id?: number }): Promi
} as any)
}
export type MatchPutawayReceivingResult = {
receiving_id?: number
storage_status?: 'all' | 'partial' | 'none' | string
[key: string]: unknown
}
export type MatchPutawayEntryOrderResult = {
entry_order_id?: number
order_status?: string
callback_triggered?: boolean
callback_result?: Record<string, unknown> | null
[key: string]: unknown
}
export type MatchPutawayResponse = {
code?: number
message?: string
summary?: {
total_products_matched?: number
total_quantity_inbound?: number
[key: string]: unknown
}
receiving_results?: MatchPutawayReceivingResult[]
entry_order_results?: MatchPutawayEntryOrderResult[]
warnings?: string[]
data?: Partial<MatchPutawayResponse>
}
/** 收货单与入库单匹配入库:按商品维度匹配,需传收货单与入库单 ID 列表 */
export function matchPutaway(data: {
receiving_ids: number[]
entry_order_ids: number[]
}): Promise<any> {
}): Promise<MatchPutawayResponse> {
return request({
url: '/system',
method: 'post',

View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
const v = '1.0'
export type GetAvailableInboundQuantityParams = {
stock_id: number
}
export type AvailableInboundQuantityItem = {
detail_id?: number
receiving_id?: number
receiving_number?: string
product_name?: string
actual_quantity?: number
stored_quantity?: number
pending_allocated_quantity?: number
available_quantity?: number
storage_status?: string
batch_number?: string
production_date?: string
expiry_date?: string
space_id?: number
receiving_status?: string
[key: string]: unknown
}
export type GetAvailableInboundQuantityResponse = {
code?: number
message?: string
list?: AvailableInboundQuantityItem[]
total?: number
data?: {
list?: AvailableInboundQuantityItem[]
total?: number
}
}
/** 按 stock_id 查询可入库数量 */
export function getAvailableInboundQuantity(
data: GetAvailableInboundQuantityParams
): Promise<GetAvailableInboundQuantityResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.receiving.getAvailableInboundQuantity',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

View File

@ -361,56 +361,6 @@ export function quickPutaway(data: {
} as any)
}
export type GetAvailableInboundQuantityParams = {
stock_id: number
}
export type AvailableInboundQuantityItem = {
detail_id?: number
receiving_id?: number
receiving_number?: string
product_name?: string
actual_quantity?: number
stored_quantity?: number
pending_allocated_quantity?: number
available_quantity?: number
storage_status?: string
batch_number?: string
production_date?: string
expiry_date?: string
space_id?: number
receiving_status?: string
[key: string]: unknown
}
export type GetAvailableInboundQuantityResponse = {
code?: number
message?: string
list?: AvailableInboundQuantityItem[]
total?: number
data?: {
list?: AvailableInboundQuantityItem[]
total?: number
}
}
/** 按 stock_id 查询可入库数量 */
export function getAvailableInboundQuantity(
data: GetAvailableInboundQuantityParams
): Promise<GetAvailableInboundQuantityResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.receiving.getAvailableInboundQuantity',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}
export type ManualMatchEntryOrderParams = {
receivingId: number
entryOrderId: number

View File

@ -425,7 +425,7 @@ import SelectProductDialog from './SelectProductDialog.vue'
import type { SelectProductItem } from './SelectProductDialog.vue'
import * as indexApi from '@/api/index/index'
import {
lookupStockProductByKeyword
lookupProductByKeyword
} from '../utils/stock-picker-helpers'
import { orderList } from '@/api/order.index/orderindex'
import {
@ -815,7 +815,7 @@ function collectGroupOrderItems(rows: ImportPreviewRow[]) {
}
async function lookupStockItemByCode(storeId: number, itemCode: string) {
return lookupStockProductByKeyword(storeId, itemCode)
return lookupProductByKeyword(storeId, itemCode)
}
function applyMatchedStockToSelectedItem(item: PreviewSelectedItem, matched: PreviewSelectedItem) {
@ -825,6 +825,8 @@ function applyMatchedStockToSelectedItem(item: PreviewSelectedItem, matched: Pre
item.item_code = displayCode || matched.item_code
item.barcode = String(item.barcode || '').trim() || matched.barcode
item.store_id = item.store_id || matched.store_id
item.is_combo = matched.is_combo
item.combo_id = matched.combo_id
}
async function resolveMissingItemIdsForGroup(rows: ImportPreviewRow[]) {

View File

@ -15,9 +15,13 @@
</div>
<div class="select-product-toolbar">
<el-radio-group v-model="searchMode" size="small" @change="handleSearchModeChange">
<el-radio-button value="stock">普通商品</el-radio-button>
<el-radio-button value="combo">组合商品</el-radio-button>
</el-radio-group>
<el-input
v-model="keyword"
placeholder="支持多个查询使用逗号分隔"
:placeholder="searchMode === 'combo' ? '组合编码 / 名称 / 自定义编码,多个用逗号分隔' : '支持多个查询使用逗号分隔'"
clearable
size="small"
@keyup.enter="handleSearch"
@ -37,14 +41,22 @@
size="small"
max-height="280"
v-loading="loading"
row-key="item_id"
:row-key="tableRowKey"
empty-text="暂无商品"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="46" :reserve-selection="true" />
<el-table-column prop="item_code" label="商品编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="130" show-overflow-tooltip />
<el-table-column prop="barcode" label="条码" min-width="100" show-overflow-tooltip />
<template v-if="searchMode === 'combo'">
<el-table-column prop="combo_code" label="组合编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="combo_name" label="组合名称" min-width="130" show-overflow-tooltip />
<el-table-column prop="custom_code" label="自定义编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="simpleNotation" label="子商品简记" min-width="120" show-overflow-tooltip />
</template>
<template v-else>
<el-table-column prop="item_code" label="商品编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="130" show-overflow-tooltip />
<el-table-column prop="barcode" label="条码" min-width="100" show-overflow-tooltip />
</template>
</el-table>
<div class="select-product-pagination">
@ -62,6 +74,12 @@
<div class="selected-items-panel">
<div class="selected-items-title">已选商品</div>
<el-table :data="localSelectedItems" border size="small" max-height="160" empty-text="未选择商品">
<el-table-column label="类型" width="64">
<template #default="{ row: item }">
<el-tag v-if="item.is_combo" type="warning" size="small">组合</el-tag>
<span v-else>单品</span>
</template>
</el-table-column>
<el-table-column prop="item_code" label="编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="item_name" label="名称" min-width="110" show-overflow-tooltip />
<el-table-column label="计划数量" width="100">
@ -93,14 +111,17 @@ import {
getStockItemId,
indexStockRowsByLookupKeys,
isStockApiSuccess,
mapStockPickerItem,
mapWarehousePickerItem,
queryStockProducts,
toOrderSelectedProductItem,
type OrderSelectedProductItem
type OrderSelectedProductItem,
type WarehouseSearchMode
} from '../utils/stock-picker-helpers'
export type SelectProductItem = OrderSelectedProductItem
type ProductSearchMode = 'stock' | 'combo'
const visible = defineModel<boolean>({ default: false })
const props = defineProps<{
@ -115,6 +136,18 @@ const emit = defineEmits<{
const loading = ref(false)
const keyword = ref('')
const searchMode = ref<ProductSearchMode>('stock')
function currentWarehouseMode(): WarehouseSearchMode | undefined {
return searchMode.value === 'combo' ? 'combo' : undefined
}
function tableRowKey(row: any) {
if (searchMode.value === 'combo') {
return row?.combo_id ?? row?.id ?? row?.item_id
}
return row?.item_id
}
function normalizeKeyword() {
const raw = keyword.value
@ -143,6 +176,7 @@ const pagination = reactive({
watch(visible, (opened) => {
if (!opened) return
searchMode.value = 'stock'
defaultPlanQty.value = String(props.planQty || '').trim() || '1'
localSelectedItems.value = (props.selectedItems || []).map((item) => ({ ...item }))
keyword.value = ''
@ -165,6 +199,7 @@ async function initDialog() {
function handleClosed() {
keyword.value = ''
searchMode.value = 'stock'
defaultPlanQty.value = '1'
localSelectedItems.value = []
resetListState()
@ -190,13 +225,13 @@ function hasValidItemId(item: SelectProductItem) {
}
function buildSelectedItemFromStock(row: any, planQty: string): SelectProductItem | null {
return toOrderSelectedProductItem(row, { planQty })
return toOrderSelectedProductItem(row, { planQty, mode: currentWarehouseMode() })
}
function enrichLocalSelectedItemsFromRows(rows: any[]) {
function enrichLocalSelectedItemsFromRows(rows: any[], mode?: WarehouseSearchMode) {
if (!localSelectedItems.value.length || !rows.length) return
const indexes = indexStockRowsByLookupKeys(rows)
const indexes = indexStockRowsByLookupKeys(rows, mode)
localSelectedItems.value = localSelectedItems.value.map((item) => {
const stockRow = findStockRowForSelectedItem(item, indexes)
if (!stockRow) return item
@ -211,25 +246,36 @@ function needsStockMatchEnrichment(item: SelectProductItem) {
}
async function enrichLocalSelectedItems() {
enrichLocalSelectedItemsFromRows(allRows.value)
enrichLocalSelectedItemsFromRows(allRows.value, currentWarehouseMode())
const pendingItems = localSelectedItems.value.filter((item) => needsStockMatchEnrichment(item))
if (!pendingItems.length) return
const codes = Array.from(new Set(
pendingItems.map((item) => String(item.item_code).trim()).filter(Boolean)
const stockCodes = Array.from(new Set(
pendingItems.filter((item) => !item.is_combo).map((item) => String(item.item_code).trim()).filter(Boolean)
))
if (!codes.length) return
const comboCodes = Array.from(new Set(
pendingItems.filter((item) => item.is_combo).map((item) => String(item.item_code).trim()).filter(Boolean)
))
if (!stockCodes.length && !comboCodes.length) return
try {
const { res, list: rawList } = await queryStockProducts({
keyword: codes.join(','),
storeId: props.storeId
})
if (!isStockApiSuccess(res)) return
const matchedRows = rawList.map(mapStockPickerItem).filter((item: any) => item.item_id)
enrichLocalSelectedItemsFromRows(matchedRows)
const fetchTasks: Promise<any>[] = []
if (stockCodes.length) {
fetchTasks.push(queryStockProducts({ keyword: stockCodes.join(','), storeId: props.storeId }))
}
if (comboCodes.length) {
fetchTasks.push(queryStockProducts({ keyword: comboCodes.join(','), storeId: props.storeId, mode: 'combo' }))
}
const results = await Promise.all(fetchTasks)
for (const { res, list: rawList } of results) {
if (!isStockApiSuccess(res)) continue
const mode = rawList.some((row: any) => row?.combo_code || row?.combo_sku_id) ? 'combo' as const : undefined
const matchedRows = rawList
.map((row: any) => mapWarehousePickerItem(row, mode))
.filter((item: any) => item.item_id)
enrichLocalSelectedItemsFromRows(matchedRows, mode)
}
} catch (error) {
console.error('enrich selected product names failed:', error)
}
@ -237,17 +283,19 @@ async function enrichLocalSelectedItems() {
async function loadList() {
loading.value = true
const mode = currentWarehouseMode()
try {
const { res, list: rawList } = await queryStockProducts({
keyword: keyword.value.trim(),
storeId: props.storeId
storeId: props.storeId,
mode
})
if (!isStockApiSuccess(res)) {
resetListState()
ElMessage.error(res?.message || '查询商品失败')
return
}
allRows.value = rawList.map(mapStockPickerItem).filter((item: any) => item.item_id)
allRows.value = rawList.map((row) => mapWarehousePickerItem(row, mode)).filter((item: any) => item.item_id)
pagination.total = allRows.value.length
const maxPage = Math.max(1, Math.ceil(pagination.total / pagination.pageSize))
if (pagination.currentPage > maxPage) {
@ -309,7 +357,7 @@ function applySelectedItems(selections: any[]) {
return selectedIdsInTable.has(Number(item.item_id))
}).map((item) => {
if (!String(item.item_name || '').trim() || !hasValidItemId(item)) {
const indexes = indexStockRowsByLookupKeys(allRows.value)
const indexes = indexStockRowsByLookupKeys(allRows.value, currentWarehouseMode())
const stockRow = findStockRowForSelectedItem(item, indexes)
if (stockRow) {
return applyStockMatchToSelectedItem(item, stockRow)
@ -350,6 +398,19 @@ function removeSelectedItem(itemCode: string) {
})
}
function handleSearchModeChange() {
pagination.currentPage = 1
keyword.value = ''
syncingSelection.value = true
void loadList()
.then(() => enrichLocalSelectedItems())
.then(() => syncSelectionFromLocal())
.finally(async () => {
await nextTick()
syncingSelection.value = false
})
}
function handleSearch() {
pagination.currentPage = 1
syncingSelection.value = true

View File

@ -1733,7 +1733,8 @@ export const pendingToolbarButtonKeys = [
'batchUnintercept',
'batchLock',
'batchUnlock',
'batchPrint'
'batchPrint',
'resolveException'
]
/** 页面级按钮列表:pendingOrder 直接消费,避免页面内重复拼装 */
@ -1744,10 +1745,7 @@ export const pendingToolbarButtons = pickToolbarButtons(pendingToolbarButtonKeys
/**
* deliveryException
*/
export const exceptionToolbarButtonKeys = [
...pendingToolbarButtonKeys.filter((key) => key !== 'syncOrderIds'),
'resolveException'
]
export const exceptionToolbarButtonKeys = [...pendingToolbarButtonKeys]
export const exceptionToolbarButtons = pickToolbarButtons(exceptionToolbarButtonKeys)

View File

@ -308,6 +308,13 @@
@closed="resetManualWaybillDialog"
@submit="submitManualWaybill"
/>
<sync-order-ids-form
v-model="syncOrderIdsDialogVisible"
:order-count="selectionRows.length"
:loading="syncOrderIdsLoading"
@closed="resetSyncOrderIdsDialog"
@submit="submitSyncOrderIds"
/>
<update-address-form
v-model="updateAddressDialogVisible"
v-model:form="updateAddressForm"
@ -430,6 +437,7 @@ import StorageAllocateForm from './form/StorageAllocateForm.vue'
import UpdateOrderMetaForm from './form/UpdateOrderMetaForm.vue'
import CloneOrderForm from './form/CloneOrderForm.vue'
import ManualWaybillForm from './form/ManualWaybillForm.vue'
import SyncOrderIdsForm from './form/SyncOrderIdsForm.vue'
import UpdateAddressForm from './form/UpdateAddressForm.vue'
import BatchAsyncTaskForm from './form/BatchAsyncTaskForm.vue'
import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue'
@ -930,6 +938,8 @@ const {
manualWaybillOrderId,
manualWaybillOrderCode,
manualWaybillForm,
syncOrderIdsDialogVisible,
syncOrderIdsLoading,
updateAddressDialogVisible,
updateAddressLoading,
updateAddressOrderIds,
@ -946,6 +956,7 @@ const {
submitUpdateOrderMeta,
submitCloneOrder,
submitManualWaybill,
submitSyncOrderIds,
submitAllocateExpress,
submitUpdateAddress,
submitBatchAsyncTask,
@ -954,6 +965,7 @@ const {
resetUpdateOrderMetaDialog,
resetCloneOrderDialog,
resetManualWaybillDialog,
resetSyncOrderIdsDialog,
resetUpdateAddressDialog,
resetBatchAsyncTaskDialog
} = createPendingToolbarController({
@ -993,6 +1005,7 @@ const buttonLoadingMap = computed<Record<string, boolean>>(() => ({
updateOrderMetaLoading: updateOrderMetaLoading.value,
cloneOrderLoading: cloneOrderLoading.value,
manualWaybillLoading: manualWaybillLoading.value,
syncOrderIdsLoading: syncOrderIdsLoading.value,
updateAddressLoading: updateAddressLoading.value,
batchAsyncTaskLoading: batchAsyncTaskLoading.value,
resolveExceptionLoading: resolveExceptionLoading.value,

View File

@ -11,13 +11,13 @@
<el-form-item label="当前勾选订单">
<span>{{ orderCount }} 条</span>
</el-form-item>
<el-alert
<!-- <el-alert
type="warning"
:closable="false"
show-icon
title="批量同步说明"
description="服务端会按 create_channel 分组派发同步任务。若订单为 SN 管理(is_sn_mgmt=Y),该订单会被拦截并标记失败,不允许走批量回传,需改用单订单回传。"
/>
/> -->
</el-form>
<template #footer>
<el-button @click="visible = false">取消</el-button>

View File

@ -1,8 +1,8 @@
<template>
<div class="order-management-wrapper" :style="{ height: containerHeight }">
<div class="tabs-header-action">
<el-button size="small" @click="workbenchDialogVisible = true">统一查询</el-button>
<el-button size="small" @click="bindByWaybillDialogVisible = true">按运单绑定包材</el-button>
<!-- <el-button size="small" @click="workbenchDialogVisible = true">统一查询</el-button> -->
<!-- <el-button size="small" @click="bindByWaybillDialogVisible = true">按运单绑定包材</el-button> -->
<el-button size="small" :loading="badgeLoading" @click="refreshBadgeCounts">刷新角标</el-button>
</div>
<el-tabs

View File

@ -317,6 +317,36 @@
@submit="submitBatchAsyncTask"
/>
<el-dialog
v-model="resolveExceptionDialogVisible"
title="异常订单处理"
width="520px"
align-center
destroy-on-close
@closed="resetResolveExceptionDialog"
>
<el-alert
type="warning"
:closable="false"
show-icon
title="该操作会将异常订单恢复为正常待处理状态(step: 3 -> 2)。"
/>
<el-form label-width="120px" class="resolve-exception-form">
<el-form-item label="已选订单数">
<span>{{ resolveExceptionOrderIds.length }} 条</span>
</el-form-item>
<el-form-item label="订单ID">
<div class="resolve-exception-ids">{{ resolveExceptionOrderIds.join(', ') }}</div>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="resolveExceptionDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="resolveExceptionLoading" @click="submitResolveException">
确认处理
</el-button>
</template>
</el-dialog>
<qrcode-dialog v-model:visible="qrDialogVisible" :code="currentWaybillCode" />
<wave-platform-print-preview-dialog
@ -345,11 +375,12 @@
<script setup lang="ts">
import { ref, reactive, onMounted, onUnmounted, computed } from 'vue'
import { useRoute } from 'vue-router'
import { ElMessage } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { CopyDocument } from '@element-plus/icons-vue'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
import { orderExpectionOrder } from '@/api/order.expectionorder/orderexpectionorder'
import * as indexApi from '@/api/index/index'
import {
@ -458,6 +489,9 @@ const expressCodeOptions = ref<Array<{ label: string; value: string }>>([])
const platformCodeOptions = ref<Array<{ label: string; value: string }>>([])
const { openCreateOrderDialog, registerCreateOrderSuccess, unregisterCreateOrderSuccess } =
useCreateOrderSession()
const resolveExceptionDialogVisible = ref(false)
const resolveExceptionLoading = ref(false)
const resolveExceptionOrderIds = ref<number[]>([])
const selectedRow = computed(() => {
return list.value.find((i: any) => i.id === selectedOrderId.value) || null
@ -651,6 +685,63 @@ function onQuickSearch() {
loadData()
}
function openResolveExceptionDialog() {
if (!selectionRows.value.length) {
ElMessage.warning('请先勾选需要处理的异常订单')
return
}
const ids = getSelectedIds()
if (!ids.length) {
ElMessage.error('选中行缺少有效订单 id,请刷新后重试')
return
}
resolveExceptionOrderIds.value = [...ids]
resolveExceptionDialogVisible.value = true
}
function resetResolveExceptionDialog() {
resolveExceptionOrderIds.value = []
}
async function submitResolveException() {
if (resolveExceptionLoading.value) return
const ids = [...resolveExceptionOrderIds.value]
if (!ids.length) {
ElMessage.warning('没有可处理的异常订单')
return
}
try {
await ElMessageBox.confirm(
`确定将选中的 ${ids.length} 条异常订单恢复为待处理状态吗?`,
'确认处理',
{ type: 'warning' }
)
} catch {
return
}
resolveExceptionLoading.value = true
try {
const res = await orderExpectionOrder.resolveException({ ids })
const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success')
if (!ok) {
ElMessage.error(res?.message || '异常处理失败')
return
}
const updatedCount = Number(res?.data?.updated_count ?? ids.length) || 0
ElMessage.success(`异常处理成功 ${updatedCount} 条`)
resolveExceptionDialogVisible.value = false
upperTable.value?.clearSelection?.()
selectionRows.value = []
hasSelection.value = false
await loadData()
} catch {
ElMessage.error('异常处理失败')
} finally {
resolveExceptionLoading.value = false
}
}
function openColumnConfigPanel() {
upperTable.value?.openColumnConfig?.()
}
@ -757,7 +848,7 @@ const {
platformCodeOptions
})
// 注册批量打印处理函数
toolbarActionMap['openResolveExceptionDialog'] = openResolveExceptionDialog
toolbarActionMap['handleBatchPrint'] = handleBatchPrint
const buttonLoadingMap = computed<Record<string, boolean>>(() => ({
@ -772,6 +863,7 @@ const buttonLoadingMap = computed<Record<string, boolean>>(() => ({
syncOrderIdsLoading: syncOrderIdsLoading.value,
updateAddressLoading: updateAddressLoading.value,
batchAsyncTaskLoading: batchAsyncTaskLoading.value,
resolveExceptionLoading: resolveExceptionLoading.value,
waveSingleFetchLoading: waveSingleFetchLoading.value,
batchPrintLoading: batchPrintLoading.value
}))
@ -1001,5 +1093,17 @@ function getSelectedIds(): number[] {
padding: 0;
height: auto;
}
.resolve-exception-form {
margin-top: 12px;
}
.resolve-exception-ids {
max-height: 96px;
overflow-y: auto;
color: #606266;
line-height: 1.6;
word-break: break-all;
}
</style>

View File

@ -1,5 +1,7 @@
import { warehouseSearch } from '@/api/stock/stock'
export type WarehouseSearchMode = 'combo'
export type OrderSelectedProductItem = {
item_id?: number
item_code: string
@ -7,6 +9,9 @@ export type OrderSelectedProductItem = {
barcode: string
plan_qty: string
store_id?: number
/** 是否为组合商品(建单 item_id 取 combo_sku_id) */
is_combo?: boolean
combo_id?: number
}
export function isStockApiSuccess(res: any) {
@ -18,12 +23,18 @@ export function buildWarehouseSearchRequest(options: {
storeId?: number
withStock?: boolean
isBatch?: boolean
mode?: WarehouseSearchMode
id?: number
customCode?: string
}) {
const requestData: {
keyword?: string
store_id?: number
with_stock?: boolean
is_batch?: boolean
mode?: WarehouseSearchMode
id?: number
custom_code?: string
} = {}
const normalizedKeyword = String(options.keyword || '').trim()
if (normalizedKeyword) {
@ -38,6 +49,16 @@ export function buildWarehouseSearchRequest(options: {
if (options.isBatch === true) {
requestData.is_batch = true
}
if (options.mode === 'combo') {
requestData.mode = 'combo'
}
if (Number.isInteger(options.id) && Number(options.id) > 0) {
requestData.id = Number(options.id)
}
const customCode = String(options.customCode || '').trim()
if (customCode) {
requestData.custom_code = customCode
}
return requestData
}
@ -56,12 +77,94 @@ export async function queryStockProducts(options: {
storeId?: number
withStock?: boolean
isBatch?: boolean
mode?: WarehouseSearchMode
id?: number
customCode?: string
}) {
const requestData = buildWarehouseSearchRequest(options)
const res: any = await warehouseSearch(requestData)
return { res, ...parseStockWarehouseSearch(res) }
}
export function getComboSkuId(row: any): number | undefined {
const comboSkuId = Number(row?.combo_sku_id)
if (Number.isInteger(comboSkuId) && comboSkuId > 0) return comboSkuId
return undefined
}
export function isComboStockRow(row: any): boolean {
if (row?.is_combo === true) return true
if (getComboSkuId(row)) return true
return Boolean(String(row?.combo_code ?? '').trim() || String(row?.combo_name ?? '').trim())
}
function resolveComboSkuId(row: any): number | undefined {
const comboSkuId = getComboSkuId(row)
if (comboSkuId) return comboSkuId
if (row?.is_combo === true) {
const itemId = Number(row?.item_id)
if (Number.isInteger(itemId) && itemId > 0) return itemId
}
return undefined
}
export function getComboId(row: any): number | undefined {
const comboId = Number(row?.id ?? row?.combo_id)
return Number.isInteger(comboId) && comboId > 0 ? comboId : undefined
}
export function getComboCode(row: any) {
const candidates = [row?.combo_code, row?.custom_code]
for (const candidate of candidates) {
const text = String(candidate ?? '').trim()
if (text) return text
}
return ''
}
export function getComboName(row: any) {
return String(row?.combo_name ?? row?.item_name ?? '').trim()
}
export function mapComboPickerItem(row: any) {
const comboSkuId = resolveComboSkuId(row)
const comboCode = getComboCode(row)
const comboName = getComboName(row)
return {
...row,
item_id: comboSkuId,
item_code: comboCode,
item_name: comboName,
barcode: String(row?.custom_code ?? row?.barcode ?? '').trim(),
is_combo: true,
combo_id: getComboId(row)
}
}
export function mapWarehousePickerItem(row: any, mode?: WarehouseSearchMode) {
return mode === 'combo' ? mapComboPickerItem(row) : mapStockPickerItem(row)
}
export function comboRowMatchesKeyword(row: any, keyword: string) {
const normalized = String(keyword || '').trim().toLowerCase()
if (!normalized) return false
const comboId = getComboId(row)
if (comboId && String(comboId) === normalized) return true
const comboSkuId = getComboSkuId(row)
if (comboSkuId && String(comboSkuId) === normalized) return true
const comboCode = getComboCode(row)
if (comboCode && comboCode.toLowerCase() === normalized) return true
const comboName = getComboName(row)
if (comboName && comboName.toLowerCase().includes(normalized)) return true
const customCode = String(row?.custom_code ?? '').trim()
return Boolean(customCode && customCode.toLowerCase() === normalized)
}
export function getStockItemId(row: any): number | undefined {
const candidates = [
row?.item_id,
@ -178,12 +281,17 @@ export function stockRowMatchesKeyword(row: any, keyword: string) {
}
/** 在 stock.warehouse.search 结果中按编码/条码/id 定位商品 */
export function findStockRowByKeyword(list: any[], keyword: string) {
export function findStockRowByKeyword(list: any[], keyword: string, mode?: WarehouseSearchMode) {
const normalized = String(keyword || '').trim()
if (!normalized || !list.length) return undefined
const mappedList = list.map((row) => (getStockItemId(row) ? mapStockPickerItem(row) : row))
const direct = mappedList.find((row) => stockRowMatchesKeyword(row, normalized))
const mapper = mode === 'combo' ? mapComboPickerItem : mapStockPickerItem
const matcher = mode === 'combo' ? comboRowMatchesKeyword : stockRowMatchesKeyword
const mappedList = list.map((row) => {
const mapped = mapper(row)
return mapped.item_id ? mapped : row
})
const direct = mappedList.find((row) => matcher(row, normalized))
if (direct) return direct
return mappedList.length === 1 ? mappedList[0] : undefined
}
@ -191,9 +299,10 @@ export function findStockRowByKeyword(list: any[], keyword: string) {
/** 将搜索命中结果转为建单所需商品字段,保留用户输入的展示编码 */
export function toOrderSelectedProductItem(
stockRow: any,
options: { displayCode?: string; planQty?: string } = {}
options: { displayCode?: string; planQty?: string; mode?: WarehouseSearchMode } = {}
): OrderSelectedProductItem | null {
const mapped = mapStockPickerItem(stockRow)
const useCombo = options.mode === 'combo' || isComboStockRow(stockRow)
const mapped = useCombo ? mapComboPickerItem(stockRow) : mapStockPickerItem(stockRow)
const itemId = mapped.item_id
if (!itemId) return null
@ -204,12 +313,19 @@ export function toOrderSelectedProductItem(
item_name: mapped.item_name,
barcode: mapped.barcode,
plan_qty: String(options.planQty || '1').trim() || '1',
store_id: getStockStoreId(stockRow)
store_id: getStockStoreId(stockRow) || mapped.store_id,
is_combo: useCombo,
combo_id: useCombo ? mapped.combo_id : undefined
}
}
export function applyStockMatchToSelectedItem<T extends OrderSelectedProductItem>(item: T, stockRow: any): T {
const mapped = mapStockPickerItem(stockRow)
const useCombo = item.is_combo === true
? true
: item.is_combo === false
? false
: isComboStockRow(stockRow)
const mapped = useCombo ? mapComboPickerItem(stockRow) : mapStockPickerItem(stockRow)
const displayCode = String(item.item_code || '').trim()
return {
@ -218,10 +334,29 @@ export function applyStockMatchToSelectedItem<T extends OrderSelectedProductItem
item_code: displayCode || mapped.item_code,
item_name: String(item.item_name || '').trim() || mapped.item_name,
barcode: String(item.barcode || '').trim() || mapped.barcode,
store_id: getStockStoreId(stockRow) || item.store_id
store_id: getStockStoreId(stockRow) || item.store_id,
is_combo: useCombo,
combo_id: useCombo ? (mapped.combo_id || item.combo_id) : undefined
}
}
export async function lookupComboProductByKeyword(storeId: number | undefined, keyword: string) {
const normalizedKeyword = String(keyword || '').trim()
if (!normalizedKeyword) return null
const { res, list } = await queryStockProducts({
keyword: normalizedKeyword,
storeId,
mode: 'combo'
})
if (!isStockApiSuccess(res)) return null
const matched = findStockRowByKeyword(list, normalizedKeyword, 'combo')
if (!matched) return null
return toOrderSelectedProductItem(matched, { displayCode: normalizedKeyword, mode: 'combo' })
}
export async function lookupStockProductByKeyword(storeId: number | undefined, keyword: string) {
const normalizedKeyword = String(keyword || '').trim()
if (!normalizedKeyword) return null
@ -238,19 +373,33 @@ export async function lookupStockProductByKeyword(storeId: number | undefined, k
return toOrderSelectedProductItem(matched, { displayCode: normalizedKeyword })
}
export function indexStockRowsByLookupKeys(rows: any[]) {
/** 建单商品匹配:先查普通商品,未命中再查组合商品 */
export async function lookupProductByKeyword(storeId: number | undefined, keyword: string) {
const stockItem = await lookupStockProductByKeyword(storeId, keyword)
if (stockItem?.item_id) return stockItem
return lookupComboProductByKeyword(storeId, keyword)
}
export function indexStockRowsByLookupKeys(rows: any[], mode?: WarehouseSearchMode) {
const byId = new Map<number, any>()
const byCode = new Map<string, any>()
const byBarcode = new Map<string, any>()
for (const row of rows) {
const mapped = getStockItemId(row) ? mapStockPickerItem(row) : row
const itemId = getStockItemId(mapped)
const itemCode = getStockItemCode(mapped)
const mapped = mode === 'combo'
? (isComboStockRow(row) ? mapComboPickerItem(row) : row)
: (getStockItemId(row) ? mapStockPickerItem(row) : row)
const itemId = mode === 'combo' ? resolveComboSkuId(mapped) : getStockItemId(mapped)
const itemCode = mode === 'combo' ? getComboCode(mapped) : getStockItemCode(mapped)
if (itemId) byId.set(itemId, mapped)
if (itemCode) byCode.set(itemCode, mapped)
for (const barcode of getStockBarcodes(mapped)) {
byBarcode.set(barcode, mapped)
if (mode === 'combo') {
const customCode = String(mapped?.custom_code ?? '').trim()
if (customCode) byCode.set(customCode, mapped)
} else {
for (const barcode of getStockBarcodes(mapped)) {
byBarcode.set(barcode, mapped)
}
}
}
@ -258,7 +407,7 @@ export function indexStockRowsByLookupKeys(rows: any[]) {
}
export function findStockRowForSelectedItem(
item: Pick<OrderSelectedProductItem, 'item_id' | 'item_code'>,
item: Pick<OrderSelectedProductItem, 'item_id' | 'item_code' | 'is_combo'>,
indexes: ReturnType<typeof indexStockRowsByLookupKeys>
) {
const displayCode = String(item.item_code || '').trim()

View File

@ -613,7 +613,7 @@ async function submitWaveStrategyQuickScan() {
async function submitFallbackOrderFetchByIds() {
if (!selectionRows.value.length) {
ElMessage.warning('请先勾选要抓取删单的订单')
ElMessage.warning('请先勾选要抓取散单的订单')
return
}

View File

@ -140,7 +140,7 @@
size="small"
:loading="waveStrategyFetchSubmittingId === Number(row?.id || 0)"
:disabled="!Number(row?.id || 0)"
@click="submitWaveStrategyFetchPda(row)"
@click="submitWaveStrategyFetchAdmin(row)"
>
后台抓取
</el-button>
@ -168,13 +168,21 @@
<el-form
ref="waveStrategyFormRef"
:model="waveStrategyFormModel"
:rules="waveStrategyFormRules"
:rules="waveStrategyActiveFormRules"
label-width="130px"
class="wave-strategy-form-grid"
>
<el-form-item label="策略名称" prop="strategy_name">
<el-input v-model="waveStrategyFormModel.strategy_name" clearable placeholder="请输入策略名称" maxlength="80" />
</el-form-item>
<el-form-item label="波次前缀" prop="wave_prefix">
<el-input
v-model="waveStrategyFormModel.wave_prefix"
clearable
placeholder="如 D、B、A(最多5字符)"
maxlength="5"
/>
</el-form-item>
<el-form-item label="策略类型" prop="strategy_type">
<el-select v-model="waveStrategyFormModel.strategy_type" clearable placeholder="请选择策略类型">
<el-option :value="1" label="散单" />
@ -343,6 +351,7 @@ import {
waveStrategyAvailableFields,
waveStrategyColumns,
waveStrategyFormRules,
buildWaveStrategyMutationPayload,
waveBooleanOptions,
waveStrategyToolbarButtons
} from './config/wave-config'
@ -350,7 +359,7 @@ import { safeInvoke } from '@/utils/safe-invoke'
import * as indexApi from '@/api/index/index'
import {
orderWaveWaveStrategyCreate,
orderWaveWaveStrategyFetchPda,
orderWaveWaveStrategyFetchAdmin,
orderWaveWaveStrategyUpdate,
orderWaveWaveStrategyList
} from '@/api/order.wave/orderwave'
@ -388,6 +397,7 @@ const waveStrategyEditingId = ref<number | null>(null)
const waveStrategyFormRef = ref<any>(null)
const waveStrategyFormModel = reactive({
strategy_name: '',
wave_prefix: '',
strategy_type: undefined as number | undefined,
batch_mode: undefined as number | undefined,
status: 1 as number | undefined,
@ -438,6 +448,11 @@ const filteredColumns = computed(() => {
const toolbarButtons = waveStrategyToolbarButtons
const waveStrategyActiveFormRules = computed(() => ({
...waveStrategyFormRules,
batch_mode: waveStrategyFormModel.strategy_type === 2 ? [] : waveStrategyFormRules.batch_mode
}))
const buttonLoadingMap = computed(() => ({
loading: loading.value
}))
@ -759,9 +774,16 @@ async function loadStrategyFilterOptions() {
}
}
function readOptionalNumber(raw: unknown): number | undefined {
if (raw === undefined || raw === null || raw === '') return undefined
const n = Number(raw)
return Number.isFinite(n) ? n : undefined
}
function resetWaveStrategyForm() {
waveStrategyEditingId.value = null
waveStrategyFormModel.strategy_name = ''
waveStrategyFormModel.wave_prefix = ''
waveStrategyFormModel.strategy_type = undefined
waveStrategyFormModel.batch_mode = undefined
waveStrategyFormModel.status = 1
@ -786,53 +808,7 @@ function resetWaveStrategyForm() {
}
function buildWaveStrategyPayload() {
const normalizedBatchMode = waveStrategyFormModel.strategy_type === 2
? 0
: waveStrategyFormModel.batch_mode
const normalizedBatchMaxSkus = normalizedBatchMode === 2
? Math.max(1, Number(waveStrategyFormModel.batch_max_skus || 0))
: 0
const normalizedBatchMaxOrders = waveStrategyFormModel.strategy_type === 2
? 0
: waveStrategyFormModel.batch_max_orders
const normalizedGroupBatchMaxOrders = waveStrategyFormModel.strategy_type === 2
? waveStrategyFormModel.group_batch_max_orders
: 0
const payload: Partial<WaveStrategyCreateParams & WaveStrategyUpdateParams> = {
strategy_name: waveStrategyFormModel.strategy_name.trim(),
strategy_type: waveStrategyFormModel.strategy_type,
batch_mode: normalizedBatchMode,
status: waveStrategyFormModel.status,
order_min_sku: waveStrategyFormModel.order_min_sku,
order_max_sku: waveStrategyFormModel.order_max_sku,
order_min_qty: waveStrategyFormModel.order_min_qty,
order_max_qty: waveStrategyFormModel.order_max_qty,
min_same_structure: waveStrategyFormModel.min_same_structure,
max_same_structure: waveStrategyFormModel.max_same_structure,
batch_max_orders: normalizedBatchMaxOrders,
batch_max_skus: normalizedBatchMaxSkus,
group_batch_max_orders: normalizedGroupBatchMaxOrders,
require_same_express: waveStrategyFormModel.require_same_express,
allow_cross_owner: waveStrategyFormModel.allow_cross_owner,
description: waveStrategyFormModel.description.trim() || undefined
}
const allowedOwners = waveStrategyFormModel.allowed_owners
const allowedExpresses = waveStrategyFormModel.allowed_expresses
const allowedProvinces = waveStrategyFormModel.allowed_provinces
const allowedPlatforms = waveStrategyFormModel.allowed_platforms
if (allowedOwners.length) payload.allowed_owners = allowedOwners
if (allowedExpresses.length) payload.allowed_expresses = allowedExpresses
if (allowedProvinces.length) payload.allowed_provinces = allowedProvinces
if (allowedPlatforms.length) payload.allowed_platforms = allowedPlatforms
Object.keys(payload).forEach((key) => {
const value = payload[key as keyof typeof payload]
if (value === undefined) {
delete payload[key as keyof typeof payload]
}
})
return payload
return buildWaveStrategyMutationPayload(waveStrategyFormModel)
}
function openCreateWaveStrategyDialog() {
@ -847,29 +823,19 @@ function openEditWaveStrategyDialog(row: Record<string, any>) {
resetWaveStrategyForm()
waveStrategyEditingId.value = Number(row?.id || 0) || null
waveStrategyFormModel.strategy_name = String(row?.strategy_name || '')
waveStrategyFormModel.strategy_type = Number(row?.strategy_type ?? 0) || undefined
const rawBatchMode = row?.batch_mode
waveStrategyFormModel.batch_mode = rawBatchMode !== undefined && rawBatchMode !== null && Number(rawBatchMode) === 0
? 0
: Number(rawBatchMode ?? 0) || undefined
waveStrategyFormModel.wave_prefix = String(row?.wave_prefix || '')
waveStrategyFormModel.strategy_type = readOptionalNumber(row?.strategy_type)
waveStrategyFormModel.batch_mode = readOptionalNumber(row?.batch_mode)
waveStrategyFormModel.status = row?.status === 0 || row?.status === 1 ? Number(row.status) : undefined
waveStrategyFormModel.order_min_sku = Number(row?.order_min_sku ?? 0) || undefined
waveStrategyFormModel.order_max_sku = Number(row?.order_max_sku ?? 0) || undefined
waveStrategyFormModel.order_min_qty = Number(row?.order_min_qty ?? 0) || undefined
waveStrategyFormModel.order_max_qty = Number(row?.order_max_qty ?? 0) || undefined
waveStrategyFormModel.min_same_structure = Number(row?.min_same_structure ?? 0) || undefined
waveStrategyFormModel.max_same_structure = Number(row?.max_same_structure ?? 0) || undefined
waveStrategyFormModel.batch_max_orders = waveStrategyFormModel.strategy_type === 2
? 0
: Number(row?.batch_max_orders ?? 0) || undefined
const rawBatchMaxSkus = row?.batch_max_skus
waveStrategyFormModel.batch_max_skus = rawBatchMaxSkus !== undefined && rawBatchMaxSkus !== null && Number(rawBatchMaxSkus) === 0
? 0
: Number(rawBatchMaxSkus ?? 0) || undefined
const rawGroupBatchMaxOrders = row?.group_batch_max_orders
waveStrategyFormModel.group_batch_max_orders = rawGroupBatchMaxOrders !== undefined && rawGroupBatchMaxOrders !== null && Number(rawGroupBatchMaxOrders) === 0
? 0
: Number(rawGroupBatchMaxOrders ?? 0) || undefined
waveStrategyFormModel.order_min_sku = readOptionalNumber(row?.order_min_sku)
waveStrategyFormModel.order_max_sku = readOptionalNumber(row?.order_max_sku)
waveStrategyFormModel.order_min_qty = readOptionalNumber(row?.order_min_qty)
waveStrategyFormModel.order_max_qty = readOptionalNumber(row?.order_max_qty)
waveStrategyFormModel.min_same_structure = readOptionalNumber(row?.min_same_structure)
waveStrategyFormModel.max_same_structure = readOptionalNumber(row?.max_same_structure)
waveStrategyFormModel.batch_max_orders = readOptionalNumber(row?.batch_max_orders)
waveStrategyFormModel.batch_max_skus = readOptionalNumber(row?.batch_max_skus)
waveStrategyFormModel.group_batch_max_orders = readOptionalNumber(row?.group_batch_max_orders)
if (row?.require_same_express === 1 || row?.require_same_express === true) {
waveStrategyFormModel.require_same_express = true
} else if (row?.require_same_express === 0 || row?.require_same_express === false) {
@ -917,7 +883,7 @@ async function submitWaveStrategyForm() {
throw new Error('缺少策略ID,无法更新')
}
const res = await orderWaveWaveStrategyUpdate({
id: waveStrategyEditingId.value,
strategy_id: waveStrategyEditingId.value,
...(payload as WaveStrategyUpdateParams)
}) as WaveStrategyMutationResponse & { code?: number; message?: string; data?: Record<string, unknown> }
if (!res || !okCode(res.code)) {
@ -996,7 +962,7 @@ function applyWaveStrategyFetchUiResult(
ElMessage.warning(payload?.message || `未知抓取状态(fetch_state=${String(fs)})`)
}
async function submitWaveStrategyFetchPda(row: Record<string, any>) {
async function submitWaveStrategyFetchAdmin(row: Record<string, any>) {
const strategyId = Number(row?.id || 0)
if (!strategyId) {
ElMessage.warning('无法识别策略ID,请刷新后重试')
@ -1005,10 +971,9 @@ async function submitWaveStrategyFetchPda(row: Record<string, any>) {
waveStrategyFetchSubmittingId.value = strategyId
try {
const res = await orderWaveWaveStrategyFetchPda({
const res = await orderWaveWaveStrategyFetchAdmin({
strategy_id: strategyId,
source: 'admin',
operation_source: 'admin'
source: 'admin'
}) as WaveStrategyFetchTaskCreatedResponse & { code?: number; message?: string }
if (!res || !okCode(res.code)) {
throw new Error(res?.message || '提交后台抓取任务失败')

View File

@ -4,6 +4,7 @@ import {
type ToolbarButtonConfig
} from '@/views/order/orderManagement/config/order-common-config'
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
import type { WaveStrategyCreateParams, WaveStrategyUpdateParams } from '@/api/order.wave/orderwave'
import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder'
import {
isOrderIndexApiSuccess,
@ -701,7 +702,72 @@ export const waveStorageAssignmentErrorPhraseMap: Array<[RegExp, string]> = [
export const waveStrategyFormRules = {
strategy_name: [{ required: true, message: '请输入策略名称', trigger: 'blur' }],
strategy_type: [{ required: true, message: '请输入策略类型', trigger: 'change' }],
batch_mode: [{ required: true, message: '请输入批次模式', trigger: 'change' }]
batch_mode: [{ required: true, message: '请输入批次模式', trigger: 'change' }],
wave_prefix: [{ max: 5, message: '波次前缀最多5个字符', trigger: 'blur' }]
}
/** 新建/编辑波次策略表单源数据(与 order.wave.waveStrategyCreate / waveStrategyUpdate 入参对齐) */
export type WaveStrategyFormPayloadSource = {
strategy_name: string
strategy_type?: number
batch_mode?: number
status?: number
order_min_sku?: number | null
order_max_sku?: number | null
order_min_qty?: number | null
order_max_qty?: number | null
min_same_structure?: number | null
max_same_structure?: number | null
batch_max_orders?: number
batch_max_skus?: number
group_batch_max_orders?: number
require_same_express?: boolean
allow_cross_owner?: boolean
description?: string
wave_prefix?: string
allowed_owners?: string[]
allowed_expresses?: string[]
allowed_provinces?: string[]
allowed_platforms?: string[]
}
/** 组装 order.wave.waveStrategyCreate / waveStrategyUpdate 请求体(字段与 module order.wave 文档一致,不做客户端归一化) */
export function buildWaveStrategyMutationPayload(
model: WaveStrategyFormPayloadSource
): Partial<WaveStrategyCreateParams & WaveStrategyUpdateParams> {
const payload: Partial<WaveStrategyCreateParams & WaveStrategyUpdateParams> = {
strategy_name: model.strategy_name.trim(),
strategy_type: model.strategy_type,
batch_mode: model.batch_mode,
status: model.status,
order_min_sku: model.order_min_sku,
order_max_sku: model.order_max_sku,
order_min_qty: model.order_min_qty,
order_max_qty: model.order_max_qty,
min_same_structure: model.min_same_structure,
max_same_structure: model.max_same_structure,
batch_max_orders: model.batch_max_orders,
batch_max_skus: model.batch_max_skus,
group_batch_max_orders: model.group_batch_max_orders,
require_same_express: model.require_same_express,
allow_cross_owner: model.allow_cross_owner,
description: model.description?.trim() || undefined,
wave_prefix: model.wave_prefix?.trim() || undefined
}
if (model.allowed_owners?.length) payload.allowed_owners = model.allowed_owners
if (model.allowed_expresses?.length) payload.allowed_expresses = model.allowed_expresses
if (model.allowed_provinces?.length) payload.allowed_provinces = model.allowed_provinces
if (model.allowed_platforms?.length) payload.allowed_platforms = model.allowed_platforms
Object.keys(payload).forEach((key) => {
const field = key as keyof typeof payload
if (payload[field] === undefined) {
delete payload[field]
}
})
return payload
}
/** 波次策略状态选项 */
@ -764,7 +830,7 @@ export const pickTaskWaveToolbarButtons: ToolbarButtonConfig[] = [
/** 不符合波次策略订单页工具栏按钮 */
export const fallbackOrderToolbarButtons: ToolbarButtonConfig[] = [
{ key: 'search', label: '查询', type: 'primary', size: 'small', loadingKey: 'loading', action: 'loadData' },
{ key: 'reset', label: '重置', size: 'small', action: 'resetFallbackOrderCondition' },
// { key: 'reset', label: '重置', size: 'small', action: 'resetFallbackOrderCondition' },
{ key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' },
{
key: 'quickScan',
@ -776,7 +842,7 @@ export const fallbackOrderToolbarButtons: ToolbarButtonConfig[] = [
},
{
key: 'fetchByIds',
label: '按订单IDs抓取删单',
label: '按订单IDs抓取散单',
type: 'warning',
size: 'small',
loadingKey: 'singleOrderSubmitting',

View File

@ -106,7 +106,7 @@ import { bindReceivingDetails } from '@/api/storage.entry/entry'
import {
getAvailableInboundQuantity,
type AvailableInboundQuantityItem,
} from '@/api/storage_receiving/receiving'
} from '@/api/storage.receiving/receiving'
export type EntryDetailBindRow = {
id?: number