From bae93b624d8d68ed2fe540c381a58b47082c1309 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 16:28:28 +0800
Subject: [PATCH] feat(mes): 完善工艺路线管理功能
---
src/api/mes/pro/route/process/index.ts | 21
src/api/mes/pro/workorder/process/index.ts | 10
src/views/mes/pro/route/modules/product-list.vue | 13
src/views/mes/pro/route/modules/route-configurator.vue | 425 +++++++++++++
src/views/mes/pro/route/data.ts | 144 ++++
src/views/mes/pro/route/modules/material-input-list.vue | 145 ++++
src/views/mes/pro/workorder/modules/process-list.vue | 6
src/views/mes/process-design/route/modules/product-form.vue | 107 --
src/components/import-modal/index.ts | 1
src/views/mes/process-design/route/modules/form.vue | 146 ----
src/views/mes/pro/route/modules/product-bom-list.vue | 28
src/views/mes/process-design/route/data.ts | 66 -
src/views/mes/pro/route/components/index.ts | 1
src/views/mes/pro/workorder/modules/process-form.vue | 177 ++++
src/components/import-modal/import-modal.vue | 145 ++++
src/views/mes/pro/route/modules/process-form.vue | 35
src/api/mes/pro/route/index.ts | 23
src/views/mes/pro/workorder/data.ts | 11
src/views/mes/pro/route/index.vue | 42 +
src/views/mes/md/item/components/select-dialog.vue | 36
src/views/mes/pro/route/components/output-attribution.vue | 135 ++++
src/views/mes/pro/route/modules/product-form.vue | 31
src/api/mes/pro/route/product/index.ts | 6
src/views/mes/process-design/route/index.vue | 66 ++
src/views/mes/pro/route/modules/process-list.vue | 26
src/views/mes/process-design/route/modules/process-form.vue | 2
26 files changed, 1,491 insertions(+), 357 deletions(-)
diff --git a/src/api/mes/pro/route/index.ts b/src/api/mes/pro/route/index.ts
index 0f04585..76a3f8d 100644
--- a/src/api/mes/pro/route/index.ts
+++ b/src/api/mes/pro/route/index.ts
@@ -61,3 +61,26 @@
export function exportRoute(params: any) {
return requestClient.download('/mes/pro/route/export-excel', { params });
}
+
+/** 涓嬭浇宸ヨ壓璺嚎瀵煎叆妯℃澘 */
+export function importRouteTemplate() {
+ return requestClient.download('/mes/pro/route/get-import-template');
+}
+
+/** 瀵煎叆宸ヨ壓璺嚎 */
+export function importRoute(file: File, updateSupport: boolean) {
+ return requestClient.upload(
+ `/mes/pro/route/import?updateSupport=${updateSupport}`,
+ { file },
+ );
+}
+
+/** 涓嬭浇鍖呭惈璺嚎銆佷骇鍝併�佸伐搴忋�佸伐搴忎骇鍑恒�佸伐搴忔姇鏂欎簲寮犲伐浣滆〃鐨勬ā鏉� */
+export function importCompleteRouteTemplate() {
+ return requestClient.download('/mes/pro/route/get-complete-import-template');
+}
+
+/** 鎵归噺瀵煎叆瀹屾暣宸ヨ壓璺嚎 */
+export function importCompleteRoute(file: File) {
+ return requestClient.upload('/mes/pro/route/import-complete', { file });
+}
diff --git a/src/api/mes/pro/route/process/index.ts b/src/api/mes/pro/route/process/index.ts
index 332f71a..d964e27 100644
--- a/src/api/mes/pro/route/process/index.ts
+++ b/src/api/mes/pro/route/process/index.ts
@@ -10,13 +10,25 @@
remark?: string;
}
+ /** 浜у嚭鐗╂枡褰掑睘 */
+ export interface OutputItem {
+ id?: number;
+ routeProcessId?: number;
+ productId?: number; // 褰掑睘浜у搧缂栧彿锛屼负绌鸿〃绀哄浜у搧閫氱敤
+ productName?: string;
+ itemId?: number;
+ itemCode?: string;
+ itemName?: string;
+ sort?: number;
+ remark?: string;
+ }
+
/** MES 宸ヨ壓璺嚎宸ュ簭 */
export interface RouteProcess {
id?: number;
routeId?: number;
processId?: number;
paramTemplateId?: number;
- /** 宸ュ簭鏀剁巼锛堜骇鍑�/鎶曞叆锛�0~1锛� */
yieldRate?: number;
processCode?: string;
processName?: string;
@@ -35,6 +47,13 @@
outputItemName?: string;
outputItemIds?: number[];
outputItemNames?: string;
+ outputs?: OutputItem[]; // 浜у嚭鐗╂枡褰掑睘閰嶇疆
+ warehouseId?: number; // 榛樿鎶ュ伐浠撳簱缂栧彿
+ warehouseName?: string; // 榛樿鎶ュ伐浠撳簱鍚嶇О
+ locationId?: number; // 榛樿鎶ュ伐搴撳尯缂栧彿
+ locationName?: string; // 榛樿鎶ュ伐搴撳尯鍚嶇О
+ areaId?: number; // 榛樿鎶ュ伐搴撲綅缂栧彿
+ areaName?: string; // 榛樿鎶ュ伐搴撲綅鍚嶇О
remark?: string;
bomItems?: ProcessBomItem[];
createTime?: Date;
diff --git a/src/api/mes/pro/route/product/index.ts b/src/api/mes/pro/route/product/index.ts
index 2312f68..6dd7f3d 100644
--- a/src/api/mes/pro/route/product/index.ts
+++ b/src/api/mes/pro/route/product/index.ts
@@ -8,6 +8,12 @@
itemId?: number;
itemCode?: string;
itemName?: string;
+ warehouseId?: number;
+ warehouseName?: string;
+ locationId?: number;
+ locationName?: string;
+ areaId?: number;
+ areaName?: string;
specification?: string;
unitName?: string;
quantity?: number;
diff --git a/src/api/mes/pro/workorder/process/index.ts b/src/api/mes/pro/workorder/process/index.ts
index e49e863..9d22c7c 100644
--- a/src/api/mes/pro/workorder/process/index.ts
+++ b/src/api/mes/pro/workorder/process/index.ts
@@ -1,5 +1,3 @@
-import type { MesProWorkOrderProcessApi } from './index';
-
import { requestClient } from '#/api/request';
export namespace MesProWorkOrderProcessApi {
@@ -35,6 +33,12 @@
outputItemName?: string; // 浜у嚭浜у搧鐗╂枡鍚嶇О锛堢涓�涓級
outputItemIds?: number[]; // 浜у嚭浜у搧鐗╂枡缂栧彿鍒楄〃
outputItemNames?: string; // 浜у嚭浜у搧鐗╂枡鍚嶇О锛堥�楀彿鎷兼帴锛�
+ warehouseId?: number; // 鎶ュ伐浠撳簱缂栧彿
+ warehouseName?: string; // 鎶ュ伐浠撳簱鍚嶇О
+ locationId?: number; // 鎶ュ伐搴撳尯缂栧彿
+ locationName?: string; // 鎶ュ伐搴撳尯鍚嶇О
+ areaId?: number; // 鎶ュ伐搴撲綅缂栧彿
+ areaName?: string; // 鎶ュ伐搴撲綅鍚嶇О
bomItems?: ProcessBomItem[]; // 宸ュ簭鎶曟枡BOM鏄庣粏
remark?: string; // 澶囨敞
}
@@ -79,4 +83,4 @@
/** 鍒犻櫎宸ュ崟宸ュ簭 */
export function deleteWorkOrderProcess(id: number) {
return requestClient.delete(`/mes/pro/work-order-process/delete?id=${id}`);
-}
\ No newline at end of file
+}
diff --git a/src/components/import-modal/import-modal.vue b/src/components/import-modal/import-modal.vue
new file mode 100644
index 0000000..170d80e
--- /dev/null
+++ b/src/components/import-modal/import-modal.vue
@@ -0,0 +1,145 @@
+<script lang="ts" setup>
+import type { FileType } from 'ant-design-vue/es/upload/interface';
+import type { VbenFormSchema } from '#/adapter/form';
+
+import { h, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message, Modal as AntModal, Upload } from 'ant-design-vue';
+
+import { useVbenForm, z } from '#/adapter/form';
+import { $t } from '#/locales';
+
+export interface ImportModalProps {
+ /** 寮圭獥鏍囬锛屽銆屽鍏ョ敤鎴枫�� */
+ title: string;
+ /** 涓嬭浇鐨勬ā鏉挎枃浠跺悕锛屽銆岀敤鎴峰鍏ユā鏉�.xls銆� */
+ fileName: string;
+ /** 鎵ц瀵煎叆鐨勬帴鍙e嚱鏁� (file, updateSupport) => Promise */
+ importFn: (file: File, updateSupport: boolean) => Promise<unknown>;
+ /** 涓嬭浇妯℃澘鐨勬帴鍙e嚱鏁� () => Promise(blob) */
+ templateFn: () => Promise<BlobPart>;
+ /** 瀹屾暣璺嚎鍙敮鎸佹柊澧烇紝涓嶅睍绀鸿鐩栧紑鍏� */
+ showUpdateSupport?: boolean;
+}
+
+const emit = defineEmits(['success']);
+
+const config = ref<ImportModalProps>({
+ title: '',
+ fileName: '',
+ importFn: async () => {},
+ templateFn: () => Promise.resolve(new Blob()),
+});
+
+function createSchema(showUpdateSupport = true): VbenFormSchema[] {
+ return [
+ {
+ fieldName: 'file',
+ label: '鏁版嵁鏂囦欢',
+ component: 'Upload' as const,
+ rules: 'required',
+ help: '浠呭厑璁稿鍏� xls銆亁lsx 鏍煎紡鏂囦欢',
+ },
+ ...(showUpdateSupport ? [{
+ fieldName: 'updateSupport',
+ label: '鏄惁瑕嗙洊',
+ component: 'Switch' as const,
+ componentProps: {
+ checkedChildren: '鏄�',
+ unCheckedChildren: '鍚�',
+ },
+ rules: z.boolean().default(false),
+ help: '鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�',
+ }] : []),
+ ];
+}
+
+const [Form, formApi] = useVbenForm({
+ commonConfig: {
+ formItemClass: 'col-span-2',
+ labelWidth: 120,
+ },
+ layout: 'horizontal',
+ schema: createSchema(),
+ showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+ async onOpenChange(isOpen: boolean) {
+ if (isOpen) {
+ config.value = modalApi.getData<ImportModalProps>() ?? config.value;
+ await formApi.updateSchema(createSchema(config.value.showUpdateSupport !== false));
+ await formApi.resetForm();
+ }
+ },
+ async onConfirm() {
+ const { valid } = await formApi.validate();
+ if (!valid) {
+ return;
+ }
+ modalApi.lock();
+ // 鎻愪氦琛ㄥ崟
+ const data = await formApi.getValues();
+ try {
+ const result = await config.value.importFn(data.file, data.updateSupport ?? false) as {
+ createCodes?: string[];
+ updateCodes?: string[];
+ failureCodes?: Record<string, string>;
+ } | undefined;
+ // 鍏抽棴骞舵彁绀�
+ await modalApi.close();
+ emit('success');
+ const failures = Object.entries(result?.failureCodes ?? {});
+ if (failures.length > 0) {
+ AntModal.warning({
+ title: `瀵煎叆瀹屾垚锛氭垚鍔� ${(result?.createCodes?.length ?? 0) + (result?.updateCodes?.length ?? 0)} 鏉★紝澶辫触 ${failures.length} 鏉,
+ content: h('div', { style: { whiteSpace: 'pre-wrap', maxHeight: '50vh', overflowY: 'auto' } },
+ failures.map(([code, reason]) => `${code}锛�${reason}`).join('\n')),
+ });
+ } else {
+ message.success($t('ui.actionMessage.operationSuccess'));
+ }
+ } finally {
+ modalApi.unlock();
+ }
+ },
+});
+
+/** 涓婁紶鍓� */
+function beforeUpload(file: FileType) {
+ formApi.setFieldValue('file', file);
+ return false;
+}
+
+/** 涓嬭浇妯$増 */
+async function handleDownload() {
+ const data = await config.value.templateFn();
+ downloadFileFromBlobPart({ fileName: config.value.fileName, source: data });
+}
+</script>
+
+<template>
+ <Modal :title="config.title" class="w-1/3">
+ <Form class="mx-4">
+ <template #file>
+ <div class="w-full">
+ <Upload
+ :max-count="1"
+ accept=".xls,.xlsx"
+ :before-upload="beforeUpload"
+ >
+ <Button type="primary"> 閫夋嫨 Excel 鏂囦欢 </Button>
+ </Upload>
+ </div>
+ </template>
+ </Form>
+ <template #prepend-footer>
+ <div class="flex flex-auto items-center">
+ <Button @click="handleDownload"> 涓嬭浇瀵煎叆妯℃澘 </Button>
+ </div>
+ </template>
+ </Modal>
+</template>
diff --git a/src/components/import-modal/index.ts b/src/components/import-modal/index.ts
new file mode 100644
index 0000000..d2bfb9c
--- /dev/null
+++ b/src/components/import-modal/index.ts
@@ -0,0 +1 @@
+export { default } from './import-modal.vue';
diff --git a/src/views/mes/md/item/components/select-dialog.vue b/src/views/mes/md/item/components/select-dialog.vue
index 61f3fd1..9f90787 100644
--- a/src/views/mes/md/item/components/select-dialog.vue
+++ b/src/views/mes/md/item/components/select-dialog.vue
@@ -3,11 +3,11 @@
import type { MesMdItemApi } from "#/api/mes/md/item";
import type { MesMdItemTypeApi } from "#/api/mes/md/item/type";
- import { nextTick, ref } from "vue";
+ import { computed, nextTick, ref } from "vue";
import { CommonStatusEnum } from "@vben/constants";
- import { Card, message, Modal } from "ant-design-vue";
+ import { Alert, Card, message, Modal, Tag } from "ant-design-vue";
import { useVbenVxeGrid } from "#/adapter/vxe-table";
import { getItemPage } from "#/api/mes/md/item";
@@ -27,6 +27,9 @@
const selectedItemTypeId = ref<number>(); // 褰撳墠绛涢�夊垎绫荤紪鍙�
const preSelectedIds = ref<number[]>([]); // 棰勯�夌墿鏂欑紪鍙峰垪琛�
const productIds = ref<number[]>([]); // 闄愬畾鍙�夌殑鐗╂枡缂栧彿鍒楄〃锛堜负绌哄垯涓嶉檺鍒讹級
+ const limitedToProducts = computed(() => productIds.value.length > 0);
+ const dialogTitle = computed(() => limitedToProducts.value ? "璺嚎浜у嚭閫夋嫨" : "鐗╂枡浜у搧閫夋嫨");
+ const tableTitle = computed(() => limitedToProducts.value ? "宸查厤缃殑浜у嚭浜у搧" : "鐗╂枡浜у搧鍒楄〃");
const typeTreeRef = ref<InstanceType<typeof MdItemTypeTree>>(); // 鐗╂枡鍒嗙被鏍�
/** 鑾峰彇褰撳墠琛ㄦ牸鏁版嵁 */
@@ -161,7 +164,7 @@
},
gridOptions: {
columns: useItemSelectGridColumns(true),
- height: 560,
+ height: '100%',
keepSource: true,
checkboxConfig: {
highlight: true,
@@ -265,18 +268,29 @@
<template>
<Modal v-model:open="open"
- title="鐗╂枡浜у搧閫夋嫨"
+ :title="dialogTitle"
width="80%"
:destroy-on-close="true"
@ok="handleConfirm"
@cancel="closeModal">
- <div class="flex h-full w-full">
- <Card class="mr-4 h-full w-1/5">
- <MdItemTypeTree ref="typeTreeRef"
- @node-click="handleItemTypeNodeClick" />
- </Card>
- <div class="w-4/5">
- <Grid table-title="鐗╂枡浜у搧鍒楄〃" />
+ <div class="flex h-[calc(100vh-300px)] min-h-[380px] w-full flex-col">
+ <Alert
+ v-if="limitedToProducts"
+ class="mb-3 shrink-0"
+ message="浠呭彲閫夋嫨鏈骇鍝佸湪宸ヨ壓璺嚎涓凡閰嶇疆鐨勪骇鍑虹墿鏂�"
+ description="濡傞渶澧炲姞鍙�夐」锛岃鍏堝湪宸ヨ壓璺嚎瀵瑰簲宸ュ簭涓厤缃骇鍑哄苟淇濆瓨銆�"
+ show-icon
+ type="info"
+ >
+ <template #action><Tag color="blue">{{ productIds.length }} 涓骇鍑�</Tag></template>
+ </Alert>
+ <div class="flex min-h-0 w-full flex-1 gap-4">
+ <Card v-if="!limitedToProducts" class="h-full w-1/5 shrink-0" :body-style="{ height: '100%', overflow: 'hidden' }">
+ <MdItemTypeTree ref="typeTreeRef" @node-click="handleItemTypeNodeClick" />
+ </Card>
+ <div class="h-full min-h-0 min-w-0 flex-1">
+ <Grid class="h-full" :table-title="tableTitle" />
+ </div>
</div>
</div>
</Modal>
diff --git a/src/views/mes/pro/route/components/index.ts b/src/views/mes/pro/route/components/index.ts
index 4a78a4c..7a20061 100644
--- a/src/views/mes/pro/route/components/index.ts
+++ b/src/views/mes/pro/route/components/index.ts
@@ -1 +1,2 @@
export { default as RouteColorPicker } from './color-picker.vue';
+export { default as RouteOutputAttribution } from './output-attribution.vue';
diff --git a/src/views/mes/pro/route/components/output-attribution.vue b/src/views/mes/pro/route/components/output-attribution.vue
new file mode 100644
index 0000000..b5d9d3b
--- /dev/null
+++ b/src/views/mes/pro/route/components/output-attribution.vue
@@ -0,0 +1,135 @@
+<script lang="ts" setup>
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+
+import { computed } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Button, Select } from 'ant-design-vue';
+
+defineOptions({ name: 'RouteOutputAttribution' });
+
+/** 褰掑睘閫夋嫨涓唬琛ㄢ�滃浜у搧閫氱敤鈥濈殑鍝ㄥ叺鍊硷紙浜у搧缂栧彿鍧囦负姝f暟锛� */
+const GENERAL_PRODUCT = 0;
+
+const props = withDefaults(
+ defineProps<{
+ disabled?: boolean;
+ modelValue?: MesProRouteProcessApi.OutputItem[];
+ products?: MesProRouteProductApi.RouteProduct[];
+ }>(),
+ {
+ disabled: false,
+ modelValue: () => [],
+ products: () => [],
+ },
+);
+
+const emit = defineEmits<{
+ 'update:modelValue': [value: MesProRouteProcessApi.OutputItem[]];
+}>();
+
+const rows = computed(() => props.modelValue ?? []);
+const productOptions = computed(() =>
+ props.products
+ .filter((product) => product.itemId != null)
+ .map((product) => ({
+ label: product.itemName ?? product.itemCode ?? String(product.itemId),
+ value: product.itemId!,
+ })),
+);
+const attributionOptions = computed(() => [
+ { label: '閫氱敤锛堟墍鏈変骇鍝侊級', value: GENERAL_PRODUCT },
+ ...productOptions.value,
+]);
+
+function commit(next: MesProRouteProcessApi.OutputItem[]) {
+ emit('update:modelValue', next);
+}
+
+function updateRow(
+ index: number,
+ patch: Partial<MesProRouteProcessApi.OutputItem>,
+) {
+ commit(rows.value.map((row, i) => (i === index ? { ...row, ...patch } : row)));
+}
+
+/** 閫夋嫨浜у嚭鐗╂枡鏃讹紝榛樿褰掑睘鍒拌嚜韬骇鍝侊紙鍗婃垚鍝佸叡鐢ㄦ椂鍐嶆墜鍔ㄦ敼鎴愨�滈�氱敤鈥濓級 */
+function handleItemChange(index: number, itemId: number | undefined) {
+ const current = rows.value[index];
+ const patch: Partial<MesProRouteProcessApi.OutputItem> = { itemId };
+ // 鍘熸潵褰掑睘鑷韩鏃讹紝鍒囨崲浜у嚭鐗╂枡涔熻鍚屾褰掑睘锛岄伩鍏嶇暀涓嬫棫浜у搧缂栧彿銆�
+ if ((current?.productId == null || current.productId === current.itemId) && itemId != null) {
+ patch.productId = itemId;
+ }
+ updateRow(index, patch);
+}
+
+function handleAttributionChange(index: number, value: number | undefined) {
+ updateRow(index, {
+ productId: value === GENERAL_PRODUCT || value == null ? undefined : value,
+ });
+}
+
+function addRow() {
+ commit([...rows.value, { itemId: undefined, productId: undefined }]);
+}
+
+function removeRow(index: number) {
+ commit(rows.value.filter((_, i) => i !== index));
+}
+</script>
+
+<template>
+ <div class="w-full">
+ <div class="flex flex-col gap-2">
+ <div
+ v-for="(row, index) in rows"
+ :key="index"
+ class="flex items-center gap-2"
+ >
+ <Select
+ :disabled="disabled"
+ :options="productOptions"
+ :placeholder="'閫夋嫨浜у嚭鐗╂枡'"
+ :value="row.itemId"
+ class="min-w-0 flex-1"
+ option-filter-prop="label"
+ show-search
+ @change="(value) => handleItemChange(index, value as number | undefined)"
+ />
+ <Select
+ :disabled="disabled || row.itemId == null"
+ :options="attributionOptions"
+ :value="row.productId ?? GENERAL_PRODUCT"
+ class="min-w-0 flex-1"
+ @change="(value) => handleAttributionChange(index, value as number | undefined)"
+ />
+ <Button
+ :aria-label="`鍒犻櫎绗� ${index + 1} 鏉′骇鍑洪厤缃甡"
+ :disabled="disabled"
+ danger
+ size="small"
+ type="text"
+ @click="removeRow(index)"
+ >
+ <IconifyIcon class="size-4" icon="lucide:trash-2" />
+ </Button>
+ </div>
+ <div v-if="rows.length === 0" class="text-sm text-gray-500">
+ 鏆傛棤浜у嚭锛涘舰鎴愬崐鎴愬搧鎴栨垚鍝佹椂娣诲姞
+ </div>
+ </div>
+ <Button
+ v-if="!disabled"
+ class="mt-2"
+ size="small"
+ type="dashed"
+ @click="addRow"
+ >
+ <IconifyIcon class="mr-1 size-4" icon="lucide:plus" />
+ 娣诲姞浜у嚭
+ </Button>
+ </div>
+</template>
diff --git a/src/views/mes/pro/route/data.ts b/src/views/mes/pro/route/data.ts
index f4bf910..1fc0695 100644
--- a/src/views/mes/pro/route/data.ts
+++ b/src/views/mes/pro/route/data.ts
@@ -19,12 +19,15 @@
import { z } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getTemplatePage } from '#/api/mes/pro/processdesign/template';
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+import { getWarehouseAreaSimpleList } from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
import {
MdItemSelect,
MdProductBomSelect,
} from '#/views/mes/md/item/components';
-import { RouteColorPicker } from './components';
+import { RouteColorPicker, RouteOutputAttribution } from './components';
/** 琛ㄥ崟绫诲瀷 */
export type FormType = 'create' | 'detail' | 'update';
@@ -167,7 +170,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDate',
+ formatter: 'formatDateTime',
},
{
title: '鎿嶄綔',
@@ -181,6 +184,7 @@
/** 宸ヨ壓璺嚎宸ュ簭鏄庣粏琛ㄥ崟 */
export function useRouteProcessFormSchema(
processOptions: Array<{ label: string; value: number }>,
+ products: MesProRouteProductApi.RouteProduct[] = [],
): VbenFormSchema[] {
return [
{
@@ -231,36 +235,38 @@
},
{
fieldName: 'yieldRate',
- label: '鏀剁巼',
+ label: '宸ュ簭鏀剁巼',
component: 'InputNumber',
+ help: '浜у嚭閲� 梅 鎶曞叆閲忥紱鏈~鍐欐寜 100% 鍙備笌鎺掍骇璁$畻銆�',
componentProps: {
class: '!w-full',
min: 0.0001,
max: 1,
step: 0.01,
precision: 4,
- placeholder: '浜у嚭/鎶曞叆锛屽 0.98',
+ placeholder: '濡� 0.98锛�98%锛�',
},
+ rules: z.number().min(0.0001).max(1).nullish(),
+ },
+ {
+ fieldName: 'outputs',
+ label: '鏈伐搴忎骇鍑�',
+ component: markRaw(RouteOutputAttribution),
+ componentProps: {
+ products,
+ },
+ formItemClass: 'col-span-2',
},
{
fieldName: 'linkType',
label: '涓庝笅閬撳伐搴忓叧绯�',
component: 'Select',
- help: () =>
- h(
- 'div',
- {
- style:
- 'white-space: pre-line; max-width: 320px; line-height: 1.6;',
- },
- '0=寮�濮�-寮�濮�(SS)锛氭湰宸ュ簭寮�濮嬪悗锛屼笅閬撳伐搴忔墠鑳藉紑濮嬶紙鍙噸鍙犲苟琛屽紑宸ワ級\n1=缁撴潫-缁撴潫(FF)锛氫笅閬撳伐搴忓繀椤荤瓑鍒版湰宸ュ簭缁撴潫鎵嶈兘缁撴潫锛堝苟琛屼絾鍚屾瀹屽伐锛塡n2=寮�濮�-缁撴潫(SF)锛氭湰宸ュ簭寮�濮嬪悗锛屼笅閬撳伐搴忔墠鑳界粨鏉焅n3=缁撴潫-寮�濮�(FS)锛氭湰宸ュ簭缁撴潫鍚庯紝涓嬮亾宸ュ簭鎵嶈兘寮�濮嬶紙榛樿鍊硷級',
- ),
componentProps: {
allowClear: true,
options: getDictOptions(DICT_TYPE.MES_PRO_LINK_TYPE, 'number'),
placeholder: '璇烽�夋嫨',
},
- rules: z.number().optional(),
+ rules: z.number().default(3),
},
{
fieldName: 'colorCode',
@@ -284,6 +290,16 @@
componentProps: {
checkedChildren: '鏄�',
unCheckedChildren: '鍚�',
+ },
+ rules: z.boolean().default(false),
+ },
+ {
+ fieldName: 'backflushFlag',
+ label: '鎶ュ伐鑷姩鎵f枡',
+ component: 'Switch',
+ componentProps: {
+ checkedChildren: '鑷姩',
+ unCheckedChildren: '鎵嬪姩',
},
rules: z.boolean().default(false),
},
@@ -329,6 +345,25 @@
{ field: 'sort', title: '搴忓彿', width: 70, align: 'center', fixed: 'left' },
{ field: 'processCode', title: '宸ュ簭缂栫爜', width: 140, fixed: 'left' },
{ field: 'processName', title: '宸ュ簭鍚嶇О', width: 140, fixed: 'left' },
+ {
+ field: 'outputItemNames',
+ title: '鏈伐搴忎骇鍑�',
+ minWidth: 240,
+ formatter: ({ cellValue, row }) => {
+ const outputs = row.outputs ?? [];
+ if (!outputs.length) {
+ return cellValue ?? '';
+ }
+ return outputs
+ .map((output) => {
+ const name = output.itemName ?? output.itemCode ?? output.itemId;
+ return output.productId == null
+ ? `${name}锛堥�氱敤锛塦
+ : `${name}锛�${output.productName ?? output.productId}锛塦;
+ })
+ .join('銆�');
+ },
+ },
{ field: 'nextProcessName', title: '涓嬩竴閬撳伐搴�', width: 140 },
{
field: 'linkType',
@@ -357,6 +392,15 @@
props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
},
},
+ {
+ field: 'backflushFlag',
+ title: '鑷姩鎵f枡',
+ width: 100,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+ },
+ },
{ field: 'prepareTime', title: '鍑嗗鏃堕棿(鍒�)', width: 110 },
{ field: 'waitTime', title: '绛夊緟鏃堕棿(鍒�)', width: 110 },
{
@@ -378,11 +422,14 @@
/** 宸ヨ壓璺嚎浜у搧鍒楄〃瀛楁 */
export function useRouteProductGridColumns(): VxeTableGridOptions<MesProRouteProductApi.RouteProduct>['columns'] {
return [
- { field: 'itemCode', title: '浜у搧鐗╂枡缂栫爜', width: 150 },
- { field: 'itemName', title: '浜у搧鐗╂枡鍚嶇О', width: 150 },
+ { field: 'itemCode', title: '浜у嚭缂栫爜', width: 150 },
+ { field: 'itemName', title: '浜у嚭鍚嶇О', width: 150 },
{ field: 'specification', title: '瑙勬牸鍨嬪彿', width: 150 },
{ field: 'unitName', title: '鍗曚綅', width: 80 },
{ field: 'quantity', title: '鐢熶骇鏁伴噺', width: 100 },
+ { field: 'warehouseName', title: '鎶ュ伐鍏ュ簱浠�', width: 140 },
+ { field: 'locationName', title: '鍏ュ簱搴撳尯', width: 120 },
+ { field: 'areaName', title: '鍏ュ簱搴撲綅', width: 120 },
{
field: 'productionTime',
title: '鐢熶骇鐢ㄦ椂',
@@ -402,8 +449,8 @@
/** 宸ヨ壓璺嚎浜у搧 BOM 鍒楄〃瀛楁 */
export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>['columns'] {
return [
- { field: 'itemCode', title: 'BOM 鐗╂枡缂栫爜', width: 150 },
- { field: 'itemName', title: 'BOM 鐗╂枡鍚嶇О', width: 150 },
+ { field: 'itemCode', title: '鎶曟枡缂栫爜', width: 150 },
+ { field: 'itemName', title: '鎶曟枡鍚嶇О', width: 150 },
{ field: 'specification', title: '瑙勬牸鍨嬪彿', width: 150 },
{ field: 'unitName', title: '鍗曚綅', width: 80 },
{ field: 'quantity', title: '鐢ㄦ枡姣斾緥', width: 100 },
@@ -420,6 +467,7 @@
/** 宸ヨ壓璺嚎浜у搧琛ㄥ崟 */
export function useRouteProductFormSchema(
onItemChange?: (item: any) => void,
+ getFormApi?: () => VbenFormApi,
): VbenFormSchema[] {
return [
{
@@ -435,11 +483,12 @@
// 浜у搧鐗╂枡锛氫娇鐢ㄤ笟鍔¤嚜瀹氫箟閫夋嫨鍣紝change 鍥炲~缂栫爜/鍚嶇О/瑙勬牸/鍗曚綅
{
fieldName: 'itemId',
- label: '浜у搧',
+ label: '浜у嚭鐗╂枡',
component: markRaw(MdItemSelect),
componentProps: {
onChange: onItemChange,
},
+ help: '鍙�夋嫨涓绘暟鎹被鍨嬩负鎴愬搧鎴栧崐鎴愬搧鐨勭墿鏂欙紝涔熷吋瀹� MES 鎴愬搧/鍗婃垚鍝佸垎绫伙紱宸叉湁璺嚎浜у搧鍙户缁慨鏀逛粨浣嶃��',
formItemClass: 'col-span-2',
rules: 'selectRequired',
},
@@ -455,6 +504,63 @@
rules: z.number().default(1),
},
{
+ fieldName: 'warehouseId',
+ label: '鎶ュ伐浠撳簱',
+ component: 'ApiSelect',
+ componentProps: {
+ api: getWarehouseSimpleList,
+ labelField: 'name',
+ valueField: 'id',
+ placeholder: '璇烽�夋嫨鎶ュ伐浜у嚭浠撳簱',
+ onChange: async () => {
+ await getFormApi?.().setFieldValue('locationId', undefined);
+ await getFormApi?.().setFieldValue('areaId', undefined);
+ },
+ },
+ rules: 'selectRequired',
+ },
+ {
+ fieldName: 'locationId',
+ label: '鎶ュ伐搴撳尯',
+ component: 'Select',
+ dependencies: {
+ triggerFields: ['warehouseId'],
+ disabled: (values) => !values.warehouseId,
+ async componentProps(values) {
+ const options = values.warehouseId
+ ? await getWarehouseLocationSimpleList(values.warehouseId)
+ : [];
+ return {
+ fieldNames: { label: 'name', value: 'id' },
+ options,
+ placeholder: '璇烽�夋嫨鎶ュ伐浜у嚭搴撳尯',
+ onChange: async () => getFormApi?.().setFieldValue('areaId', undefined),
+ };
+ },
+ },
+ rules: 'selectRequired',
+ },
+ {
+ fieldName: 'areaId',
+ label: '鎶ュ伐搴撲綅',
+ component: 'Select',
+ dependencies: {
+ triggerFields: ['locationId'],
+ disabled: (values) => !values.locationId,
+ async componentProps(values) {
+ const options = values.locationId
+ ? await getWarehouseAreaSimpleList(values.locationId)
+ : [];
+ return {
+ fieldNames: { label: 'name', value: 'id' },
+ options,
+ placeholder: '璇烽�夋嫨鎶ュ伐浜у嚭搴撲綅',
+ };
+ },
+ },
+ rules: 'selectRequired',
+ },
+ {
fieldName: 'productionTime',
label: '鐢熶骇鐢ㄦ椂',
component: 'InputNumber',
diff --git a/src/views/mes/pro/route/index.vue b/src/views/mes/pro/route/index.vue
index 8bc13e0..d29404e 100644
--- a/src/views/mes/pro/route/index.vue
+++ b/src/views/mes/pro/route/index.vue
@@ -8,25 +8,33 @@
import { getDictLabel } from '@vben/hooks';
import { downloadFileFromBlobPart } from '@vben/utils';
-import { Button, message, Tooltip } from 'ant-design-vue';
+import { Alert, Button, message, Tooltip } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
deleteRoute,
exportRoute,
getRoutePage,
+ importRoute,
+ importRouteTemplate,
updateRouteStatus,
} from '#/api/mes/pro/route';
+import ImportModalComponent from '#/components/import-modal';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
-import Form from './modules/form.vue';
+import Form from './modules/route-configurator.vue';
const { hasAccessByCodes } = useAccess();
const statusEditable = hasAccessByCodes(['mes:pro-route:update']); // 鏄惁鍙垏鎹㈢姸鎬�
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
+ destroyOnClose: true,
+});
+
+const [ImportModal, importModalApi] = useVbenModal({
+ connectedComponent: ImportModalComponent,
destroyOnClose: true,
});
@@ -38,6 +46,18 @@
/** 鍒涘缓宸ヨ壓璺嚎 */
function handleCreate() {
formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 瀵煎叆宸ヨ壓璺嚎 */
+function handleImport() {
+ importModalApi
+ .setData({
+ title: $t('ui.actionTitle.import', ['宸ヨ壓璺嚎']),
+ fileName: '宸ヨ壓璺嚎瀵煎叆妯℃澘.xls',
+ importFn: importRoute,
+ templateFn: importRouteTemplate,
+ })
+ .open();
}
/** 缂栬緫宸ヨ壓璺嚎锛堜粎鍋滅敤鐘舵�佸彲缂栬緫锛� */
@@ -57,7 +77,9 @@
): Promise<boolean | undefined> {
try {
await confirm(
- `纭瑕佸皢"${row.name}"宸ヨ壓璺嚎鍒囨崲涓恒��${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}銆戝悧锛焋,
+ newStatus === CommonStatusEnum.ENABLE
+ ? `纭鍚敤鈥�${row.name}鈥濆悧锛熺郴缁熷皢妫�鏌ヤ骇鍑哄叆搴撲綅缃�佸伐搴忎骇鍑哄拰宸ュ簭鎶曟枡鏄惁瀹屾暣銆俙
+ : `纭瑕佸皢鈥�${row.name}鈥濆伐鑹鸿矾绾垮垏鎹负銆�${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}銆戝悧锛焋,
);
} catch {
return false;
@@ -118,6 +140,14 @@
<template>
<Page auto-content-height><FormModal @success="handleRefresh" />
+ <ImportModal @success="handleRefresh" />
+ <Alert
+ class="mb-3"
+ message="璺嚎閰嶇疆椤哄簭"
+ description="鍩烘湰淇℃伅 鈫� 浜у嚭浜у搧鍙婂叆搴撲粨 鈫� 宸ュ簭鍙婂悇宸ュ簭浜у嚭 鈫� 宸ュ簭鎶曟枡 鈫� 鏍¢獙鍚敤"
+ show-icon
+ type="info"
+ />
<Grid table-title="宸ヨ壓璺嚎鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -130,6 +160,12 @@
onClick: handleCreate,
},
{
+ label: $t('ui.actionTitle.import', ['宸ヨ壓璺嚎']),
+ icon: ACTION_ICON.UPLOAD,
+ auth: ['mes:pro-route:import'],
+ onClick: handleImport,
+ },
+ {
label: $t('ui.actionTitle.export'),
type: 'primary',
icon: ACTION_ICON.DOWNLOAD,
diff --git a/src/views/mes/pro/route/modules/material-input-list.vue b/src/views/mes/pro/route/modules/material-input-list.vue
new file mode 100644
index 0000000..8d0c9c6
--- /dev/null
+++ b/src/views/mes/pro/route/modules/material-input-list.vue
@@ -0,0 +1,145 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { computed, ref, watch } from 'vue';
+
+import { Alert, Button, Empty, Tag } from 'ant-design-vue';
+
+import { getRouteProductBomList } from '#/api/mes/pro/route/productbom';
+
+import ProductBomList from './product-bom-list.vue';
+
+const props = defineProps<{
+ formType: FormType;
+ processes: MesProRouteProcessApi.RouteProcess[];
+ products: MesProRouteProductApi.RouteProduct[];
+ routeId: number;
+}>();
+
+const emit = defineEmits<{
+ change: [list: MesProRouteProductBomApi.RouteProductBom[]];
+}>();
+
+const activeProductId = ref<number>();
+const allBomList = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
+
+const activeProduct = computed(() =>
+ props.products.find((item) => item.itemId === activeProductId.value),
+);
+
+function materialCount(productId?: number) {
+ if (!productId) return 0;
+ return allBomList.value.filter((item) => item.productId === productId).length;
+}
+
+async function loadAll() {
+ allBomList.value = (await getRouteProductBomList({ routeId: props.routeId })) || [];
+ emit('change', allBomList.value);
+}
+
+watch(
+ () => props.products.map((item) => item.itemId).filter(Boolean),
+ (productIds) => {
+ if (!productIds.length) {
+ activeProductId.value = undefined;
+ return;
+ }
+ if (!activeProductId.value || !productIds.includes(activeProductId.value)) {
+ activeProductId.value = productIds[0];
+ }
+ },
+ { immediate: true },
+);
+
+watch(
+ () => props.routeId,
+ (value) => value && loadAll(),
+ { immediate: true },
+);
+</script>
+
+<template>
+ <Alert
+ class="mb-4"
+ message="鎸変骇鍑轰骇鍝侀厤缃瘡閬撳伐搴忛渶瑕佹姇鍏ョ殑鐗╂枡"
+ description="鍏堥�夋嫨浜у嚭浜у搧锛屽啀鍒囨崲鍒板叿浣撳伐搴忔坊鍔犳姇鏂欑墿鏂欏拰鐢ㄦ枡姣斾緥銆傚紑鍚�滄姤宸ヨ嚜鍔ㄦ墸鏂欌�濈殑宸ュ簭锛屼細鍦ㄦ姤宸ユ椂鎸夎繖閲岀殑閰嶇疆鑷姩鎵e噺搴撳瓨銆�"
+ show-icon
+ type="info"
+ />
+
+ <Empty
+ v-if="!products.length || !processes.length"
+ :description="!products.length ? '璇峰厛瀹屾垚浜у嚭浜у搧閰嶇疆' : '璇峰厛瀹屾垚宸ュ簭閰嶇疆'"
+ />
+
+ <div v-else class="material-layout">
+ <aside class="product-selector" aria-label="閫夋嫨瑕侀厤缃姇鏂欑殑浜у嚭浜у搧">
+ <div class="selector-heading">
+ <strong>浜у嚭浜у搧</strong>
+ <span>{{ products.length }} 涓�</span>
+ </div>
+ <Button
+ v-for="product in products"
+ :key="product.itemId"
+ :class="['product-button', { active: product.itemId === activeProductId }]"
+ type="text"
+ @click="activeProductId = product.itemId"
+ >
+ <span class="product-copy">
+ <strong>{{ product.itemName }}</strong>
+ <small>{{ product.itemCode }}</small>
+ </span>
+ <Tag :color="materialCount(product.itemId) ? 'success' : 'warning'">
+ {{ materialCount(product.itemId) ? `${materialCount(product.itemId)} 鏉 : '鏈厤缃�' }}
+ </Tag>
+ </Button>
+ </aside>
+
+ <section v-if="activeProduct" class="material-detail">
+ <header class="material-detail-header">
+ <div>
+ <h3>{{ activeProduct.itemName }} 路 宸ュ簭鎶曟枡</h3>
+ <p>渚濇鍒囨崲宸ュ簭锛岀淮鎶よ浜у搧鍦ㄨ宸ュ簭瀹為檯娑堣�楃殑鐗╂枡銆�</p>
+ </div>
+ <Tag color="blue">{{ processes.length }} 閬撳伐搴�</Tag>
+ </header>
+ <ProductBomList
+ :form-type="formType"
+ :product-id="activeProduct.itemId!"
+ :product-name="activeProduct.itemName"
+ :route-id="routeId"
+ @change="loadAll"
+ />
+ </section>
+ </div>
+</template>
+
+<style scoped>
+.material-layout { display: grid; grid-template-columns: minmax(210px, 260px) minmax(0, 1fr); gap: 18px; }
+.product-selector { overflow: hidden; align-self: start; border: 1px solid rgb(226 232 240); border-radius: 12px; background: rgb(248 250 252); }
+.selector-heading { display: flex; align-items: center; justify-content: space-between; padding: 14px 16px; border-bottom: 1px solid rgb(226 232 240); color: rgb(15 23 42); }
+.selector-heading span { color: rgb(100 116 139); font-size: 12px; }
+.product-button { display: flex; width: 100%; height: auto; min-height: 62px; align-items: center; justify-content: space-between; gap: 10px; padding: 10px 12px; border-radius: 0; text-align: left; }
+.product-button + .product-button { border-top: 1px solid rgb(226 232 240); }
+.product-button.active { background: rgb(219 234 254); color: rgb(29 78 216); }
+.product-copy { display: grid; min-width: 0; gap: 2px; }
+.product-copy strong, .product-copy small { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.product-copy small { color: rgb(100 116 139); }
+.material-detail { min-width: 0; padding: 18px; border: 1px solid rgb(226 232 240); border-radius: 12px; }
+.material-detail-header { display: flex; align-items: flex-start; justify-content: space-between; gap: 12px; }
+.material-detail-header h3 { margin: 0; color: rgb(15 23 42); font-size: 16px; font-weight: 650; }
+.material-detail-header p { margin: 4px 0 0; color: rgb(100 116 139); font-size: 13px; }
+:global(.dark) .product-selector, :global(.dark) .material-detail { border-color: rgb(51 65 85); background: rgb(15 23 42); }
+:global(.dark) .selector-heading, :global(.dark) .product-button + .product-button { border-color: rgb(51 65 85); color: rgb(241 245 249); }
+:global(.dark) .product-button.active { background: rgb(30 64 175 / 35%); color: rgb(147 197 253); }
+:global(.dark) .material-detail-header h3 { color: rgb(241 245 249); }
+@media (max-width: 900px) {
+ .material-layout { grid-template-columns: 1fr; }
+ .product-selector { display: flex; overflow-x: auto; }
+ .selector-heading { display: none; }
+ .product-button { min-width: 210px; border-top: 0 !important; border-right: 1px solid rgb(226 232 240); }
+}
+</style>
diff --git a/src/views/mes/pro/route/modules/process-form.vue b/src/views/mes/pro/route/modules/process-form.vue
index 6dcab06..228ee31 100644
--- a/src/views/mes/pro/route/modules/process-form.vue
+++ b/src/views/mes/pro/route/modules/process-form.vue
@@ -6,7 +6,7 @@
import { useVbenModal } from '@vben/common-ui';
-import { message } from 'ant-design-vue';
+import { Alert, message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { getProcessSimpleList } from '#/api/mes/pro/process';
@@ -15,6 +15,7 @@
getRouteProcess,
updateRouteProcess,
} from '#/api/mes/pro/route/process';
+import { getRouteProductListByRoute } from '#/api/mes/pro/route/product';
import { $t } from '#/locales';
import { useRouteProcessFormSchema } from '../data';
@@ -31,7 +32,7 @@
commonConfig: {
componentProps: { class: 'w-full' },
formItemClass: 'col-span-1',
- labelWidth: 150,
+ labelWidth: 130,
},
layout: 'horizontal',
schema: [],
@@ -40,13 +41,14 @@
});
/** 鍔犺浇宸ュ簭閫夐」鍚庡啀鐢熸垚 schema锛堥伩鍏嶄笅鎷夌┖閫夐」锛� */
-async function loadSchema(): Promise<VbenFormSchema[]> {
+async function loadSchema(routeId: number): Promise<VbenFormSchema[]> {
const list = await getProcessSimpleList();
const options = (list || []).map((item) => ({
label: item.name ?? '',
value: item.id!,
}));
- return useRouteProcessFormSchema(options);
+ const products = routeId ? await getRouteProductListByRoute(routeId) : [];
+ return useRouteProcessFormSchema(options, products);
}
const [Modal, modalApi] = useVbenModal({
@@ -76,15 +78,6 @@
formData.value = undefined;
return;
}
- modalApi.lock();
- try {
- // 宸ュ簭涓嬫媺渚濊禆杩滅▼鏁版嵁锛宻chema 鍦ㄥ脊绐楁墦寮�鏃跺啀鐢熸垚
- const schema = await loadSchema();
- formApi.setState({ schema });
- } finally {
- modalApi.unlock();
- }
- // 鍔犺浇鏁版嵁
const data = modalApi.getData<{
id?: number;
maxSort?: number;
@@ -93,6 +86,15 @@
if (!data) {
return;
}
+ modalApi.lock();
+ try {
+ // 宸ュ簭涓嬫媺渚濊禆杩滅▼鏁版嵁锛宻chema 鍦ㄥ脊绐楁墦寮�鏃跺啀鐢熸垚
+ const schema = await loadSchema(data.routeId);
+ formApi.setState({ schema });
+ } finally {
+ modalApi.unlock();
+ }
+ // 鍔犺浇鏁版嵁
if (!data.id) {
// 鏂板鏃讹紝榛樿搴忓彿 = maxSort + 1锛屽苟缁欎竴涓粯璁ょ敇鐗瑰浘棰滆壊
await formApi.setValues({
@@ -116,6 +118,13 @@
<template>
<Modal :title="getTitle" class="w-3/5">
+ <Alert
+ class="mx-4 mb-4"
+ message="鎸夊疄闄呯敓浜ц妭鐐归厤缃骇鍑�"
+ description="涓棿宸ュ簭娌℃湁鐙珛浜у嚭鏃跺彲鐣欑┖锛涘舰鎴愬崐鎴愬搧鏃堕�夋嫨瀵瑰簲鍗婃垚鍝侊紝鏈亾宸ュ簭蹇呴』閫夋嫨鍏ㄩ儴鎴愬搧銆傚綊灞炶〃绀鸿浜у嚭灞炰簬鍝釜浜у搧锛氬浜у搧鍏辩敤鐨勫崐鎴愬搧閫夆�滈�氱敤鈥濓紝浜у搧涓撳睘锛堝挨鍏舵槸鎴愬搧锛夊綊灞炲埌鑷韩浜у搧銆傚寮�鍚姤宸ヨ嚜鍔ㄦ墸鏂欙紝鎶ュ伐鏃朵細鎸夊伐搴忔姇鏂欓厤缃墸鍑忓簱瀛樸��"
+ show-icon
+ type="info"
+ />
<Form class="mx-4" />
</Modal>
</template>
diff --git a/src/views/mes/pro/route/modules/process-list.vue b/src/views/mes/pro/route/modules/process-list.vue
index 192cb5c..b6f4fd0 100644
--- a/src/views/mes/pro/route/modules/process-list.vue
+++ b/src/views/mes/pro/route/modules/process-list.vue
@@ -4,11 +4,11 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
-import { ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
-import { message } from 'ant-design-vue';
+import { message, Tag } from 'ant-design-vue';
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -25,8 +25,15 @@
routeId: number;
}>();
-const isEditable = ref(props.formType !== 'detail'); // 鏄惁鍙紪杈�
+const emit = defineEmits<{
+ change: [list: MesProRouteProcessApi.RouteProcess[]];
+}>();
+
+const isEditable = computed(() => props.formType !== 'detail'); // 鏄惁鍙紪杈�
const list = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 宸ヨ壓璺嚎宸ュ簭鍒楄〃
+const sortedList = computed(() =>
+ [...list.value].sort((a, b) => (a.sort || 0) - (b.sort || 0)),
+);
const [ProcessFormModal, processFormModalApi] = useVbenModal({
connectedComponent: ProcessForm,
@@ -53,6 +60,7 @@
try {
list.value = await getRouteProcessListByRoute(props.routeId);
gridApi.setGridOptions({ data: list.value });
+ emit('change', list.value);
} finally {
gridApi.setLoading(false);
}
@@ -89,6 +97,16 @@
<template>
<ProcessFormModal @success="getList" />
+ <div v-if="sortedList.length" class="mb-4 flex flex-wrap items-center gap-2 rounded-lg bg-slate-50 p-3 dark:bg-slate-900">
+ <template v-for="(item, index) in sortedList" :key="item.id">
+ <div class="flex items-center gap-2 rounded-md border border-slate-200 bg-white px-3 py-2 dark:border-slate-700 dark:bg-slate-800">
+ <span class="text-xs font-semibold text-blue-600">{{ item.sort }}</span>
+ <span class="font-medium">{{ item.processName }}</span>
+ <Tag v-if="index === sortedList.length - 1" color="blue">鏈亾</Tag>
+ </div>
+ <span v-if="index < sortedList.length - 1" class="text-slate-400">鈫�</span>
+ </template>
+ </div>
<div v-if="isEditable" class="mb-3 flex items-center justify-start">
<TableAction
:actions="[
@@ -100,7 +118,7 @@
]"
/>
</div>
- <Grid class="w-full" table-title="缁勬垚宸ュ簭">
+ <Grid class="w-full" table-title="宸ュ簭椤哄簭鍙婂悇宸ュ簭浜у嚭">
<template #colorCode="{ row }">
<div v-if="row.colorCode" class="flex items-center justify-center gap-1">
<div
diff --git a/src/views/mes/pro/route/modules/product-bom-list.vue b/src/views/mes/pro/route/modules/product-bom-list.vue
index 78ac672..9d36a56 100644
--- a/src/views/mes/pro/route/modules/product-bom-list.vue
+++ b/src/views/mes/pro/route/modules/product-bom-list.vue
@@ -1,9 +1,10 @@
<script lang="ts" setup>
+import type { FormType } from '../data';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
-import { ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
@@ -21,10 +22,17 @@
import BomForm from './bom-form.vue';
const props = defineProps<{
+ formType: FormType;
productId: number;
productName?: string;
routeId: number;
}>();
+
+const emit = defineEmits<{
+ change: [];
+}>();
+
+const isEditable = computed(() => props.formType !== 'detail');
const processList = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 宸ュ簭鍒楄〃锛堢敤浜� Tab锛�
const activeProcessId = ref<number>(); // 褰撳墠閫変腑鐨勫伐搴� Tab
@@ -112,6 +120,12 @@
await deleteRouteProductBom(row.id!);
message.success($t('ui.actionMessage.deleteSuccess', ['BOM 鐗╂枡']));
await getList();
+ emit('change');
+}
+
+async function handleSaved() {
+ await getList();
+ emit('change');
}
watch(
@@ -126,7 +140,7 @@
</script>
<template>
- <BomFormModal @success="getList" />
+ <BomFormModal @success="handleSaved" />
<Tabs v-model:active-key="activeProcessId" @change="getList">
<TabPane
v-for="item in processList"
@@ -134,11 +148,11 @@
:tab="item.processName"
/>
</Tabs>
- <div class="mb-3 flex items-center justify-start">
+ <div v-if="isEditable" class="mb-3 flex items-center justify-start">
<TableAction
:actions="[
{
- label: $t('ui.actionTitle.create', ['BOM 鐗╂枡']),
+ label: $t('ui.actionTitle.create', ['鎶曟枡鐗╂枡']),
type: 'primary',
disabled: !activeProcessId,
onClick: handleCreate,
@@ -146,21 +160,23 @@
]"
/>
</div>
- <Grid class="w-full" table-title="浜у搧 BOM">
+ <Grid class="w-full" table-title="褰撳墠宸ュ簭鎶曟枡">
<template #actions="{ row }">
<TableAction
:actions="[
{
label: $t('common.edit'),
type: 'link',
+ ifShow: () => isEditable,
onClick: handleEdit.bind(null, row),
},
{
label: $t('common.delete'),
type: 'link',
danger: true,
+ ifShow: () => isEditable,
popConfirm: {
- title: $t('ui.actionMessage.deleteConfirm', ['BOM 鐗╂枡']),
+ title: $t('ui.actionMessage.deleteConfirm', ['鎶曟枡鐗╂枡']),
confirm: handleDelete.bind(null, row),
},
},
diff --git a/src/views/mes/pro/route/modules/product-form.vue b/src/views/mes/pro/route/modules/product-form.vue
index a3b0e5d..dbe573b 100644
--- a/src/views/mes/pro/route/modules/product-form.vue
+++ b/src/views/mes/pro/route/modules/product-form.vue
@@ -5,7 +5,7 @@
import { useVbenModal } from '@vben/common-ui';
-import { Divider, message } from 'ant-design-vue';
+import { Alert, message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import {
@@ -16,7 +16,6 @@
import { $t } from '#/locales';
import { useRouteProductFormSchema } from '../data';
-import ProductBomList from './product-bom-list.vue';
const emit = defineEmits(['success']);
const formData = ref<MesProRouteProductApi.RouteProduct>();
@@ -46,7 +45,7 @@
labelWidth: 100,
},
layout: 'horizontal',
- schema: useRouteProductFormSchema(handleItemChange),
+ schema: useRouteProductFormSchema(handleItemChange, () => formApi),
showDefaultActions: false,
wrapperClass: 'grid-cols-2',
});
@@ -64,14 +63,10 @@
try {
if (formData.value?.id) {
await updateRouteProduct(data);
- // 鐢ㄦ渶鏂拌〃鍗曞�煎悓姝� formData锛岀‘淇濅骇鍝� BOM 瀛愯〃缁戝畾鐨� itemId 涓庤〃鍗曚竴鑷�
- formData.value = { ...formData.value, ...data };
} else {
- // 鏂板鎴愬姛鍚庡垏鎹㈠埌缂栬緫妯″紡锛屾柟渚跨户缁淮鎶や骇鍝� BOM
- const id = await createRouteProduct(data);
- formData.value = { ...data, id };
- await formApi.setFieldValue('id', id);
+ await createRouteProduct(data);
}
+ await modalApi.close();
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
@@ -109,17 +104,13 @@
<template>
<Modal :title="getTitle" class="w-3/5">
+ <Alert
+ class="mx-4 mb-4"
+ message="杩欓噷缁存姢浜у嚭鍙婂叾鎶ュ伐鍏ュ簱浣嶇疆"
+ description="鎶曟枡鐗╂枡灏嗗湪璺嚎閰嶇疆鐨勨�滃伐搴忔姇鏂欌�濇楠や腑鎸変骇鍝併�佹寜宸ュ簭缁熶竴缁存姢銆�"
+ show-icon
+ type="info"
+ />
<Form class="mx-4" />
- <!-- 缂栬緫妯″紡涓嬪睍绀轰骇鍝� BOM 瀛愯〃锛屾柊澧炴ā寮忎笅闅愯棌 -->
- <template v-if="formData?.id && formData?.itemId">
- <Divider class="!my-3" orientation="left">浜у搧 BOM 閰嶇疆</Divider>
- <div class="mx-4">
- <ProductBomList
- :route-id="formData.routeId!"
- :product-id="formData.itemId"
- :product-name="formData.itemName"
- />
- </div>
- </template>
</Modal>
</template>
diff --git a/src/views/mes/pro/route/modules/product-list.vue b/src/views/mes/pro/route/modules/product-list.vue
index ea34d58..056d6db 100644
--- a/src/views/mes/pro/route/modules/product-list.vue
+++ b/src/views/mes/pro/route/modules/product-list.vue
@@ -4,7 +4,7 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
-import { ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
@@ -27,7 +27,11 @@
routeId: number;
}>();
-const isEditable = ref(props.formType !== 'detail'); // 鏄惁鍙紪杈�
+const emit = defineEmits<{
+ change: [list: MesProRouteProductApi.RouteProduct[]];
+}>();
+
+const isEditable = computed(() => props.formType !== 'detail'); // 鏄惁鍙紪杈�
const list = ref<MesProRouteProductApi.RouteProduct[]>([]); // 宸ヨ壓璺嚎浜у搧鍒楄〃
const [ProductFormModal, productFormModalApi] = useVbenModal({
@@ -55,6 +59,7 @@
try {
list.value = await getRouteProductListByRoute(props.routeId);
gridApi.setGridOptions({ data: list.value });
+ emit('change', list.value);
} finally {
gridApi.setLoading(false);
}
@@ -94,14 +99,14 @@
<TableAction
:actions="[
{
- label: $t('ui.actionTitle.create', ['鍏宠仈浜у搧']),
+ label: $t('ui.actionTitle.create', ['浜у嚭浜у搧']),
type: 'primary',
onClick: handleCreate,
},
]"
/>
</div>
- <Grid class="w-full" table-title="鍏宠仈浜у搧">
+ <Grid class="w-full" table-title="浜у嚭浜у搧鍙婃姤宸ュ叆搴撲綅缃�">
<template #productionTime="{ row }">
<span v-if="row.productionTime">
{{ row.productionTime }}
diff --git a/src/views/mes/pro/route/modules/route-configurator.vue b/src/views/mes/pro/route/modules/route-configurator.vue
new file mode 100644
index 0000000..04cd49c
--- /dev/null
+++ b/src/views/mes/pro/route/modules/route-configurator.vue
@@ -0,0 +1,425 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+import type { MesProRouteApi } from '#/api/mes/pro/route';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { computed, ref } from 'vue';
+import { useVbenModal } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+import { Alert, Button, Empty, message, Steps, Tag } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { createRoute, getRoute, updateRoute } from '#/api/mes/pro/route';
+import { getRouteProcessListByRoute } from '#/api/mes/pro/route/process';
+import { getRouteProductListByRoute } from '#/api/mes/pro/route/product';
+import { getRouteProductBomList } from '#/api/mes/pro/route/productbom';
+
+import { useFormSchema } from '../data';
+import MaterialInputList from './material-input-list.vue';
+import ProcessList from './process-list.vue';
+import ProductList from './product-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesProRouteApi.Route>();
+const activeStep = ref(0);
+const productList = ref<MesProRouteProductApi.RouteProduct[]>([]);
+const processList = ref<MesProRouteProcessApi.RouteProcess[]>([]);
+const bomList = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
+
+const isDetail = computed(() => formType.value === 'detail');
+const isNew = computed(() => !formData.value?.id);
+const routeId = computed(() => formData.value?.id);
+const sortedProcessList = computed(() =>
+ [...processList.value].sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0)),
+);
+const title = computed(() =>
+ isDetail.value ? '鏌ョ湅宸ヨ壓璺嚎' : isNew.value ? '鏂板缓宸ヨ壓璺嚎' : '缂栬緫宸ヨ壓璺嚎',
+);
+
+const stepItems = [
+ { title: '鍩烘湰淇℃伅', description: '璺嚎鍚嶇О涓庤鏄�' },
+ { title: '浜у嚭涓庡叆搴�', description: '浜у搧鍙婃姤宸ヤ粨浣�' },
+ { title: '宸ュ簭涓庝骇鍑�', description: '椤哄簭鍜屽崐鎴愬搧/鎴愬搧' },
+ { title: '宸ュ簭鎶曟枡', description: '鎸変骇鍝佷笌宸ュ簭閰嶇疆' },
+ { title: '鍚敤鍓嶆鏌�', description: '闆嗕腑妫�鏌ョ己澶遍」' },
+];
+
+const productsWithWarehouse = computed(() =>
+ productList.value.filter((item) => item.warehouseId && item.locationId && item.areaId).length,
+);
+const processesWithOutput = computed(() =>
+ processList.value.filter((item) => item.outputItemIds?.length).length,
+);
+const lastProcess = computed(() => sortedProcessList.value.at(-1));
+const configuredProductIds = computed(
+ () => new Set(bomList.value.map((item) => item.productId).filter(Boolean)),
+);
+const productsWithBom = computed(() => configuredProductIds.value.size);
+const reviewIssues = computed(() => {
+ const issues: Array<{ step: number; text: string }> = [];
+ if (!productList.value.length) issues.push({ step: 1, text: '杩樻病鏈夐厤缃骇鍑轰骇鍝�' });
+ const missingWarehouse = productList.value.filter(
+ (item) => !item.warehouseId || !item.locationId || !item.areaId,
+ );
+ if (missingWarehouse.length) {
+ issues.push({
+ step: 1,
+ text: `${missingWarehouse.length} 涓骇鍑轰骇鍝佹湭閰嶇疆瀹屾暣浠撳簱銆佸簱鍖哄拰搴撲綅`,
+ });
+ }
+ if (!processList.value.length) issues.push({ step: 2, text: '杩樻病鏈夐厤缃敓浜у伐搴�' });
+ if (processList.value.length && !processList.value.some((item) => item.keyFlag)) {
+ issues.push({ step: 2, text: '鏈缃叧閿伐搴�' });
+ }
+ if (lastProcess.value && !lastProcess.value.outputItemIds?.length) {
+ issues.push({
+ step: 2,
+ text: `鏈亾宸ュ簭鈥�${lastProcess.value.processName || lastProcess.value.processCode || lastProcess.value.sort}鈥濆繀椤婚厤缃垚鍝佷骇鍑篳,
+ });
+ }
+ const lastOutputs = lastProcess.value?.outputs ?? [];
+ if (
+ lastOutputs.length &&
+ lastOutputs.some(
+ (output) => output.productId == null || output.productId !== output.itemId,
+ )
+ ) {
+ issues.push({
+ step: 2,
+ text: '鏈亾宸ュ簭鐨勬垚鍝佷骇鍑哄繀椤诲綊灞炲埌鑷韩浜у搧锛屼笉鑳戒娇鐢ㄢ�滈�氱敤鈥�',
+ });
+ }
+ const productIds = new Set(productList.value.map((item) => item.itemId));
+ const invalidOutputCount = processList.value.filter((process) =>
+ process.outputItemIds?.some((itemId) => !productIds.has(itemId)),
+ ).length;
+ if (invalidOutputCount) {
+ issues.push({
+ step: 2,
+ text: `${invalidOutputCount} 閬撳伐搴忕殑浜у嚭鏈寘鍚湪璺嚎浜у嚭浜у搧涓璥,
+ });
+ }
+ const noBomProducts = productList.value.filter(
+ (item) => item.itemId && !configuredProductIds.value.has(item.itemId),
+ );
+ if (noBomProducts.length) {
+ issues.push({ step: 3, text: `${noBomProducts.length} 涓骇鍝佽繕娌℃湁閰嶇疆浠讳綍宸ュ簭鎶曟枡` });
+ }
+ return issues;
+});
+const primaryText = computed(() => {
+ if (activeStep.value === stepItems.length - 1) return isDetail.value ? '鍏抽棴' : '瀹屾垚閰嶇疆';
+ if (activeStep.value === 0 && isNew.value) return '淇濆瓨骞堕厤缃骇鍑�';
+ return '涓嬩竴姝�';
+});
+
+const [Form, formApi] = useVbenForm({
+ commonConfig: {
+ componentProps: { class: 'w-full' },
+ formItemClass: 'col-span-1',
+ labelWidth: 100,
+ },
+ layout: 'horizontal',
+ schema: [],
+ showDefaultActions: false,
+ wrapperClass: 'grid-cols-2',
+});
+
+async function loadConfiguration() {
+ if (!routeId.value) return;
+ const [products, processes, boms] = await Promise.all([
+ getRouteProductListByRoute(routeId.value),
+ getRouteProcessListByRoute(routeId.value),
+ getRouteProductBomList({ routeId: routeId.value }),
+ ]);
+ productList.value = products || [];
+ processList.value = processes || [];
+ bomList.value = boms || [];
+}
+
+async function saveBaseInformation() {
+ const { valid } = await formApi.validate();
+ if (!valid) return false;
+ modalApi.lock();
+ try {
+ const data = (await formApi.getValues()) as MesProRouteApi.Route;
+ if (!routeId.value) {
+ const id = await createRoute(data);
+ formData.value = { ...data, id };
+ await formApi.setFieldValue('id', id);
+ formType.value = 'update';
+ message.success('鍩烘湰淇℃伅宸蹭繚瀛橈紝璇风户缁厤缃骇鍑轰骇鍝佸拰鍏ュ簱浣嶇疆');
+ } else {
+ await updateRoute({ ...data, id: routeId.value });
+ formData.value = { ...formData.value, ...data, id: routeId.value };
+ }
+ emit('success');
+ return true;
+ } finally {
+ modalApi.unlock();
+ }
+}
+
+function validateProducts() {
+ if (!productList.value.length) {
+ message.warning('璇疯嚦灏戞坊鍔犱竴涓骇鍑轰骇鍝侊紝鍐嶉厤缃伐搴�');
+ return false;
+ }
+ if (productsWithWarehouse.value !== productList.value.length) {
+ message.warning('璇蜂负姣忎釜浜у嚭浜у搧閰嶇疆瀹屾暣鐨勪粨搴撱�佸簱鍖哄拰搴撲綅');
+ return false;
+ }
+ return true;
+}
+
+function validateProcesses() {
+ if (!processList.value.length) {
+ message.warning('璇疯嚦灏戞坊鍔犱竴閬撶敓浜у伐搴�');
+ return false;
+ }
+ return true;
+}
+
+function validateBom() {
+ if (productsWithBom.value !== productList.value.length) {
+ message.warning('姣忎釜浜у嚭浜у搧鑷冲皯瑕侀厤缃竴鏉″伐搴忔姇鏂�');
+ return false;
+ }
+ return true;
+}
+
+async function goToStep(target: number) {
+ if (target < 0 || target >= stepItems.length) return;
+ if (target <= activeStep.value || isDetail.value) {
+ activeStep.value = target;
+ return;
+ }
+ if (!(await saveBaseInformation())) return;
+ await loadConfiguration();
+ if (target >= 2 && !validateProducts()) return void (activeStep.value = 1);
+ if (target >= 3 && !validateProcesses()) return void (activeStep.value = 2);
+ if (target >= 4 && !validateBom()) return void (activeStep.value = 3);
+ activeStep.value = target;
+}
+
+async function handlePrimaryAction() {
+ if (activeStep.value === stepItems.length - 1) {
+ if (!isDetail.value && reviewIssues.value.length) {
+ message.warning('浠嶆湁缂哄け閰嶇疆锛岃鏍规嵁妫�鏌ョ粨鏋滆ˉ鍏呭悗鍐嶅畬鎴�');
+ return;
+ }
+ await modalApi.close();
+ return;
+ }
+ await goToStep(activeStep.value + 1);
+}
+
+const [Modal, modalApi] = useVbenModal({
+ showConfirmButton: false,
+ cancelText: '鍏抽棴',
+ async onOpenChange(isOpen: boolean) {
+ if (!isOpen) {
+ formData.value = undefined;
+ productList.value = [];
+ processList.value = [];
+ bomList.value = [];
+ activeStep.value = 0;
+ return;
+ }
+ formApi.setState({ schema: useFormSchema(formApi) });
+ const data = modalApi.getData<{ formType: FormType; id?: number }>();
+ formType.value = data.formType;
+ formApi.setDisabled(isDetail.value);
+ if (!data.id) return;
+ modalApi.lock();
+ try {
+ formData.value = await getRoute(data.id);
+ await formApi.setValues(formData.value);
+ await loadConfiguration();
+ } finally {
+ modalApi.unlock();
+ }
+ },
+});
+</script>
+
+<template>
+ <Modal :title="title" class="w-[94vw] max-w-[1560px]">
+ <div class="route-config-shell">
+ <header class="route-config-header">
+ <div class="min-w-0">
+ <div class="flex flex-wrap items-center gap-2">
+ <h2 class="m-0 text-lg font-semibold text-gray-900 dark:text-gray-100">
+ {{ formData?.name || '鏂板伐鑹鸿矾绾�' }}
+ </h2>
+ <Tag :color="isDetail ? 'default' : 'processing'">
+ {{ isDetail ? '鍙鏌ョ湅' : '閰嶇疆涓�' }}
+ </Tag>
+ </div>
+ <p class="mb-0 mt-1 text-sm text-gray-600 dark:text-gray-300">
+ 宸ュ簭鎶曟枡渚濊禆浜у嚭浜у搧鍜屽伐搴忥紝鍥犳鍦ㄥ伐搴忕紪鎺掑畬鎴愬悗闆嗕腑閰嶇疆銆�
+ </p>
+ </div>
+ <div class="route-config-summary" aria-label="褰撳墠閰嶇疆姒傝">
+ <span>浜у嚭 {{ productList.length }}</span>
+ <span>宸ュ簭 {{ processList.length }}</span>
+ <span>鎶曟枡 {{ bomList.length }}</span>
+ </div>
+ </header>
+
+ <Steps
+ :current="activeStep"
+ :items="stepItems"
+ class="route-config-steps"
+ responsive
+ size="small"
+ type="navigation"
+ @change="goToStep"
+ />
+
+ <main class="route-config-content">
+ <section v-show="activeStep === 0" class="route-step-panel">
+ <div class="route-step-copy">
+ <IconifyIcon icon="lucide:route" />
+ <div>
+ <h3>鍏堝畾涔夎繖鏉¤矾绾挎槸浠�涔�</h3>
+ <p>缂栫爜鐢ㄤ簬绯荤粺璇嗗埆锛屽悕绉板拰璇存槑甯姪鐜板満浜哄憳蹇�熼�夋嫨銆�</p>
+ </div>
+ </div>
+ <Form class="route-base-form" />
+ </section>
+
+ <section v-if="routeId" v-show="activeStep === 1" class="route-step-panel">
+ <Alert
+ class="mb-4"
+ message="鍏堢淮鎶ゆ墍鏈夊彲鑳界殑宸ュ簭浜у嚭"
+ description="瀹為檯褰㈡垚鐨勪腑闂村崐鎴愬搧鍜屾湯閬撳伐搴忕殑鎴愬搧閮借鍔犲叆锛屽苟鍒嗗埆鎸囧畾鎶ュ伐鍚庤繘鍏ョ殑浠撳簱銆佸簱鍖哄拰搴撲綅銆�"
+ show-icon
+ type="info"
+ />
+ <ProductList
+ :form-type="formType"
+ :route-id="routeId"
+ @change="productList = $event"
+ />
+ </section>
+
+ <section v-if="routeId" v-show="activeStep === 2" class="route-step-panel">
+ <Alert
+ class="mb-4"
+ message="鎸夊疄闄呯敓浜ч『搴忕紪鎺掑伐搴�"
+ description="涓棿宸ュ簭娌℃湁鐙珛浜у嚭鏃跺彲鐣欑┖锛涘舰鎴愬崐鎴愬搧鏃堕�夋嫨瀵瑰簲鍗婃垚鍝侊紝鏈�鍚庝竴閬撳伐搴忓繀椤婚�夋嫨璺嚎缁戝畾鐨勫叏閮ㄦ垚鍝併�傚浜у搧鍏辩敤鐨勫崐鎴愬搧褰掑睘閫夆�滈�氱敤鈥濓紝鎴愬搧蹇呴』褰掑睘鍒拌嚜韬骇鍝併��"
+ show-icon
+ type="info"
+ />
+ <ProcessList
+ :form-type="formType"
+ :route-id="routeId"
+ @change="processList = $event"
+ />
+ </section>
+
+ <section v-if="routeId" v-show="activeStep === 3" class="route-step-panel">
+ <MaterialInputList
+ :form-type="formType"
+ :processes="sortedProcessList"
+ :products="productList"
+ :route-id="routeId"
+ @change="bomList = $event"
+ />
+ </section>
+
+ <section v-show="activeStep === 4" class="route-step-panel">
+ <div class="review-heading">
+ <div>
+ <h3>鍚敤鍓嶆鏌�</h3>
+ <p>纭浜у嚭銆佷粨浣嶃�佸伐搴忓拰鎶曟枡褰㈡垚闂幆鍚庯紝鍐嶅洖鍒板垪琛ㄥ惎鐢ㄨ矾绾裤��</p>
+ </div>
+ <Tag :color="reviewIssues.length ? 'warning' : 'success'">
+ {{ reviewIssues.length ? `${reviewIssues.length} 椤瑰緟澶勭悊` : '閰嶇疆瀹屾暣' }}
+ </Tag>
+ </div>
+
+ <div class="review-metrics">
+ <div><strong>{{ productsWithWarehouse }}/{{ productList.length }}</strong><span>浜у搧浠撲綅瀹屾暣</span></div>
+ <div><strong>{{ processesWithOutput }}</strong><span>閰嶇疆浜у嚭鐨勫伐搴�</span></div>
+ <div><strong>{{ productsWithBom }}/{{ productList.length }}</strong><span>浜у搧宸查厤缃姇鏂�</span></div>
+ </div>
+
+ <div v-if="reviewIssues.length" class="issue-list" role="status">
+ <button
+ v-for="issue in reviewIssues"
+ :key="issue.text"
+ class="issue-item"
+ type="button"
+ @click="activeStep = issue.step"
+ >
+ <IconifyIcon icon="lucide:circle-alert" />
+ <span>{{ issue.text }}</span>
+ <IconifyIcon class="ml-auto" icon="lucide:chevron-right" />
+ </button>
+ </div>
+ <Empty v-else description="鎵�鏈夊繀闇�閰嶇疆鍧囧凡瀹屾垚">
+ <template #image>
+ <div class="review-success-icon"><IconifyIcon icon="lucide:badge-check" /></div>
+ </template>
+ </Empty>
+ </section>
+ </main>
+ </div>
+
+ <template #prepend-footer>
+ <div class="flex flex-auto items-center justify-between gap-3">
+ <Button v-if="activeStep > 0" @click="activeStep--">
+ <IconifyIcon class="mr-1" icon="lucide:arrow-left" />涓婁竴姝�
+ </Button>
+ <span v-else class="text-sm text-gray-500">鏂板缓璺嚎榛樿鍋滅敤锛岄厤缃畬鏁村悗鍐嶅惎鐢�</span>
+ <Button type="primary" @click="handlePrimaryAction">
+ {{ primaryText }}
+ <IconifyIcon
+ v-if="activeStep < stepItems.length - 1"
+ class="ml-1"
+ icon="lucide:arrow-right"
+ />
+ </Button>
+ </div>
+ </template>
+ </Modal>
+</template>
+
+<style scoped>
+.route-config-shell { min-height: min(720px, 72vh); background: rgb(248 250 252); color: rgb(15 23 42); }
+.route-config-header { display: flex; align-items: center; justify-content: space-between; gap: 24px; padding: 18px 24px 14px; background: white; border-bottom: 1px solid rgb(226 232 240); }
+.route-config-summary { display: flex; flex-shrink: 0; gap: 8px; }
+.route-config-summary span { padding: 5px 10px; border-radius: 8px; background: rgb(239 246 255); color: rgb(29 78 216); font-size: 12px; font-weight: 600; }
+.route-config-steps { padding: 12px 20px 0; background: white; }
+.route-config-content { padding: 20px 24px 28px; }
+.route-step-panel { min-height: 460px; padding: 22px; border-radius: 14px; background: white; box-shadow: 0 10px 28px rgb(15 23 42 / 6%); }
+.route-step-copy, .review-heading { display: flex; align-items: flex-start; justify-content: space-between; gap: 14px; margin-bottom: 22px; }
+.route-step-copy { justify-content: flex-start; }
+.route-step-copy > svg { width: 38px; height: 38px; padding: 9px; border-radius: 10px; background: rgb(219 234 254); color: rgb(29 78 216); }
+.route-step-copy h3, .review-heading h3 { margin: 0; color: rgb(15 23 42); font-size: 17px; font-weight: 650; }
+.route-step-copy p, .review-heading p { margin: 4px 0 0; color: rgb(71 85 105); font-size: 14px; }
+.route-base-form { max-width: 1040px; margin: 34px auto 0; }
+.review-metrics { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 14px; margin: 24px 0; }
+.review-metrics > div { display: flex; align-items: baseline; gap: 10px; padding: 18px; border-radius: 12px; background: rgb(248 250 252); }
+.review-metrics strong { color: rgb(29 78 216); font-size: 24px; }
+.review-metrics span { color: rgb(71 85 105); font-size: 13px; }
+.issue-list { display: grid; gap: 10px; }
+.issue-item { display: flex; width: 100%; min-height: 48px; align-items: center; gap: 10px; padding: 10px 14px; border: 1px solid rgb(253 230 138); border-radius: 10px; background: rgb(255 251 235); color: rgb(146 64 14); cursor: pointer; text-align: left; transition: background-color 180ms ease, border-color 180ms ease; }
+.issue-item:hover, .issue-item:focus-visible { border-color: rgb(245 158 11); background: rgb(254 243 199); outline: none; }
+.review-success-icon { display: grid; width: 72px; height: 72px; place-items: center; margin: 0 auto; border-radius: 50%; background: rgb(220 252 231); color: rgb(22 163 74); font-size: 38px; }
+:global(.dark) .route-config-shell { background: rgb(15 23 42); color: rgb(226 232 240); }
+:global(.dark) .route-config-header, :global(.dark) .route-config-steps, :global(.dark) .route-step-panel { background: rgb(30 41 59); border-color: rgb(51 65 85); }
+:global(.dark) .route-step-copy h3, :global(.dark) .review-heading h3 { color: rgb(241 245 249); }
+:global(.dark) .route-step-copy p, :global(.dark) .review-heading p, :global(.dark) .review-metrics span { color: rgb(203 213 225); }
+:global(.dark) .review-metrics > div { background: rgb(15 23 42); }
+@media (max-width: 900px) {
+ .route-config-header { align-items: flex-start; flex-direction: column; }
+ .review-metrics { grid-template-columns: 1fr; }
+ .route-step-panel { padding: 16px; }
+}
+</style>
diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index 4cf593e..cdc4573 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -760,6 +760,17 @@
width: 160,
},
{
+ field: 'warehouseName',
+ title: '鎶ュ伐浠撳簱',
+ width: 130,
+ formatter: ({ cellValue, row }) => {
+ if (!cellValue) return '-';
+ return row.areaName
+ ? `${cellValue}/${row.locationName ?? ''}/${row.areaName}`
+ : cellValue;
+ },
+ },
+ {
field: 'remark',
title: '澶囨敞',
minWidth: 120,
diff --git a/src/views/mes/pro/workorder/modules/process-form.vue b/src/views/mes/pro/workorder/modules/process-form.vue
index bbe10c0..2de3f58 100644
--- a/src/views/mes/pro/workorder/modules/process-form.vue
+++ b/src/views/mes/pro/workorder/modules/process-form.vue
@@ -10,11 +10,15 @@
import { useVbenForm } from '#/adapter/form';
import { getProcessSimpleList } from '#/api/mes/pro/process';
+import { getRouteProcessListByProduct } from '#/api/mes/pro/route/process';
import {
createWorkOrderProcess,
getWorkOrderProcess,
updateWorkOrderProcess,
} from '#/api/mes/pro/workorder/process';
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+import { getWarehouseAreaSimpleList } from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
import { $t } from '#/locales';
import { MdItemSelect } from '#/views/mes/md/item/components';
@@ -23,6 +27,7 @@
const workOrderId = ref<number>();
const processList = ref<MesProWorkOrderProcessApi.WorkOrderProcess[]>([]);
const isCreateMode = ref(false);
+const allowedOutputItemIds = ref<number[]>([]);
const getTitle = computed(() => {
return formData.value?.id
@@ -39,9 +44,37 @@
}));
}
+/**
+ * 杞藉叆鏈伐鍗曚骇鍝佸彲閫夌殑浜у嚭鐗╂枡鑼冨洿
+ *
+ * 鍙栧伐鑹鸿矾绾挎寜浜у嚭褰掑睘杩囨护鍚庣殑浜у嚭锛堥�氱敤鍗婃垚鍝� + 鏈骇鍝佷笓灞炴垚鍝侊級锛�
+ * 骞跺苟鍏ヨ宸ュ簭宸查厤缃殑浜у嚭锛岄伩鍏嶅巻鍙叉暟鎹湪閲嶆柊閫夋嫨鏃惰璇竻绌恒��
+ */
+async function loadAllowedOutputItemIds(
+ productId?: number,
+ currentOutputItemIds: number[] = [],
+): Promise<number[]> {
+ if (!productId) {
+ return [];
+ }
+ const ids = new Set<number>([productId, ...currentOutputItemIds]);
+ const routeProcessList = await getRouteProcessListByProduct(productId);
+ (routeProcessList || []).forEach((process) => {
+ (process.outputItemIds || []).forEach((id) => {
+ if (id) {
+ ids.add(id);
+ }
+ });
+ });
+ return [...ids];
+}
+
/** 琛ㄥ崟 schema */
async function loadSchema(): Promise<VbenFormSchema[]> {
- const processOptions = await loadProcessOptions();
+ const [processOptions, warehouseList] = await Promise.all([
+ loadProcessOptions(),
+ getWarehouseSimpleList(),
+ ]);
return [
{
fieldName: 'id',
@@ -50,6 +83,21 @@
},
{
fieldName: 'workOrderId',
+ component: 'Input',
+ dependencies: { triggerFields: [''], show: () => false },
+ },
+ {
+ fieldName: 'warehouseName',
+ component: 'Input',
+ dependencies: { triggerFields: [''], show: () => false },
+ },
+ {
+ fieldName: 'locationName',
+ component: 'Input',
+ dependencies: { triggerFields: [''], show: () => false },
+ },
+ {
+ fieldName: 'areaName',
component: 'Input',
dependencies: { triggerFields: [''], show: () => false },
},
@@ -185,6 +233,80 @@
componentProps: {
multiple: true,
placeholder: '璇烽�夋嫨浜у嚭鐗╂枡',
+ productIds: allowedOutputItemIds.value,
+ },
+ },
+ {
+ fieldName: 'warehouseId',
+ label: '鎶ュ伐浠撳簱',
+ component: 'Select',
+ componentProps: {
+ allowClear: true,
+ options: (warehouseList || []).map((item) => ({
+ label: item.name ?? '',
+ value: item.id!,
+ })),
+ placeholder: '榛樿鍙栧伐鑹鸿矾绾块厤缃紝鍙慨鏀�',
+ onChange: async (value: number) => {
+ const warehouse = (warehouseList || []).find(
+ (item) => item.id === value,
+ );
+ await formApi.setFieldValue('warehouseName', warehouse?.name);
+ await formApi.setFieldValue('locationId', undefined);
+ await formApi.setFieldValue('locationName', undefined);
+ await formApi.setFieldValue('areaId', undefined);
+ await formApi.setFieldValue('areaName', undefined);
+ },
+ },
+ },
+ {
+ fieldName: 'locationId',
+ label: '鎶ュ伐搴撳尯',
+ component: 'Select',
+ dependencies: {
+ triggerFields: ['warehouseId'],
+ disabled: (values) => !values.warehouseId,
+ async componentProps(values) {
+ const options = values.warehouseId
+ ? await getWarehouseLocationSimpleList(values.warehouseId)
+ : [];
+ return {
+ allowClear: true,
+ fieldNames: { label: 'name', value: 'id' },
+ options,
+ placeholder: '璇烽�夋嫨鎶ュ伐搴撳尯',
+ onChange: async (value: number) => {
+ const location = options.find((item) => item.id === value);
+ await formApi.setFieldValue('locationName', location?.name);
+ await formApi.setFieldValue('areaId', undefined);
+ await formApi.setFieldValue('areaName', undefined);
+ },
+ };
+ },
+ },
+ },
+ {
+ fieldName: 'areaId',
+ label: '鎶ュ伐搴撲綅',
+ component: 'Select',
+ dependencies: {
+ triggerFields: ['locationId'],
+ disabled: (values) => !values.locationId,
+ async componentProps(values) {
+ const options = values.locationId
+ ? await getWarehouseAreaSimpleList(values.locationId)
+ : [];
+ return {
+ allowClear: true,
+ fieldNames: { label: 'name', value: 'id' },
+ options,
+ placeholder: '璇烽�夋嫨鎶ュ伐搴撲綅',
+ onChange: async (value: number) => {
+ const area = options.find((item) => item.id === value);
+ await formApi.setFieldValue('areaName', area?.name);
+ },
+ };
+ },
},
},
{
@@ -271,16 +393,9 @@
formData.value = undefined;
processList.value = [];
isCreateMode.value = false;
+ allowedOutputItemIds.value = [];
return;
}
- modalApi.lock();
- try {
- const schema = await loadSchema();
- formApi.setState({ schema });
- } finally {
- modalApi.unlock();
- }
-
const data = modalApi.getData<{
id?: number;
productId?: number;
@@ -296,27 +411,33 @@
processList.value = data.processList || [];
isCreateMode.value = !data.workOrderId;
- if (data.row) {
- // 缂栬緫涓存椂鍒楄〃涓殑宸ュ簭
- formData.value = data.row;
- await formApi.setValues(data.row);
- } else if (data.id) {
- // 缂栬緫宸蹭繚瀛樼殑宸ュ簭
- modalApi.lock();
- try {
- formData.value = await getWorkOrderProcess(data.id);
+ modalApi.lock();
+ try {
+ // 鍏堝彇宸ュ簭鏁版嵁锛氱紪杈戝凡淇濆瓨宸ュ簭鏃剁敤浜庡洖鏄撅紝涔熺敤浜庝繚鐣欏叾宸叉湁浜у嚭
+ const savedProcess = !data.row && data.id
+ ? await getWorkOrderProcess(data.id)
+ : undefined;
+ formData.value = data.row ?? savedProcess;
+
+ allowedOutputItemIds.value = await loadAllowedOutputItemIds(
+ data.productId,
+ formData.value?.outputItemIds || [],
+ );
+ formApi.setState({ schema: await loadSchema() });
+
+ if (formData.value) {
+ // 缂栬緫涓存椂鍒楄〃涓殑宸ュ簭 / 缂栬緫宸蹭繚瀛樼殑宸ュ簭
await formApi.setValues(formData.value);
- } finally {
- modalApi.unlock();
+ } else {
+ // 鏂板
+ const maxSort = Math.max(0, ...processList.value.map((item) => item.sort || 0));
+ await formApi.setValues({
+ colorCode: '#00AEF3',
+ sort: maxSort + 1,
+ });
}
- } else {
- // 鏂板
- formData.value = undefined;
- const maxSort = Math.max(0, ...processList.value.map((item) => item.sort || 0));
- await formApi.setValues({
- colorCode: '#00AEF3',
- sort: maxSort + 1,
- });
+ } finally {
+ modalApi.unlock();
}
},
});
diff --git a/src/views/mes/pro/workorder/modules/process-list.vue b/src/views/mes/pro/workorder/modules/process-list.vue
index 687633a..7a84a33 100644
--- a/src/views/mes/pro/workorder/modules/process-list.vue
+++ b/src/views/mes/pro/workorder/modules/process-list.vue
@@ -158,6 +158,12 @@
backflushFlag: item.backflushFlag,
outputItemIds: item.outputItemIds,
outputItemNames: item.outputItemNames,
+ warehouseId: item.warehouseId,
+ warehouseName: item.warehouseName,
+ locationId: item.locationId,
+ locationName: item.locationName,
+ areaId: item.areaId,
+ areaName: item.areaName,
remark: item.remark,
bomItems: item.bomItems,
}));
diff --git a/src/views/mes/process-design/route/data.ts b/src/views/mes/process-design/route/data.ts
index 5471982..21f962f 100644
--- a/src/views/mes/process-design/route/data.ts
+++ b/src/views/mes/process-design/route/data.ts
@@ -108,6 +108,16 @@
},
},
{
+ fieldName: "productKeyword",
+ label: "浜у搧",
+ component: "Input",
+ componentProps: {
+ allowClear: true,
+ maxLength: 100,
+ placeholder: "杈撳叆浜у搧鍚嶇О鎴栫紪鐮�",
+ },
+ },
+ {
fieldName: "status",
label: "鐘舵��",
component: "Select",
@@ -154,7 +164,7 @@
field: "createTime",
title: "鍒涘缓鏃堕棿",
width: 180,
- formatter: 'formatDate',
+ formatter: "formatDateTime",
},
{
title: "鎿嶄綔",
@@ -205,7 +215,7 @@
fieldName: "yieldRate",
label: "宸ュ簭鏀剁巼",
component: "InputNumber",
- help: "浜у嚭閲� 梅 鎶曞叆閲忋�傚~鍐� 0.98 琛ㄧず 98%锛�1 琛ㄧず鏃犳崯鑰楋紱鏈~鍐欐寜 100% 鍙備笌鎺掍骇璁$畻銆�",
+ help: "浜у嚭閲� 梅 鎶曞叆閲忋�傚~鍐� 0.98 琛ㄧず 98%锛屾湭濉啓鎸� 100% 鍙備笌鎺掍骇璁$畻銆�",
componentProps: {
class: "!w-full",
min: 0.0001,
@@ -220,21 +230,12 @@
fieldName: "linkType",
label: "涓庝笅閬撳伐搴忓叧绯�",
component: "Select",
- help: () =>
- h(
- "div",
- {
- style:
- "white-space: pre-line; max-width: 320px; line-height: 1.6;",
- },
- "0=寮�濮�-寮�濮�(SS)锛氭湰宸ュ簭寮�濮嬪悗锛屼笅閬撳伐搴忔墠鑳藉紑濮嬶紙鍙噸鍙犲苟琛屽紑宸ワ級\n1=缁撴潫-缁撴潫(FF)锛氫笅閬撳伐搴忓繀椤荤瓑鍒版湰宸ュ簭缁撴潫鎵嶈兘缁撴潫锛堝苟琛屼絾鍚屾瀹屽伐锛塡n2=寮�濮�-缁撴潫(SF)锛氭湰宸ュ簭寮�濮嬪悗锛屼笅閬撳伐搴忔墠鑳界粨鏉焅n3=缁撴潫-寮�濮�(FS)锛氭湰宸ュ簭缁撴潫鍚庯紝涓嬮亾宸ュ簭鎵嶈兘寮�濮嬶紙榛樿鍊硷級",
- ),
componentProps: {
allowClear: true,
options: getDictOptions(DICT_TYPE.MES_PRO_LINK_TYPE, "number"),
placeholder: "璇烽�夋嫨",
},
- rules: z.number().optional(),
+ rules: z.number().default(3),
},
{
fieldName: "colorCode",
@@ -425,11 +426,8 @@
];
}
-/** 宸ヨ壓璺嚎浜у搧琛ㄥ崟锛沵ultiple = true锛堟柊澧炴ā寮忥級鏃朵骇鍝佸彲澶氶�夛紝涓�娆℃�х粦瀹氬涓� */
-export function useRouteProductFormSchema(
- onItemChange?: (item: any) => void,
- multiple = false,
-): VbenFormSchema[] {
+/** 宸ヨ壓璺嚎浜у搧琛ㄥ崟 */
+export function useRouteProductFormSchema(onItemChange?: (item: any) => void): VbenFormSchema[] {
return [
{
fieldName: "id",
@@ -441,29 +439,17 @@
component: "Input",
dependencies: { triggerFields: [""], show: () => false },
},
- // 鏂板锛堝閫夛級锛氫竴娆$粦瀹氬涓骇鍝侊紱缂栬緫锛堝崟閫夛級锛歝hange 鍥炲~缂栫爜/鍚嶇О/瑙勬牸/鍗曚綅
- multiple
- ? {
- fieldName: "itemIds",
- label: "浜у搧锛堝彲澶氶�夛級",
- component: markRaw(MdItemSelect),
- componentProps: {
- multiple: true,
- placeholder: "璇烽�夋嫨瑕佺粦瀹氱殑浜у搧锛堝彲澶氶�夛級",
- },
- formItemClass: "col-span-2",
- rules: "selectRequired",
- }
- : {
- fieldName: "itemId",
- label: "浜у搧",
- component: markRaw(MdItemSelect),
- componentProps: {
- onChange: onItemChange,
- },
- formItemClass: "col-span-2",
- rules: "selectRequired",
- },
+ // 浜у搧鐗╂枡锛氫娇鐢ㄤ笟鍔¤嚜瀹氫箟閫夋嫨鍣紝change 鍥炲~缂栫爜/鍚嶇О/瑙勬牸/鍗曚綅
+ {
+ fieldName: "itemId",
+ label: "浜у搧",
+ component: markRaw(MdItemSelect),
+ componentProps: {
+ onChange: onItemChange,
+ },
+ formItemClass: "col-span-2",
+ rules: "selectRequired",
+ },
{
fieldName: "quantity",
label: "鐢熶骇鏁伴噺",
diff --git a/src/views/mes/process-design/route/index.vue b/src/views/mes/process-design/route/index.vue
index 8bc13e0..8790889 100644
--- a/src/views/mes/process-design/route/index.vue
+++ b/src/views/mes/process-design/route/index.vue
@@ -8,19 +8,26 @@
import { getDictLabel } from '@vben/hooks';
import { downloadFileFromBlobPart } from '@vben/utils';
-import { Button, message, Tooltip } from 'ant-design-vue';
+import { Alert, Button, message, Tooltip } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
deleteRoute,
exportRoute,
getRoutePage,
+ importRoute,
+ importRouteTemplate,
+ importCompleteRoute,
+ importCompleteRouteTemplate,
updateRouteStatus,
} from '#/api/mes/pro/route';
import { $t } from '#/locales';
+import ImportModalComponent from '#/components/import-modal';
+
import { useGridColumns, useGridFormSchema } from './data';
-import Form from './modules/form.vue';
+// 宸ヨ壓璁捐涓庣敓浜у熀纭�鏁版嵁鍏辩敤鍚屼竴涓厤缃櫒锛岄伩鍏嶄袱濂楅〉闈㈣兘鍔涗笉涓�鑷淬��
+import Form from '#/views/mes/pro/route/modules/route-configurator.vue';
const { hasAccessByCodes } = useAccess();
const statusEditable = hasAccessByCodes(['mes:pro-route:update']); // 鏄惁鍙垏鎹㈢姸鎬�
@@ -30,9 +37,38 @@
destroyOnClose: true,
});
+const [ImportModal, importModalApi] = useVbenModal({
+ connectedComponent: ImportModalComponent,
+ destroyOnClose: true,
+});
+
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
gridApi.query();
+}
+
+/** 瀵煎叆宸ヨ壓璺嚎 */
+function handleImport() {
+ importModalApi
+ .setData({
+ title: $t('ui.actionTitle.import', ['宸ヨ壓璺嚎']),
+ fileName: '宸ヨ壓璺嚎瀵煎叆妯℃澘.xls',
+ importFn: importRoute,
+ templateFn: importRouteTemplate,
+ })
+ .open();
+}
+
+function handleCompleteImport() {
+ importModalApi
+ .setData({
+ title: '鎵归噺瀵煎叆瀹屾暣宸ヨ壓璺嚎',
+ fileName: '瀹屾暣宸ヨ壓璺嚎瀵煎叆妯℃澘.xlsx',
+ importFn: importCompleteRoute,
+ templateFn: importCompleteRouteTemplate,
+ showUpdateSupport: false,
+ })
+ .open();
}
/** 鍒涘缓宸ヨ壓璺嚎 */
@@ -57,7 +93,9 @@
): Promise<boolean | undefined> {
try {
await confirm(
- `纭瑕佸皢"${row.name}"宸ヨ壓璺嚎鍒囨崲涓恒��${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}銆戝悧锛焋,
+ newStatus === CommonStatusEnum.ENABLE
+ ? `纭鍚敤鈥�${row.name}鈥濆悧锛熺郴缁熷皢妫�鏌ヤ骇鍑哄叆搴撲綅缃�佸伐搴忎骇鍑哄拰宸ュ簭鎶曟枡鏄惁瀹屾暣銆俙
+ : `纭瑕佸皢鈥�${row.name}鈥濆伐鑹鸿矾绾垮垏鎹负銆�${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}銆戝悧锛焋,
);
} catch {
return false;
@@ -118,6 +156,14 @@
<template>
<Page auto-content-height><FormModal @success="handleRefresh" />
+ <ImportModal @success="handleRefresh" />
+ <Alert
+ class="mb-3"
+ message="璺嚎閰嶇疆椤哄簭"
+ description="鍩烘湰淇℃伅 鈫� 浜у嚭浜у搧鍙婂叆搴撲粨 鈫� 宸ュ簭鍙婂悇宸ュ簭浜у嚭 鈫� 宸ュ簭鎶曟枡 鈫� 鏍¢獙鍚敤"
+ show-icon
+ type="info"
+ />
<Grid table-title="宸ヨ壓璺嚎鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -136,6 +182,20 @@
auth: ['mes:pro-route:export'],
onClick: handleExport,
},
+ {
+ label: $t('ui.actionTitle.import', ['宸ヨ壓璺嚎']),
+ type: 'primary',
+ icon: ACTION_ICON.UPLOAD,
+ auth: ['mes:pro-route:import'],
+ onClick: handleImport,
+ },
+ {
+ label: '鎵归噺瀵煎叆瀹屾暣璺嚎',
+ type: 'primary',
+ icon: ACTION_ICON.UPLOAD,
+ auth: ['mes:pro-route:import'],
+ onClick: handleCompleteImport,
+ },
]"
/>
</template>
diff --git a/src/views/mes/process-design/route/modules/form.vue b/src/views/mes/process-design/route/modules/form.vue
index cf73e0e..8c0c230 100644
--- a/src/views/mes/process-design/route/modules/form.vue
+++ b/src/views/mes/process-design/route/modules/form.vue
@@ -2,28 +2,24 @@
import type { FormType } from '../data';
import type { MesProRouteApi } from '#/api/mes/pro/route';
-import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
import { computed, ref } from 'vue';
-import { confirm, useVbenModal } from '@vben/common-ui';
+import { useVbenModal } from '@vben/common-ui';
-import { Button, Divider, message, Select } from 'ant-design-vue';
+import { message, TabPane, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { createRoute, getRoute, updateRoute } from '#/api/mes/pro/route';
-import {
- deleteRouteProduct,
- getRouteProductListByRoute,
-} from '#/api/mes/pro/route/product';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
-import ProductForm from './product-form.vue';
-import Workbench from './workbench.vue';
+import ProcessList from './process-list.vue';
+import ProductList from './product-list.vue';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create'); // 琛ㄥ崟妯″紡
+const subTab = ref('process'); // 褰撳墠婵�娲荤殑瀛愯〃 Tab
const formData = ref<MesProRouteApi.Route>();
const isDetail = computed(() => formType.value === 'detail'); // 鏄惁鏌ョ湅妯″紡
@@ -36,72 +32,6 @@
: $t('ui.actionTitle.create', ['宸ヨ壓璺嚎']);
});
-// ==================== 浜у搧缁戝畾 ====================
-const products = ref<MesProRouteProductApi.RouteProduct[]>([]); // 鍏宠仈浜у搧鍒楄〃
-const selectedProductItemId = ref<number>(); // 褰撳墠閫変腑鐨勪骇鍝佺墿鏂欑紪鍙�
-const selectedProduct = computed(() =>
- products.value.find((item) => item.itemId === selectedProductItemId.value),
-);
-const productOptions = computed(() =>
- products.value.map((item) => ({ label: item.itemName, value: item.itemId })),
-);
-
-async function loadProducts() {
- const routeId = formData.value?.id;
- if (!routeId) {
- products.value = [];
- return;
- }
- products.value = (await getRouteProductListByRoute(routeId)) || [];
- if (
- !products.value.some((item) => item.itemId === selectedProductItemId.value)
- ) {
- selectedProductItemId.value = products.value[0]?.itemId;
- }
-}
-
-const [ProductFormModal, productFormModalApi] = useVbenModal({
- connectedComponent: ProductForm,
- destroyOnClose: true,
-});
-
-/** 鎵撳紑浜у搧寮圭獥锛堢粦瀹� / 缂栬緫锛� */
-function openProductForm(row?: MesProRouteProductApi.RouteProduct) {
- if (!formData.value?.id) {
- return;
- }
- productFormModalApi
- .setData(
- row
- ? { id: row.id, routeId: formData.value.id }
- : {
- routeId: formData.value.id,
- boundItemIds: products.value
- .map((item) => item.itemId)
- .filter((id): id is number => id != null),
- },
- )
- .open();
-}
-
-/** 绉婚櫎浜у搧锛堜細绾ц仈鍒犻櫎璇ヤ骇鍝佺殑鎶曞叆鐗╂枡閰嶇疆锛� */
-async function handleRemoveProduct() {
- if (!selectedProduct.value?.id) {
- return;
- }
- try {
- await confirm(
- `纭灏嗕骇鍝併��${selectedProduct.value.itemName}銆嶄粠璇ュ伐鑹鸿矾绾跨Щ闄わ紵鍏跺叏閮ㄦ姇鍏ョ墿鏂欓厤缃皢涓�骞跺垹闄ゃ�俙,
- );
- } catch {
- return;
- }
- await deleteRouteProduct(selectedProduct.value.id);
- message.success($t('ui.actionMessage.operationSuccess'));
- await loadProducts();
-}
-
-// ==================== 鍩烘湰淇℃伅琛ㄥ崟 ====================
const [Form, formApi] = useVbenForm({
commonConfig: {
componentProps: { class: 'w-full' },
@@ -129,12 +59,11 @@
const data = (await formApi.getValues()) as MesProRouteApi.Route;
try {
if (formType.value === 'create') {
- // 鏂板鎴愬姛鍚庡垏鍒扮紪杈戞ā寮忥紝杩涘叆銆屼骇鍝佷笌宸ュ簭閰嶇疆銆嶅伐浣滃彴
+ // 鏂板鎴愬姛鍚庡垏鍒扮紪杈戞ā寮忥紝鏂逛究缁х画缁存姢缁勬垚宸ュ簭銆佸叧鑱斾骇鍝�
const id = await createRoute(data);
formData.value = { ...data, id };
await formApi.setFieldValue('id', id);
formType.value = 'update';
- await loadProducts();
} else {
await updateRoute(data);
formData.value = { ...formData.value, ...data };
@@ -153,11 +82,10 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
- products.value = [];
- selectedProductItemId.value = undefined;
return;
}
formApi.setState({ schema: useFormSchema(formApi) });
+ subTab.value = 'process';
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{ formType: FormType; id?: number }>();
formType.value = data.formType;
@@ -171,7 +99,6 @@
formData.value = await getRoute(data.id);
// 璁剧疆鍒� values
await formApi.setValues(formData.value);
- await loadProducts();
} finally {
modalApi.unlock();
}
@@ -180,49 +107,20 @@
</script>
<template>
- <Modal :title="getTitle" class="w-11/12">
+ <Modal :title="getTitle" class="w-4/5">
<Form class="mx-4" />
- <!-- 缂栬緫/璇︽儏妯″紡涓嬪睍绀恒�屼骇鍝佷笌宸ュ簭閰嶇疆銆嶅伐浣滃彴锛屾柊澧炴ā寮忎笅闅愯棌 -->
- <template v-if="formData?.id">
- <div class="mx-4 mt-4">
- <Divider class="!my-2" orientation="left">
- <span class="text-sm">浜у搧涓庡伐搴忛厤缃�</span>
- </Divider>
- <div class="flex flex-wrap items-center gap-3">
- <span class="shrink-0 text-sm font-medium">鐢熶骇浜у搧</span>
- <Select
- v-model:value="selectedProductItemId"
- class="!w-64"
- allow-clear
- :disabled="isDetail"
- placeholder="璇烽�夋嫨鎴栫粦瀹氫骇鍝�"
- :options="productOptions"
- />
- <template v-if="!isDetail">
- <Button type="primary" @click="openProductForm()"> 缁戝畾浜у搧 </Button>
- <Button
- :disabled="!selectedProduct"
- @click="openProductForm(selectedProduct)"
- >
- 缂栬緫浜у搧
- </Button>
- <Button danger :disabled="!selectedProduct" @click="handleRemoveProduct">
- 绉婚櫎浜у搧
- </Button>
- </template>
- </div>
- <p v-if="products.length === 0" class="mt-2 text-xs text-gray-400">
- 鍏堢粦瀹氳鐢熶骇鐨勭墿鏂欙紝鍐嶄负姣忛亾宸ュ簭閰嶇疆銆屾姇鍏� + 浜у嚭銆�
- </p>
- <div class="mt-3">
- <Workbench
- :form-type="formType"
- :product="selectedProduct"
- :route-id="formData.id"
- />
- </div>
- </div>
- </template>
+ <!-- 缂栬緫/璇︽儏妯″紡涓嬪睍绀哄瓙琛� Tab锛屾柊澧炴ā寮忎笅闅愯棌 -->
+ <Tabs
+ v-if="formType !== 'create' && formData?.id"
+ v-model:active-key="subTab"
+ class="mx-4 mt-4"
+ >
+ <TabPane key="process" tab="缁勬垚宸ュ簭">
+ <ProcessList :form-type="formType" :route-id="formData.id" />
+ </TabPane>
+ <TabPane key="product" tab="鍏宠仈浜у搧">
+ <ProductList :form-type="formType" :route-id="formData.id" />
+ </TabPane>
+ </Tabs>
</Modal>
- <ProductFormModal @success="loadProducts" />
-</template>
\ No newline at end of file
+</template>
diff --git a/src/views/mes/process-design/route/modules/process-form.vue b/src/views/mes/process-design/route/modules/process-form.vue
index 6dcab06..b742c63 100644
--- a/src/views/mes/process-design/route/modules/process-form.vue
+++ b/src/views/mes/process-design/route/modules/process-form.vue
@@ -31,7 +31,7 @@
commonConfig: {
componentProps: { class: 'w-full' },
formItemClass: 'col-span-1',
- labelWidth: 150,
+ labelWidth: 130,
},
layout: 'horizontal',
schema: [],
diff --git a/src/views/mes/process-design/route/modules/product-form.vue b/src/views/mes/process-design/route/modules/product-form.vue
index e20baa6..a3b0e5d 100644
--- a/src/views/mes/process-design/route/modules/product-form.vue
+++ b/src/views/mes/process-design/route/modules/product-form.vue
@@ -5,7 +5,7 @@
import { useVbenModal } from '@vben/common-ui';
-import { message } from 'ant-design-vue';
+import { Divider, message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import {
@@ -16,17 +16,17 @@
import { $t } from '#/locales';
import { useRouteProductFormSchema } from '../data';
+import ProductBomList from './product-bom-list.vue';
const emit = defineEmits(['success']);
const formData = ref<MesProRouteProductApi.RouteProduct>();
-const boundItemIds = ref<number[]>([]); // 宸茬粦瀹氭湰璺嚎鐨勪骇鍝佺墿鏂欑紪鍙凤紙鏂板澶氶�夋椂璺宠繃锛�
const getTitle = computed(() =>
formData.value?.id
? $t('ui.actionTitle.edit', ['宸ヨ壓璺嚎浜у搧'])
: $t('ui.actionTitle.create', ['宸ヨ壓璺嚎浜у搧']),
);
-/** MdItemSelect 鍗曢�� change 鍥炶皟锛氭妸鐗╂枡缂栫爜/鍚嶇О/瑙勬牸/鍗曚綅鍥炲~鍒� form */
+/** MdItemSelect change 鍥炶皟锛氭妸鐗╂枡缂栫爜/鍚嶇О/瑙勬牸/鍗曚綅鍥炲~鍒� form */
async function handleItemChange(item?: any) {
if (!item) {
return;
@@ -58,62 +58,22 @@
return;
}
modalApi.lock();
- const data = (await formApi.getValues()) as MesProRouteProductApi.RouteProduct & {
- itemIds?: number[];
- };
+ // 鎻愪氦琛ㄥ崟
+ const data =
+ (await formApi.getValues()) as MesProRouteProductApi.RouteProduct;
try {
- // 缂栬緫妯″紡锛氭洿鏂板崟涓骇鍝�
if (formData.value?.id) {
await updateRouteProduct(data);
- await modalApi.close();
- emit('success');
- message.success($t('ui.actionMessage.operationSuccess'));
- return;
+ // 鐢ㄦ渶鏂拌〃鍗曞�煎悓姝� formData锛岀‘淇濅骇鍝� BOM 瀛愯〃缁戝畾鐨� itemId 涓庤〃鍗曚竴鑷�
+ formData.value = { ...formData.value, ...data };
+ } else {
+ // 鏂板鎴愬姛鍚庡垏鎹㈠埌缂栬緫妯″紡锛屾柟渚跨户缁淮鎶や骇鍝� BOM
+ const id = await createRouteProduct(data);
+ formData.value = { ...data, id };
+ await formApi.setFieldValue('id', id);
}
- // 鏂板妯″紡锛氬閫変骇鍝佷竴娆℃�х粦瀹氾紝璺宠繃宸插湪璺嚎涓殑浜у搧
- const itemIds = Array.isArray(data.itemIds) ? data.itemIds : [];
- if (itemIds.length === 0) {
- message.warning('璇疯嚦灏戦�夋嫨涓�涓骇鍝�');
- return;
- }
- let created = 0;
- let skipped = 0;
- const failedIds: number[] = [];
- for (const itemId of itemIds) {
- if (itemId == null) {
- continue;
- }
- if (boundItemIds.value.includes(itemId)) {
- skipped++;
- continue;
- }
- try {
- await createRouteProduct({
- routeId: data.routeId,
- itemId,
- quantity: data.quantity,
- productionTime: data.productionTime,
- timeUnitType: data.timeUnitType,
- remark: data.remark,
- });
- created++;
- } catch {
- failedIds.push(itemId);
- }
- }
- if (skipped > 0) {
- message.warning(`宸茶烦杩� ${skipped} 涓凡缁戝畾鐨勪骇鍝乣);
- }
- if (failedIds.length > 0) {
- message.error(
- `鏈� ${failedIds.length} 涓骇鍝佺粦瀹氬け璐ワ紙鍙兘宸茶鍏跺畠宸ヨ壓璺嚎鍗犵敤锛塦,
- );
- }
- if (created > 0) {
- message.success(`鎴愬姛缁戝畾 ${created} 涓骇鍝乣);
- await modalApi.close();
- emit('success');
- }
+ emit('success');
+ message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}
@@ -121,42 +81,24 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
- boundItemIds.value = [];
return;
}
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{
id?: number;
routeId: number;
- boundItemIds?: number[];
}>();
if (!data) {
return;
}
- boundItemIds.value = data.boundItemIds || [];
if (!data.id) {
- // 鏂板妯″紡锛氬閫変骇鍝佺粦瀹�
- formData.value = undefined;
- await formApi.setState({
- schema: useRouteProductFormSchema(handleItemChange, true),
- });
- await formApi.setValues({
- routeId: data.routeId,
- itemIds: [],
- quantity: 1,
- productionTime: 1,
- timeUnitType: 'MINUTE',
- remark: undefined,
- });
+ await formApi.setValues({ routeId: data.routeId });
return;
}
- // 缂栬緫妯″紡锛氬姞杞藉崟涓骇鍝佸洖濉�
modalApi.lock();
try {
formData.value = await getRouteProduct(data.id);
- await formApi.setState({
- schema: useRouteProductFormSchema(handleItemChange, false),
- });
+ // 璁剧疆鍒� values
await formApi.setValues(formData.value);
} finally {
modalApi.unlock();
@@ -166,7 +108,18 @@
</script>
<template>
- <Modal :title="getTitle" class="w-2/5">
+ <Modal :title="getTitle" class="w-3/5">
<Form class="mx-4" />
+ <!-- 缂栬緫妯″紡涓嬪睍绀轰骇鍝� BOM 瀛愯〃锛屾柊澧炴ā寮忎笅闅愯棌 -->
+ <template v-if="formData?.id && formData?.itemId">
+ <Divider class="!my-3" orientation="left">浜у搧 BOM 閰嶇疆</Divider>
+ <div class="mx-4">
+ <ProductBomList
+ :route-id="formData.routeId!"
+ :product-id="formData.itemId"
+ :product-name="formData.itemName"
+ />
+ </div>
+ </template>
</Modal>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.3