From e1e28c3b0a9520932d5c3e0234e00294c0233d4c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 05 十一月 2026 13:37:31 +0800
Subject: [PATCH] feat(product-issue): 支持按任务工序校验和选择领料物料
---
src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue | 40 ++++++++++++++-----
src/api/mes/pro/workorder/bom/index.ts | 8 ++++
src/views/mes/pro/task/modules/schedule-form.vue | 37 +-----------------
3 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/src/api/mes/pro/workorder/bom/index.ts b/src/api/mes/pro/workorder/bom/index.ts
index 2f78a1b..0c4ac3a 100644
--- a/src/api/mes/pro/workorder/bom/index.ts
+++ b/src/api/mes/pro/workorder/bom/index.ts
@@ -60,3 +60,11 @@
`/mes/pro/work-order-bom/item-list-by-work-order-id?workOrderId=${workOrderId}`,
);
}
+
+/** 鏌ヨ鐢熶骇浠诲姟鎵�鍦ㄥ伐搴忕殑鎶曞叆鐗╂枡 */
+export function getWorkOrderBomListByTaskId(taskId: number) {
+ return requestClient.get<MesProWorkOrderBomApi.WorkOrderBom[]>(
+ '/mes/pro/work-order-bom/list-by-task-id',
+ { params: { taskId } },
+ );
+}
diff --git a/src/views/mes/pro/task/modules/schedule-form.vue b/src/views/mes/pro/task/modules/schedule-form.vue
index c14e0bd..ef8ca89 100644
--- a/src/views/mes/pro/task/modules/schedule-form.vue
+++ b/src/views/mes/pro/task/modules/schedule-form.vue
@@ -6,17 +6,16 @@
import { useVbenModal } from '@vben/common-ui';
-import { Button, Card, message, Popconfirm, Steps } from 'ant-design-vue';
+import { Card, message, Steps } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { getRouteProcessListByProduct } from '#/api/mes/pro/route/process';
-import { finishWorkOrder, getWorkOrder } from '#/api/mes/pro/workorder';
+import { getWorkOrder } from '#/api/mes/pro/workorder';
import { getWorkOrderProcessListByWorkOrderId } from '#/api/mes/pro/workorder/process';
import { useScheduleFormSchema } from '../data';
import TaskList from './task-list.vue';
-const emit = defineEmits(['success']);
const formType = ref<'detail' | 'schedule'>('schedule');
const workOrder = ref<MesProWorkOrderApi.WorkOrder>(); // 褰撳墠璁㈠崟璇︽儏
/** 鎺掍骇宸ュ簭鍒楄〃 */
@@ -63,22 +62,6 @@
routeProcessList.value = [...woProcesses].toSorted(
(a, b) => (a.sort ?? 0) - (b.sort ?? 0),
);
-}
-
-/** 瀹屾垚璁㈠崟 */
-async function handleFinish() {
- if (!workOrder.value?.id) {
- return;
- }
- modalApi.lock();
- try {
- await finishWorkOrder(workOrder.value.id);
- message.success('璁㈠崟宸插畬鎴�');
- await modalApi.close();
- emit('success');
- } finally {
- modalApi.unlock();
- }
}
const [Modal, modalApi] = useVbenModal({
@@ -150,22 +133,6 @@
/>
</Card>
</template>
- </template>
- <template #prepend-footer>
- <div class="flex flex-auto items-center gap-2">
- <template v-if="formType === 'schedule'">
- <Popconfirm
- v-if="routeProcessList.length > 0"
- title="纭瑕佸畬鎴愯璁㈠崟鍚楋紵瀹屾垚鍚庤鍗曚笅鎵�鏈変换鍔″皢鏍囪涓哄凡瀹屾垚銆�"
- @confirm="handleFinish"
- >
- <Button type="primary">瀹屾垚</Button>
- </Popconfirm>
- <span v-else class="text-gray-400 text-sm">
- 褰撳墠璁㈠崟鏈厤缃伐搴忥紝璇峰厛鍦ㄥ伐鍗曚腑缁存姢宸ュ簭淇℃伅鍚庡啀瀹屾垚
- </span>
- </template>
- </div>
</template>
</Modal>
</template>
diff --git a/src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue b/src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue
index 78f182f..d67d83f 100644
--- a/src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue
+++ b/src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue
@@ -2,19 +2,20 @@
import type { VbenFormSchema } from '#/adapter/form';
import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
-import { computed, markRaw, ref } from 'vue';
+import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
+import { getWorkOrderBomListByTaskId } from '#/api/mes/pro/workorder/bom';
+import { getProductIssue } from '#/api/mes/wm/productissue';
import {
createProductIssueLine,
getProductIssueLine,
updateProductIssueLine,
} from '#/api/mes/wm/productissue/line';
-import { MdItemSelect } from '#/views/mes/md/item/components';
const emit = defineEmits(['success']);
const formData = ref<MesWmProductIssueLineApi.ProductIssueLine>();
@@ -25,13 +26,18 @@
});
/** 鐗╂枡琛岃〃鍗� schema */
-function buildLineFormSchema(): VbenFormSchema[] {
+function buildLineFormSchema(options: { label: string; value: number }[] = []): VbenFormSchema[] {
return [
{
fieldName: 'itemId',
label: '浜у搧鐗╂枡',
- component: markRaw(MdItemSelect),
- componentProps: { placeholder: '璇烽�夋嫨浜у搧鐗╂枡' },
+ component: 'Select',
+ componentProps: {
+ options,
+ showSearch: true,
+ optionFilterProp: 'label',
+ placeholder: options.length ? '璇烽�夋嫨褰撳墠宸ュ簭鐗╂枡' : '璇峰厛缁存姢褰撳墠宸ュ簭鎶曞叆鐗╂枡',
+ },
rules: 'selectRequired',
},
{
@@ -91,14 +97,26 @@
}
const data = modalApi.getData<{ id?: number; issueId: number }>();
issueId.value = data.issueId;
- if (!data.id) {
- await formApi.resetForm();
- return;
- }
modalApi.lock();
try {
- formData.value = await getProductIssueLine(data.id);
- await formApi.setValues(formData.value);
+ const issue = await getProductIssue(data.issueId);
+ const boms = issue.taskId ? await getWorkOrderBomListByTaskId(issue.taskId) : [];
+ const optionMap = new Map<number, { label: string; value: number }>();
+ for (const item of boms) {
+ if (item.itemId != null) {
+ optionMap.set(item.itemId, {
+ value: item.itemId,
+ label: `${item.itemCode ?? ''} ${item.itemName ?? ''}`.trim(),
+ });
+ }
+ }
+ const options = [...optionMap.values()];
+ await formApi.updateSchema(buildLineFormSchema(options));
+ await formApi.resetForm();
+ if (data.id) {
+ formData.value = await getProductIssueLine(data.id);
+ await formApi.setValues(formData.value);
+ }
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3