diff --git a/src/api/mes/wm/arrivalnotice/line/index.ts b/src/api/mes/wm/arrivalnotice/line/index.ts index fdadfb2bc..ef1c5481a 100644 --- a/src/api/mes/wm/arrivalnotice/line/index.ts +++ b/src/api/mes/wm/arrivalnotice/line/index.ts @@ -43,5 +43,12 @@ export const WmArrivalNoticeLineApi = { // 删除到货通知单行 deleteArrivalNoticeLine: async (id: number) => { return await request.delete({ url: '/mes/wm/arrival-notice-line/delete?id=' + id }) + }, + + // 查询到货通知单行列表(按通知单编号) + getArrivalNoticeLineListByNoticeId: async (noticeId: number) => { + return await request.get({ + url: '/mes/wm/arrival-notice-line/list-by-notice-id?noticeId=' + noticeId + }) } } diff --git a/src/api/mes/wm/itemreceipt/index.ts b/src/api/mes/wm/itemreceipt/index.ts index 269df64e5..5430d3a2f 100644 --- a/src/api/mes/wm/itemreceipt/index.ts +++ b/src/api/mes/wm/itemreceipt/index.ts @@ -57,8 +57,8 @@ export const WmItemReceiptApi = { }, // 执行上架 - shelvingItemReceipt: async (id: number) => { - return await request.put({ url: '/mes/wm/item-receipt/shelving?id=' + id }) + stockItemReceipt: async (id: number) => { + return await request.put({ url: '/mes/wm/item-receipt/stock?id=' + id }) }, // 执行入库 diff --git a/src/api/mes/wm/itemreceipt/line/index.ts b/src/api/mes/wm/itemreceipt/line/index.ts index eff3577c7..e75659d1a 100644 --- a/src/api/mes/wm/itemreceipt/line/index.ts +++ b/src/api/mes/wm/itemreceipt/line/index.ts @@ -4,7 +4,7 @@ import request from '@/config/axios' export interface WmItemReceiptLineVO { id: number receiptId: number - noticeLineId: number + arrivalNoticeLineId: number itemId: number itemCode: string itemName: string diff --git a/src/views/mes/wm/arrivalnotice/components/WmArrivalNoticeLineSelect.vue b/src/views/mes/wm/arrivalnotice/components/WmArrivalNoticeLineSelect.vue new file mode 100644 index 000000000..e06bacf4c --- /dev/null +++ b/src/views/mes/wm/arrivalnotice/components/WmArrivalNoticeLineSelect.vue @@ -0,0 +1,99 @@ + + + + diff --git a/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue b/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue index 53d04a042..ab6f1a7c5 100644 --- a/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue +++ b/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue @@ -33,28 +33,6 @@ /> - - - - - - - - - - - - - - - - - - - - + + + + + + + +