diff --git a/src/api/mes/pro/card/index.ts b/src/api/mes/pro/card/index.ts index 4d7d5a7e6..d3c870113 100644 --- a/src/api/mes/pro/card/index.ts +++ b/src/api/mes/pro/card/index.ts @@ -47,5 +47,10 @@ export const ProCardApi = { // 导出生产流转卡 Excel exportCard: async (params: any) => { return await request.download({ url: `/mes/pro/card/export-excel`, params }) + }, + + // 获取生产流转卡精简列表 + getCardSimpleList: async () => { + return await request.get({ url: `/mes/pro/card/simple-list` }) } } diff --git a/src/api/mes/wm/packages/index.ts b/src/api/mes/wm/packages/index.ts index f0f933200..e964f2e6c 100644 --- a/src/api/mes/wm/packages/index.ts +++ b/src/api/mes/wm/packages/index.ts @@ -76,5 +76,10 @@ export const WmPackageApi = { // 可添加为子箱的装箱单精简列表(无父箱 + 已完成状态,用于选择父箱) getChildablePackageSimpleList: async () => { return await request.get({ url: '/mes/wm/package/childable-simple-list' }) + }, + + // 获取装箱单精简列表 + getPackageSimpleList: async () => { + return await request.get({ url: '/mes/wm/package/simple-list' }) } } diff --git a/src/views/mes/pro/card/components/ProCardSelect.vue b/src/views/mes/pro/card/components/ProCardSelect.vue new file mode 100644 index 000000000..c47cc4957 --- /dev/null +++ b/src/views/mes/pro/card/components/ProCardSelect.vue @@ -0,0 +1,81 @@ + + + + diff --git a/src/views/mes/wm/barcode/BarcodeForm.vue b/src/views/mes/wm/barcode/BarcodeForm.vue index 48211b2d7..0c6c80d1d 100644 --- a/src/views/mes/wm/barcode/BarcodeForm.vue +++ b/src/views/mes/wm/barcode/BarcodeForm.vue @@ -137,7 +137,35 @@ > - + + + + + + + + + + + + + { return } formData.value.bizId = item.id - formData.value.bizCode = item.code || item.username - formData.value.bizName = item.name || item.nickname + // 根据业务类型映射字段 + switch (formData.value.bizType) { + case BarcodeBizTypeEnum.STOCK: + formData.value.bizCode = item.itemCode + formData.value.bizName = item.itemName + break + case BarcodeBizTypeEnum.PACKAGE: + formData.value.bizCode = item.code + formData.value.bizName = item.clientName || item.code + break + case BarcodeBizTypeEnum.BATCH: + formData.value.bizCode = item.code + formData.value.bizName = item.itemName || item.code + break + case BarcodeBizTypeEnum.PROCARD: + formData.value.bizCode = item.code + formData.value.bizName = item.workOrderName || item.code + break + default: + formData.value.bizCode = item.code || item.username + formData.value.bizName = item.name || item.nickname + } // 自动生成条码内容 if (formData.value.bizType && formData.value.bizCode) { diff --git a/src/views/mes/wm/barcode/components/BarcodePackageSelect.vue b/src/views/mes/wm/barcode/components/BarcodePackageSelect.vue new file mode 100644 index 000000000..045fbabc0 --- /dev/null +++ b/src/views/mes/wm/barcode/components/BarcodePackageSelect.vue @@ -0,0 +1,82 @@ + + + + diff --git a/src/views/mes/wm/barcode/config/index.vue b/src/views/mes/wm/barcode/config/index.vue index 4c0d39969..2705ea973 100644 --- a/src/views/mes/wm/barcode/config/index.vue +++ b/src/views/mes/wm/barcode/config/index.vue @@ -80,6 +80,12 @@ prop="contentExample" :show-overflow-tooltip="true" /> +