增强原材料卡片管理功能，新增免密接口和数据处理逻辑，支持原材料卡片的增删改查操作。更新前端视图以支持多行拆码明细拼接，优化用户体验和系统实时数据同步能力。

2026-05-11 14:32:44 +08:00
parent 936375bb2c
commit cffe32d896
49 changed files with 4594 additions and 390 deletions
--- a/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/MesXslRawMaterialCard.api.ts
+++ b/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/MesXslRawMaterialCard.api.ts
@@ -0,0 +1,49 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/xslmes/mesXslRawMaterialCard/list',
+  save = '/xslmes/mesXslRawMaterialCard/add',
+  edit = '/xslmes/mesXslRawMaterialCard/edit',
+  deleteOne = '/xslmes/mesXslRawMaterialCard/delete',
+  deleteBatch = '/xslmes/mesXslRawMaterialCard/deleteBatch',
+  importExcel = '/xslmes/mesXslRawMaterialCard/importExcel',
+  exportXls = '/xslmes/mesXslRawMaterialCard/exportXls',
+  updatePriority = '/xslmes/mesXslRawMaterialCard/updatePriority',
+}
+
+export const getExportUrl = Api.exportXls;
+export const getImportUrl = Api.importExcel;
+
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+export const deleteOne = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
+
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params });
+};
+
+export const updatePriority = (id: string, priorityPickup: string) =>
+  defHttp.put({ url: Api.updatePriority, params: { id, priorityPickup } }, { joinParamsToUrl: true });
--- a/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/MesXslRawMaterialCard.data.ts
+++ b/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/MesXslRawMaterialCard.data.ts
@@ -0,0 +1,304 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { render } from '/@/utils/common/renderUtils';
+
+export const columns: BasicColumn[] = [
+  {
+    title: '条码',
+    align: 'center',
+    dataIndex: 'barcode',
+    width: 160,
+  },
+  {
+    title: '批次号',
+    align: 'center',
+    dataIndex: 'batchNo',
+    width: 160,
+  },
+  {
+    title: '入场日期',
+    align: 'center',
+    dataIndex: 'entryDate',
+    width: 110,
+    customRender: ({ text }) => {
+      return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
+    },
+  },
+  {
+    title: '物料名称',
+    align: 'center',
+    dataIndex: 'materialName',
+    width: 160,
+  },
+  {
+    title: '供应商名称',
+    align: 'center',
+    dataIndex: 'supplierName',
+    width: 150,
+  },
+  {
+    title: '厂家物料名称',
+    align: 'center',
+    dataIndex: 'manufacturerMaterialName',
+    width: 150,
+  },
+  {
+    title: '保质期',
+    align: 'center',
+    dataIndex: 'shelfLife',
+    width: 110,
+  },
+  {
+    title: '总重',
+    align: 'center',
+    dataIndex: 'totalWeight',
+    width: 90,
+  },
+  {
+    title: '剩余重量',
+    align: 'center',
+    dataIndex: 'remainingWeight',
+    width: 90,
+  },
+  {
+    title: '剩余数量',
+    align: 'center',
+    dataIndex: 'remainingQuantity',
+    width: 90,
+  },
+  {
+    title: '状态',
+    align: 'center',
+    dataIndex: 'status_dictText',
+    width: 80,
+  },
+  {
+    title: '检测结果',
+    align: 'center',
+    dataIndex: 'testResult_dictText',
+    width: 90,
+  },
+  {
+    title: '库区',
+    align: 'center',
+    dataIndex: 'warehouseArea',
+    width: 100,
+  },
+  {
+    title: '卸货人',
+    align: 'center',
+    dataIndex: 'unloadOperator',
+    width: 90,
+  },
+  {
+    title: '优先出库',
+    align: 'center',
+    dataIndex: 'priorityPickup',
+    width: 90,
+    customRender: ({ text }) => {
+      return render.renderSwitch(text, [{ text: '是', value: '1' }, { text: '否', value: '0' }]);
+    },
+  },
+  {
+    title: '创建时间',
+    align: 'center',
+    dataIndex: 'createTime',
+    width: 160,
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '条码',
+    field: 'barcode',
+    component: 'JInput',
+    colProps: { span: 6 },
+  },
+  {
+    label: '批次号',
+    field: 'batchNo',
+    component: 'JInput',
+    colProps: { span: 6 },
+  },
+  {
+    label: '物料名称',
+    field: 'materialName',
+    component: 'JInput',
+    colProps: { span: 6 },
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    component: 'JInput',
+    colProps: { span: 6 },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_card_status' },
+    colProps: { span: 6 },
+  },
+  {
+    label: '检测结果',
+    field: 'testResult',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_test_result' },
+    colProps: { span: 6 },
+  },
+  {
+    label: '入场日期',
+    field: 'entryDate',
+    component: 'RangePicker',
+    componentProps: { showTime: false, valueFormat: 'YYYY-MM-DD' },
+    colProps: { span: 8 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '条码',
+    field: 'barcode',
+    component: 'Input',
+    componentProps: { placeholder: '请输入条码' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '批次号',
+    field: 'batchNo',
+    component: 'Input',
+    componentProps: { placeholder: '请输入批次号' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '入场日期',
+    field: 'entryDate',
+    component: 'DatePicker',
+    componentProps: { showTime: false, valueFormat: 'YYYY-MM-DD', placeholder: '请选择入场日期' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '物料ID',
+    field: 'materialId',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '物料名称',
+    field: 'materialName',
+    component: 'Input',
+    componentProps: { placeholder: '请输入物料名称' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '物料描述',
+    field: 'materialDesc',
+    component: 'InputTextArea',
+    componentProps: { placeholder: '请输入物料描述', rows: 2 },
+    colProps: { span: 24 },
+  },
+  {
+    label: '供应商ID',
+    field: 'supplierId',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    component: 'Input',
+    componentProps: { placeholder: '请输入供应商名称' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '厂家物料名称',
+    field: 'manufacturerMaterialName',
+    component: 'Input',
+    componentProps: { placeholder: '请输入厂家物料名称' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '保质期',
+    field: 'shelfLife',
+    component: 'Input',
+    componentProps: { placeholder: '请输入保质期' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '总重',
+    field: 'totalWeight',
+    component: 'InputNumber',
+    componentProps: { placeholder: '请输入总重', precision: 3 },
+    colProps: { span: 12 },
+  },
+  {
+    label: '剩余重量',
+    field: 'remainingWeight',
+    component: 'InputNumber',
+    componentProps: { placeholder: '请输入剩余重量', precision: 3 },
+    colProps: { span: 12 },
+  },
+  {
+    label: '剩余数量',
+    field: 'remainingQuantity',
+    component: 'InputNumber',
+    componentProps: { placeholder: '请输入剩余数量' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_card_status', placeholder: '请选择状态' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '检测结果',
+    field: 'testResult',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_test_result', placeholder: '请选择检测结果' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '库区',
+    field: 'warehouseArea',
+    component: 'Input',
+    componentProps: { placeholder: '请输入库区' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '卸货人',
+    field: 'unloadOperator',
+    component: 'Input',
+    componentProps: { placeholder: '请输入卸货人' },
+    colProps: { span: 12 },
+  },
+  {
+    label: '优先出库',
+    field: 'priorityPickup',
+    component: 'JSwitch',
+    componentProps: { options: ['1', '0'] },
+    colProps: { span: 12 },
+  },
+];
+
+export const superQuerySchema = {
+  barcode: { title: '条码', order: 0, view: 'text' },
+  batchNo: { title: '批次号', order: 1, view: 'text' },
+  entryDate: { title: '入场日期', order: 2, view: 'date' },
+  materialName: { title: '物料名称', order: 3, view: 'text' },
+  supplierName: { title: '供应商名称', order: 4, view: 'text' },
+  totalWeight: { title: '总重', order: 5, view: 'number' },
+  remainingWeight: { title: '剩余重量', order: 6, view: 'number' },
+  remainingQuantity: { title: '剩余数量', order: 7, view: 'number' },
+  status: { title: '状态', order: 8, view: 'list', dictCode: 'xslmes_card_status' },
+  testResult: { title: '检测结果', order: 9, view: 'list', dictCode: 'xslmes_test_result' },
+  warehouseArea: { title: '库区', order: 10, view: 'text' },
+  createTime: { title: '创建时间', order: 11, view: 'datetime' },
+};
--- a/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/MesXslRawMaterialCardList.vue
+++ b/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/MesXslRawMaterialCardList.vue
@@ -0,0 +1,172 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'xslmes:mes_xsl_raw_material_card:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'xslmes:mes_xsl_raw_material_card:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" v-auth="'xslmes:mes_xsl_raw_material_card:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined" />
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'xslmes:mes_xsl_raw_material_card:deleteBatch'">批量操作
+            <Icon icon="mdi:chevron-down" />
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record }">
+        <!-- 优先出库：列表直接切换 -->
+        <template v-if="column.dataIndex === 'priorityPickup'">
+          <a-switch
+            :checked="record.priorityPickup === '1'"
+            checked-children="是"
+            un-checked-children="否"
+            @change="(checked) => handlePriorityChange(record, checked)"
+          />
+        </template>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <MesXslRawMaterialCardModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslRawMaterialCard" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import MesXslRawMaterialCardModal from './components/MesXslRawMaterialCardModal.vue';
+  import { columns, searchFormSchema, superQuerySchema } from './MesXslRawMaterialCard.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, updatePriority } from './MesXslRawMaterialCard.api';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const [registerModal, { openModal }] = useModal();
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '原材料卡片',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+        fieldMapToTime: [
+          ['entryDate', ['entryDate_begin', 'entryDate_end'], 'YYYY-MM-DD'],
+        ],
+      },
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '原材料卡片',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+  const superQueryConfig = reactive(superQuerySchema);
+
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+  function handleAdd() {
+    openModal(true, { isUpdate: false, showFooter: true });
+  }
+
+  function handleEdit(record: Recordable) {
+    openModal(true, { record, isUpdate: true, showFooter: true });
+  }
+
+  function handleDetail(record: Recordable) {
+    openModal(true, { record, isUpdate: true, showFooter: false });
+  }
+
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  async function handlePriorityChange(record, checked: boolean) {
+    try {
+      await updatePriority(record.id, checked ? '1' : '0');
+      record.priorityPickup = checked ? '1' : '0';
+      createMessage.success('优先出库设置已更新');
+    } catch {
+      createMessage.error('更新失败，请重试');
+    }
+  }
+
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+        auth: 'xslmes:mes_xsl_raw_material_card:edit',
+      },
+    ];
+  }
+
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        auth: 'xslmes:mes_xsl_raw_material_card:delete',
+      },
+    ];
+  }
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-picker-range) {
+    width: 100%;
+  }
+</style>
--- a/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/components/MesXslRawMaterialCardModal.vue
+++ b/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/components/MesXslRawMaterialCardModal.vue
@@ -0,0 +1,66 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="1000" @ok="handleSubmit">
+    <BasicForm @register="registerForm" name="MesXslRawMaterialCardForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from '../MesXslRawMaterialCard.data';
+  import { saveOrUpdate } from '../MesXslRawMaterialCard.api';
+
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerForm, { setProps, resetFields, setFieldsValue, validate, scrollToField }] = useForm({
+    labelWidth: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+    baseColProps: { span: 12 },
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: !!data?.showFooter, showOkBtn: !!data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !!data?.showFooter;
+    if (unref(isUpdate)) {
+      await setFieldsValue({ ...data.record });
+    }
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
+
+  async function handleSubmit(v) {
+    try {
+      let values = await validate();
+      setModalProps({ confirmLoading: true });
+      await saveOrUpdate(values, isUpdate.value);
+      closeModal();
+      emit('success');
+    } catch ({ errorFields }: any) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>
--- a/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialEntry/MesXslRawMaterialEntry.data.ts
+++ b/jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialEntry/MesXslRawMaterialEntry.data.ts
@@ -156,22 +156,23 @@ export const formSchema: FormSchema[] = [
    componentProps: { min: 0, precision: 2, placeholder: '请输入总重', style: { width: '100%' } },
  },
  {
+    // 字段升级为字符串类型，支持桌面端拆码明细多行拼接（如 20/1/）
    label: '总份数',
    field: 'totalPortions',
-    component: 'InputNumber',
-    componentProps: { min: 0, placeholder: '请输入总份数', style: { width: '100%' } },
+    component: 'Input',
+    componentProps: { placeholder: '请输入总份数（多行明细用 / 拼接）', style: { width: '100%' } },
  },
  {
    label: '每份总重(KG)',
    field: 'portionWeight',
-    component: 'InputNumber',
-    componentProps: { min: 0, precision: 2, placeholder: '请输入每份总重', style: { width: '100%' } },
+    component: 'Input',
+    componentProps: { placeholder: '请输入每份总重（多行明细用 / 拼接）', style: { width: '100%' } },
  },
  {
    label: '每份包数',
    field: 'portionPackages',
-    component: 'InputNumber',
-    componentProps: { min: 0, placeholder: '请输入每份包数', style: { width: '100%' } },
+    component: 'Input',
+    componentProps: { placeholder: '请输入每份包数（多行明细用 / 拼接）', style: { width: '100%' } },
  },
  {
    label: '检测结果',