feat(波次拣货): 拣货中任务列表新增「车编码」查询条件(where.cart_code,默认模糊匹配)
This commit is contained in:
parent
7219f2eda4
commit
1b4107c437
@ -31,7 +31,7 @@ export type WavePickTaskListParams = {
|
||||
keyword?: string
|
||||
start_time_start?: string
|
||||
start_time_end?: string
|
||||
/** 人员名称(operator_name 操作人/pick_user_name/review_user_name/claim_operator)与关联波次号 wave_no 通过 where 传 { operator, value },由后端按 operator 处理(默认模糊 like) */
|
||||
/** 人员名称(operator_name 操作人/pick_user_name/review_user_name/claim_operator)、关联波次号 wave_no、车编码 cart_code 通过 where 传 { operator, value },由后端按 operator 处理(默认模糊 like) */
|
||||
where?: Record<string, any>
|
||||
strategy_id?: number
|
||||
/** 后端排序:sortField 取列 prop(如 order_count),结构对齐 stock.warehouse.list */
|
||||
|
||||
@ -841,6 +841,7 @@ async function loadData() {
|
||||
const claimOperatorNameOp = resolveScanConditionOperator(rawConditions, 'claim_operator')
|
||||
const reviewUserNameOp = resolveScanConditionOperator(rawConditions, 'review_user_name')
|
||||
const waveNoOp = resolveScanConditionOperator(rawConditions, 'wave_no')
|
||||
const cartCodeOp = resolveScanConditionOperator(rawConditions, 'cart_code')
|
||||
/** 人员名称筛选:操作人 / 拣货人 / 领料人 / 复核人;操作符交由后端处理;contains/in/notin 的 value 与全站列表页一致以数组下发(单值也包成数组),其余为字符串 */
|
||||
const operatorName = toWhereTextValue(resolveScanFilterValue(flat, ['operator_name', 'creator_name', 'creator'], rawConditions), operatorNameOp)
|
||||
const pickUserName = toWhereTextValue(resolveScanFilterValue(flat, ['pick_user_name', 'picker_name'], rawConditions), pickUserNameOp)
|
||||
@ -848,6 +849,8 @@ async function loadData() {
|
||||
const reviewUserName = toWhereTextValue(resolveScanFilterValue(flat, ['review_user_name', 'recheck_user_name'], rawConditions), reviewUserNameOp)
|
||||
/** 波次号:固定仅模糊查询(like),value 为字符串 */
|
||||
const waveNo = toWhereTextValue(resolveScanFilterValue(flat, ['wave_no'], rawConditions), waveNoOp)
|
||||
/** 车编码(cart_code):默认模糊 like,操作符交由后端处理 */
|
||||
const cartCode = toWhereTextValue(resolveScanFilterValue(flat, ['cart_code'], rawConditions), cartCodeOp)
|
||||
const sort: WaveListRpcSort | undefined = currentSort.prop
|
||||
? {
|
||||
sortField: currentSort.prop,
|
||||
@ -870,7 +873,7 @@ async function loadData() {
|
||||
keyword: String(flat.keyword || '').trim() || undefined,
|
||||
start_time_start: startRange[0] || undefined,
|
||||
start_time_end: startRange[1] || undefined,
|
||||
// 人员名称(操作人/拣货人/领料人/复核人)与关联波次号仅通过 where 传 { operator, value },由后端按 operator 决定匹配语义(默认模糊 like)
|
||||
// 人员名称(操作人/拣货人/领料人/复核人)、关联波次号与车编码仅通过 where 传 { operator, value },由后端按 operator 决定匹配语义(默认模糊 like)
|
||||
where: {
|
||||
pick_user_id: pickUserId,
|
||||
review_user_id: reviewUserId,
|
||||
@ -879,7 +882,8 @@ async function loadData() {
|
||||
pick_user_name: pickUserName ? { operator: pickUserNameOp, value: pickUserName } : undefined,
|
||||
review_user_name: reviewUserName ? { operator: reviewUserNameOp, value: reviewUserName } : undefined,
|
||||
claim_operator: claimOperatorName ? { operator: claimOperatorNameOp, value: claimOperatorName } : undefined,
|
||||
wave_no: waveNo ? { operator: waveNoOp, value: waveNo } : undefined
|
||||
wave_no: waveNo ? { operator: waveNoOp, value: waveNo } : undefined,
|
||||
cart_code: cartCode ? { operator: cartCodeOp, value: cartCode } : undefined
|
||||
},
|
||||
sort
|
||||
})
|
||||
|
||||
@ -1055,6 +1055,8 @@ export const pickTaskWaveAvailableFields = [
|
||||
pickTaskScanBasicField({ label: '任务编号', value: 'task_no', type: 'text' }),
|
||||
// 波次号:固定仅模糊查询(like,隐藏操作符下拉)
|
||||
pickTaskScanBasicField({ label: '波次号', value: 'wave_no', type: 'text', hideOperator: true, operators: ['like'], defaultOperator: 'like' }),
|
||||
// 车编码(拣货车编码 cart_code):默认模糊查询,可切换等于/包含/模糊排除
|
||||
pickTaskScanBasicField({ label: '车编码', value: 'cart_code', type: 'text', operators: ['like', 'contains', 'eq', 'notlike'], defaultOperator: 'like' }),
|
||||
// 人员名字按模糊/包含搜索:左侧操作符下拉可选「模糊匹配/包含/模糊排除」,默认「模糊匹配」
|
||||
pickTaskScanBasicField({ label: '操作人', value: 'operator_name', type: 'text', operators: ['like', 'contains', 'notlike'], defaultOperator: 'like' }),
|
||||
pickTaskScanBasicField({ label: '拣货人', value: 'pick_user_name', type: 'text', operators: ['like', 'contains', 'notlike'], defaultOperator: 'like' }),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user