From 89b61ba3cd2a10ab1d99668d8399f92884f51cf2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 31 Mar 2026 21:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B5=81=E8=BD=AC=E5=8D=A1=E5=92=8C=E8=A3=85?=
 =?UTF-8?q?=E7=AE=B1=E5=8D=95=E7=B2=BE=E7=AE=80=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增获取生产流转卡和装箱单的精简列表接口，主要用于前端下拉选项选择，提升用户体验。同时，更新条码配置相关逻辑，增加条码配置关联检查，确保数据一致性。
---
 src/api/mes/pro/card/index.ts                 |  5 ++
 src/api/mes/wm/packages/index.ts              |  5 ++
 .../mes/pro/card/components/ProCardSelect.vue | 81 ++++++++++++++++++
 src/views/mes/wm/barcode/BarcodeForm.vue      | 58 ++++++++++++-
 .../components/BarcodePackageSelect.vue       | 82 +++++++++++++++++++
 src/views/mes/wm/barcode/config/index.vue     |  6 ++
 6 files changed, 234 insertions(+), 3 deletions(-)
 create mode 100644 src/views/mes/pro/card/components/ProCardSelect.vue
 create mode 100644 src/views/mes/wm/barcode/components/BarcodePackageSelect.vue

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<ProCardVO[]>({ 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<WmPackageVO[]>({ url: '/mes/wm/package/childable-simple-list' })
+  },
+
+  // 获取装箱单精简列表
+  getPackageSimpleList: async () => {
+    return await request.get<WmPackageVO[]>({ 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 @@
+<!-- MES 流转卡选择器：一次加载全量，前端过滤（支持 code） -->
+<template>
+  <el-select
+    v-model="selectValue"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :clearable="clearable"
+    filterable
+    :filter-method="handleFilter"
+    class="!w-1/1"
+    @change="handleChange"
+  >
+    <el-option v-for="item in filteredList" :key="item.id" :label="item.code" :value="item.id">
+      <div class="flex items-center gap-8px">
+        <span>{{ item.code }}</span>
+        <el-tag v-if="item.workOrderCode" size="small" type="info" class="ml-4px">
+          {{ item.workOrderCode }}
+        </el-tag>
+      </div>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup lang="ts">
+import { ProCardApi, ProCardVO } from '@/api/mes/pro/card'
+
+defineOptions({ name: 'ProCardSelect' })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择流转卡'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [item: ProCardVO | undefined]
+}>()
+
+const allList = ref<ProCardVO[]>([])
+const filteredList = ref<ProCardVO[]>([])
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+/** 前端过滤（code + workOrderCode） */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = allList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = allList.value.filter(
+    (item) =>
+      item.code?.toLowerCase().includes(keyword) ||
+      item.workOrderCode?.toLowerCase().includes(keyword)
+  )
+}
+
+/** 选中变化 */
+const handleChange = (val: number | undefined) => {
+  const item = allList.value.find((o) => o.id === val)
+  emit('change', item)
+}
+
+/** 加载流转卡列表 */
+onMounted(async () => {
+  allList.value = await ProCardApi.getCardSimpleList()
+  filteredList.value = allList.value
+})
+</script>
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 @@
       >
         <TmToolSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
       </el-form-item>
-      <!-- TODO @芋艿：以下业务类型暂无对应的 Select 组件：PACKAGE(装箱单)、STOCK(库存)、BATCH(批次)、PROCARD(流转卡)、TRANSORDER(流转单) -->
+      <el-form-item
+        v-else-if="formData.bizType === BarcodeBizTypeEnum.PACKAGE"
+        label="装箱单"
+        prop="bizId"
+      >
+        <BarcodePackageSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
+      </el-form-item>
+      <el-form-item
+        v-else-if="formData.bizType === BarcodeBizTypeEnum.STOCK"
+        label="库存"
+        prop="bizId"
+      >
+        <WmMaterialStockSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
+      </el-form-item>
+      <el-form-item
+        v-else-if="formData.bizType === BarcodeBizTypeEnum.BATCH"
+        label="批次"
+        prop="bizId"
+      >
+        <WmBatchSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
+      </el-form-item>
+      <el-form-item
+        v-else-if="formData.bizType === BarcodeBizTypeEnum.PROCARD"
+        label="流转卡"
+        prop="bizId"
+      >
+        <ProCardSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
+      </el-form-item>
+      <!-- TODO 流转单（TRANSORDER）后端模块尚未实现，待后续补充 -->
       <el-form-item v-else-if="formData.bizType" label="暂未接入" prop="bizId">
         <el-input-number
           v-model="formData.bizId"
@@ -194,6 +222,10 @@ import MdWorkshopSelect from '@/views/mes/md/workstation/components/MdWorkshopSe
 import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
 import TmToolSelect from '@/views/mes/tm/tool/components/TmToolSelect.vue'
 import UserSelect from '@/views/system/user/components/UserSelect.vue'
+import BarcodePackageSelect from './components/BarcodePackageSelect.vue'
+import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue'
+import WmBatchSelect from '@/views/mes/wm/batch/components/WmBatchSelect.vue'
+import ProCardSelect from '@/views/mes/pro/card/components/ProCardSelect.vue'
 import { WmWarehouseLocationApi } from '@/api/mes/wm/warehouse/location'
 import { WmWarehouseAreaApi } from '@/api/mes/wm/warehouse/area'
 
@@ -240,8 +272,28 @@ const handleBizSelect = async (item: any) => {
     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 @@
+<!-- MES 装箱单选择器（条码用）：一次加载全量，前端过滤（支持 code） -->
+<template>
+  <el-select
+    v-model="selectValue"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :clearable="clearable"
+    filterable
+    :filter-method="handleFilter"
+    class="!w-1/1"
+    @change="handleChange"
+  >
+    <el-option v-for="item in filteredList" :key="item.id" :label="item.code" :value="item.id">
+      <div class="flex items-center gap-8px">
+        <span>{{ item.code }}</span>
+        <el-tag v-if="item.clientName" size="small" type="info" class="ml-4px">
+          {{ item.clientName }}
+        </el-tag>
+      </div>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup lang="ts">
+import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
+
+defineOptions({ name: 'BarcodePackageSelect' })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择装箱单'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [item: WmPackageVO | undefined]
+}>()
+
+const allList = ref<WmPackageVO[]>([])
+const filteredList = ref<WmPackageVO[]>([])
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+/** 前端过滤（code + clientName） */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = allList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = allList.value.filter(
+    (item) =>
+      item.code?.toLowerCase().includes(keyword) ||
+      item.clientName?.toLowerCase().includes(keyword)
+  )
+}
+
+/** 选中变化 */
+const handleChange = (val: number | undefined) => {
+  const item = allList.value.find((o) => o.id === val)
+  emit('change', item)
+}
+
+/** 加载装箱单列表 */
+onMounted(async () => {
+  const data = await WmPackageApi.getPackageSimpleList()
+  allList.value = Array.isArray(data) ? data : []
+  filteredList.value = allList.value
+})
+</script>
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"
       />
+      <el-table-column
+        label="默认打印模板"
+        align="center"
+        prop="defaultTemplate"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="自动生成"
         align="center"