diff --git a/src/api/mes/wm/batch/index.ts b/src/api/mes/wm/batch/index.ts index c7a0f54d1..d5bdcd941 100644 --- a/src/api/mes/wm/batch/index.ts +++ b/src/api/mes/wm/batch/index.ts @@ -52,5 +52,10 @@ export const BatchApi = { // 向后追溯 getBackwardList: async (code: string) => { return await request.get({ url: `/mes/wm/batch/backward-list`, params: { code } }) + }, + + // 获取批次精简列表(主要用于前端下拉) + getBatchSimpleList: async () => { + return await request.get({ url: `/mes/wm/batch/simple-list` }) } } diff --git a/src/api/mes/wm/returnvendor/detail/index.ts b/src/api/mes/wm/returnvendor/detail/index.ts index de4d7a1b0..a84a13860 100644 --- a/src/api/mes/wm/returnvendor/detail/index.ts +++ b/src/api/mes/wm/returnvendor/detail/index.ts @@ -5,7 +5,7 @@ export interface WmReturnVendorDetailVO { id?: number returnId: number lineId: number - materialStockId: number + materialStockId?: number itemId: number quantity: number batchId?: number diff --git a/src/api/mes/wm/returnvendor/line/index.ts b/src/api/mes/wm/returnvendor/line/index.ts index b8715d2c2..8e7ac688c 100644 --- a/src/api/mes/wm/returnvendor/line/index.ts +++ b/src/api/mes/wm/returnvendor/line/index.ts @@ -11,6 +11,7 @@ export interface WmReturnVendorLineVO { unitMeasureName?: string quantity: number batchId?: number + batchCode?: string remark?: string } diff --git a/src/views/mes/wm/batch/components/WmBatchSelect.vue b/src/views/mes/wm/batch/components/WmBatchSelect.vue new file mode 100644 index 000000000..be8aacaf4 --- /dev/null +++ b/src/views/mes/wm/batch/components/WmBatchSelect.vue @@ -0,0 +1,81 @@ + + + + diff --git a/src/views/mes/wm/returnvendor/ReturnVendorLineList.vue b/src/views/mes/wm/returnvendor/ReturnVendorLineList.vue index 9a2fb2fd2..aa9b05b75 100644 --- a/src/views/mes/wm/returnvendor/ReturnVendorLineList.vue +++ b/src/views/mes/wm/returnvendor/ReturnVendorLineList.vue @@ -32,7 +32,7 @@ - + - + + + + + @@ -120,6 +124,7 @@