From d207e3b82ca9670a67249582d4416db4cc3d5185 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 21 May 2026 13:23:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E4=BC=98=E5=8C=96=20md=20?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97=E7=9A=84=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/mes/md/item/index.vue | 2 -- apps/web-antd/src/views/mes/md/item/modules/form.vue | 2 -- .../src/views/mes/md/item/modules/import-form.vue | 2 -- apps/web-antd/src/views/mes/md/item/type/index.vue | 2 -- apps/web-antd/src/views/mes/md/item/type/modules/form.vue | 2 -- apps/web-antd/src/views/mes/md/workstation/index.vue | 2 -- .../src/views/mes/md/workstation/modules/form.vue | 2 -- apps/web-antd/src/views/mes/utils/constants.ts | 8 ++++++++ apps/web-ele/src/views/mes/md/item/index.vue | 2 -- apps/web-ele/src/views/mes/md/item/modules/form.vue | 2 -- .../web-ele/src/views/mes/md/item/modules/import-form.vue | 2 -- apps/web-ele/src/views/mes/md/item/type/index.vue | 2 -- apps/web-ele/src/views/mes/md/item/type/modules/form.vue | 2 -- apps/web-ele/src/views/mes/md/workstation/index.vue | 2 -- .../web-ele/src/views/mes/md/workstation/modules/form.vue | 2 -- apps/web-ele/src/views/mes/utils/constants.ts | 8 ++++++++ packages/constants/src/dict-enum.ts | 3 +++ 17 files changed, 19 insertions(+), 28 deletions(-) diff --git a/apps/web-antd/src/views/mes/md/item/index.vue b/apps/web-antd/src/views/mes/md/item/index.vue index c1e995f25..da93b46b7 100644 --- a/apps/web-antd/src/views/mes/md/item/index.vue +++ b/apps/web-antd/src/views/mes/md/item/index.vue @@ -27,8 +27,6 @@ import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; import ImportForm from './modules/import-form.vue'; -defineOptions({ name: 'MesMdItem' }); - const selectedItemTypeId = ref(); // 当前选中的物料分类编号 const [FormModal, formModalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/mes/md/item/modules/form.vue b/apps/web-antd/src/views/mes/md/item/modules/form.vue index 193a15b05..e38404bdd 100644 --- a/apps/web-antd/src/views/mes/md/item/modules/form.vue +++ b/apps/web-antd/src/views/mes/md/item/modules/form.vue @@ -21,8 +21,6 @@ import ProductSopForm from './product-sop-form.vue'; type FormMode = 'create' | 'detail' | 'update'; -defineOptions({ name: 'MesMdItemForm' }); - const emit = defineEmits(['success']); const formMode = ref('create'); // 表单模式 const subTabsName = ref('bom'); // 当前子表页签 diff --git a/apps/web-antd/src/views/mes/md/item/modules/import-form.vue b/apps/web-antd/src/views/mes/md/item/modules/import-form.vue index 053b4e4e9..ff4718bd9 100644 --- a/apps/web-antd/src/views/mes/md/item/modules/import-form.vue +++ b/apps/web-antd/src/views/mes/md/item/modules/import-form.vue @@ -14,8 +14,6 @@ import { $t } from '#/locales'; import { useImportFormSchema } from '../data'; -defineOptions({ name: 'MesMdItemImportForm' }); - const emit = defineEmits(['success']); const [Form, formApi] = useVbenForm({ diff --git a/apps/web-antd/src/views/mes/md/item/type/index.vue b/apps/web-antd/src/views/mes/md/item/type/index.vue index 7a2e8d44c..c7f2333b1 100644 --- a/apps/web-antd/src/views/mes/md/item/type/index.vue +++ b/apps/web-antd/src/views/mes/md/item/type/index.vue @@ -15,8 +15,6 @@ import { $t } from '#/locales'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; -defineOptions({ name: 'MesMdItemType' }); - const [FormModal, formModalApi] = useVbenModal({ connectedComponent: Form, destroyOnClose: true, diff --git a/apps/web-antd/src/views/mes/md/item/type/modules/form.vue b/apps/web-antd/src/views/mes/md/item/type/modules/form.vue index 7ea21bbbf..9d59b4646 100644 --- a/apps/web-antd/src/views/mes/md/item/type/modules/form.vue +++ b/apps/web-antd/src/views/mes/md/item/type/modules/form.vue @@ -17,8 +17,6 @@ import { $t } from '#/locales'; import { useFormSchema } from '../data'; -defineOptions({ name: 'MesMdItemTypeForm' }); - const emit = defineEmits(['success']); const formData = ref(); const getTitle = computed(() => { diff --git a/apps/web-antd/src/views/mes/md/workstation/index.vue b/apps/web-antd/src/views/mes/md/workstation/index.vue index 61d70a914..4af64d70d 100644 --- a/apps/web-antd/src/views/mes/md/workstation/index.vue +++ b/apps/web-antd/src/views/mes/md/workstation/index.vue @@ -22,8 +22,6 @@ import { BarcodeDetail } from '#/views/mes/wm/barcode/components'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; -defineOptions({ name: 'MesMdWorkstation' }); - const barcodeDetailRef = ref>(); // 条码详情弹窗 const [FormModal, formModalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue index 94932caf2..b8983ebd3 100644 --- a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue +++ b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue @@ -24,8 +24,6 @@ import WorkerList from './worker-list.vue'; type FormMode = 'create' | 'detail' | 'update'; -defineOptions({ name: 'MesMdWorkstationForm' }); - const emit = defineEmits(['success']); const formMode = ref('create'); // 表单模式 const subTabsName = ref('machine'); // 当前资源页签 diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts index 8bd5047f4..bc7a2a5fe 100644 --- a/apps/web-antd/src/views/mes/utils/constants.ts +++ b/apps/web-antd/src/views/mes/utils/constants.ts @@ -20,6 +20,14 @@ export const MesAutoCodeRuleCode = { MD_WORKSHOP_CODE: 'MD_WORKSHOP_CODE', } as const; +/** MES 编码规则分段类型枚举 */ +export const MesAutoCodePartTypeEnum = { + INPUT: 1, + DATE: 2, + FIX: 3, + SERIAL: 4, +} as const; + /** MES 条码格式枚举 */ export enum BarcodeFormatEnum { QR_CODE = 1, diff --git a/apps/web-ele/src/views/mes/md/item/index.vue b/apps/web-ele/src/views/mes/md/item/index.vue index c6768d390..c20c756d0 100644 --- a/apps/web-ele/src/views/mes/md/item/index.vue +++ b/apps/web-ele/src/views/mes/md/item/index.vue @@ -33,8 +33,6 @@ import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; import ImportForm from './modules/import-form.vue'; -defineOptions({ name: 'MesMdItem' }); - const selectedItemTypeId = ref(); // 当前选中的物料分类编号 const [FormModal, formModalApi] = useVbenModal({ diff --git a/apps/web-ele/src/views/mes/md/item/modules/form.vue b/apps/web-ele/src/views/mes/md/item/modules/form.vue index 5066ece1a..ab2b7692a 100644 --- a/apps/web-ele/src/views/mes/md/item/modules/form.vue +++ b/apps/web-ele/src/views/mes/md/item/modules/form.vue @@ -21,8 +21,6 @@ import ProductSopForm from './product-sop-form.vue'; type FormMode = 'create' | 'detail' | 'update'; -defineOptions({ name: 'MesMdItemForm' }); - const emit = defineEmits(['success']); const formMode = ref('create'); // 表单模式 const subTabsName = ref('bom'); // 当前子表页签 diff --git a/apps/web-ele/src/views/mes/md/item/modules/import-form.vue b/apps/web-ele/src/views/mes/md/item/modules/import-form.vue index 227826dd0..6c0eb7703 100644 --- a/apps/web-ele/src/views/mes/md/item/modules/import-form.vue +++ b/apps/web-ele/src/views/mes/md/item/modules/import-form.vue @@ -12,8 +12,6 @@ import { $t } from '#/locales'; import { useImportFormSchema } from '../data'; -defineOptions({ name: 'MesMdItemImportForm' }); - const emit = defineEmits(['success']); const [Form, formApi] = useVbenForm({ diff --git a/apps/web-ele/src/views/mes/md/item/type/index.vue b/apps/web-ele/src/views/mes/md/item/type/index.vue index 525c8354f..dceaef395 100644 --- a/apps/web-ele/src/views/mes/md/item/type/index.vue +++ b/apps/web-ele/src/views/mes/md/item/type/index.vue @@ -15,8 +15,6 @@ import { $t } from '#/locales'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; -defineOptions({ name: 'MesMdItemType' }); - const [FormModal, formModalApi] = useVbenModal({ connectedComponent: Form, destroyOnClose: true, diff --git a/apps/web-ele/src/views/mes/md/item/type/modules/form.vue b/apps/web-ele/src/views/mes/md/item/type/modules/form.vue index a4e53b91e..580690139 100644 --- a/apps/web-ele/src/views/mes/md/item/type/modules/form.vue +++ b/apps/web-ele/src/views/mes/md/item/type/modules/form.vue @@ -17,8 +17,6 @@ import { $t } from '#/locales'; import { useFormSchema } from '../data'; -defineOptions({ name: 'MesMdItemTypeForm' }); - const emit = defineEmits(['success']); const formData = ref(); const getTitle = computed(() => { diff --git a/apps/web-ele/src/views/mes/md/workstation/index.vue b/apps/web-ele/src/views/mes/md/workstation/index.vue index ccb22173b..4fcaa838b 100644 --- a/apps/web-ele/src/views/mes/md/workstation/index.vue +++ b/apps/web-ele/src/views/mes/md/workstation/index.vue @@ -22,8 +22,6 @@ import { BarcodeDetail } from '#/views/mes/wm/barcode/components'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; -defineOptions({ name: 'MesMdWorkstation' }); - const barcodeDetailRef = ref>(); // 条码详情弹窗 const [FormModal, formModalApi] = useVbenModal({ diff --git a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue index 91dfc18e7..f43deb8a0 100644 --- a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue +++ b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue @@ -24,8 +24,6 @@ import WorkerList from './worker-list.vue'; type FormMode = 'create' | 'detail' | 'update'; -defineOptions({ name: 'MesMdWorkstationForm' }); - const emit = defineEmits(['success']); const formMode = ref('create'); // 表单模式 const subTabsName = ref('machine'); // 当前资源页签 diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts index 8bd5047f4..bc7a2a5fe 100644 --- a/apps/web-ele/src/views/mes/utils/constants.ts +++ b/apps/web-ele/src/views/mes/utils/constants.ts @@ -20,6 +20,14 @@ export const MesAutoCodeRuleCode = { MD_WORKSHOP_CODE: 'MD_WORKSHOP_CODE', } as const; +/** MES 编码规则分段类型枚举 */ +export const MesAutoCodePartTypeEnum = { + INPUT: 1, + DATE: 2, + FIX: 3, + SERIAL: 4, +} as const; + /** MES 条码格式枚举 */ export enum BarcodeFormatEnum { QR_CODE = 1, diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts index 88b575eb2..9beebd898 100644 --- a/packages/constants/src/dict-enum.ts +++ b/packages/constants/src/dict-enum.ts @@ -178,6 +178,9 @@ const IOT_DICT = { /** ========== MES - 制造执行模块 ========== */ const MES_DICT = { MES_MD_ITEM_OR_PRODUCT: 'mes_md_item_or_product', // MES 物料/产品标识 + MES_MD_AUTO_CODE_CYCLE_METHOD: 'mes_md_auto_code_cycle_method', // MES 编码规则循环方式 + MES_MD_AUTO_CODE_PADDED_METHOD: 'mes_md_auto_code_padded_method', // MES 编码规则补齐方式 + MES_MD_AUTO_CODE_PART_TYPE: 'mes_md_auto_code_part_type', // MES 编码规则分段类型 MES_CLIENT_TYPE: 'mes_client_type', // MES 客户类型 MES_VENDOR_LEVEL: 'mes_vendor_level', // MES 供应商级别 MES_WM_BARCODE_BIZ_TYPE: 'mes_wm_barcode_biz_type', // MES 条码业务类型