新增配合示方模块，包括主子表结构、控制器、服务及映射器的实现，支持增删改查功能，优化胶料代号生成逻辑及相关字段，增强数据验证和用户体验。

jeecgboot-vue3/src/views/mes/material/MesMaterial.api.ts

@@ -9,11 +9,13 @@ enum Api {
   deleteBatch = '/mes/material/material/deleteBatch',
   importExcel = '/mes/material/material/importExcel',
   exportXls = '/mes/material/material/exportXls',
+  queryById = '/mes/material/material/queryById',
 }
 
 export const getExportUrl = Api.exportXls;
 export const getImportUrl = Api.importExcel;
 export const list = (params) => defHttp.get({ url: Api.list, params });
+export const queryById = (params) => defHttp.get({ url: Api.queryById, params }, { successMessageMode: 'none' });
 
 export const deleteOne = (params, handleSuccess) =>
   defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => handleSuccess());

jeecgboot-vue3/src/views/mes/material/modules/MesMaterialSelectModal.vue

@@ -0,0 +1,90 @@
+<template>
+  <BasicModal v-bind="$attrs" title="选择胶料" :width="960" @register="registerModal" @ok="handleOk">
+    <BasicTable @register="registerTable" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { list as materialList, queryById as queryMaterialById } from '../MesMaterial.api';
+  import { columns as materialColumns, searchFormSchema as materialSearch } from '../MesMaterial.data';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const emit = defineEmits(['register', 'select']);
+  const { createMessage } = useMessage();
+
+  const selectedRow = ref<Recordable | null>(null);
+
+  const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
+    api: materialList,
+    columns: materialColumns.slice(0, 6),
+    rowKey: 'id',
+    useSearchForm: true,
+    formConfig: {
+      labelWidth: 90,
+      schemas: materialSearch,
+    },
+    pagination: { pageSize: 10 },
+    canResize: false,
+    showIndexColumn: false,
+    immediate: true,
+    beforeFetch: (params) => ({
+      ...params,
+      enableFlag: params.enableFlag ?? 1,
+    }),
+    rowSelection: {
+      type: 'radio',
+      columnWidth: 48,
+      onChange: (_keys, rows) => {
+        selectedRow.value = rows?.[0] ?? null;
+      },
+    },
+    clickToRowSelect: true,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    selectedRow.value = null;
+    clearSelectedRowKeys?.();
+    setModalProps({ confirmLoading: false });
+    const materialId = data?.materialId as string | undefined;
+    if (materialId) {
+      setSelectedRowKeys?.([materialId]);
+      try {
+        const raw = await queryMaterialById({ id: materialId });
+        const row = (raw as Recordable)?.materialName != null ? raw : (raw as Recordable)?.result;
+        if (row) {
+          selectedRow.value = row;
+        }
+      } catch {
+        // ignore
+      }
+    }
+    reload();
+  });
+
+  async function handleOk() {
+    const keys = (getSelectRowKeys?.() || []) as string[];
+    let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
+    if (!row && keys.length) {
+      try {
+        const raw = await queryMaterialById({ id: keys[0] });
+        row = (raw as Recordable)?.materialName != null ? raw : (raw as Recordable)?.result;
+      } catch {
+        // ignore
+      }
+    }
+    if (!row?.id) {
+      createMessage.warning('请选择一条胶料信息');
+      return;
+    }
+    emit('select', {
+      materialId: row.id,
+      materialName: row.materialName || '',
+      aliasName: row.aliasName || '',
+      materialCode: row.materialCode || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSelectModal.vue

@@ -85,8 +85,12 @@
     emit('select', {
       mixerMaterialId: row.id,
       materialName: row.materialName || '',
+      materialCode: row.materialCode || '',
       materialDesc: row.materialDesc || '',
       materialKind: buildKind(row),
+      minorCategoryId: row.minorCategoryId || '',
+      majorCategoryText: row.majorCategoryId_dictText || '',
+      minorCategoryText: row.minorCategoryId_dictText || '',
     });
     closeModal();
   }