From 2117eaf4a19d602b6d5a0fb5bbefa52ef8f5ff76 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 02 九月 2026 09:28:09 +0800
Subject: [PATCH] feat(mes): 工作台领料新增物料仅展示当前工单 BOM 物料
---
src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue | 46 +++++++++++++++++++++++
src/views/mes/md/item/components/select-dialog.vue | 3 +
src/api/mes/wm/productissue/line/index.ts | 18 +++++++++
3 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/src/api/mes/wm/productissue/line/index.ts b/src/api/mes/wm/productissue/line/index.ts
index 45167c2..285d37a 100644
--- a/src/api/mes/wm/productissue/line/index.ts
+++ b/src/api/mes/wm/productissue/line/index.ts
@@ -17,6 +17,16 @@
batchId?: number; // 鎵规缂栧彿
remark?: string; // 澶囨敞
}
+
+ /** 棰嗘枡鍑哄簱鍗曞彲棰嗙墿鏂欙紙褰撳墠宸ュ崟 BOM 鐗╂枡锛� */
+ export interface BomItem {
+ itemId?: number; // 鐗╂枡缂栧彿
+ itemCode?: string; // 鐗╂枡缂栫爜
+ itemName?: string; // 鐗╂枡鍚嶇О
+ itemSpecification?: string; // 瑙勬牸鍨嬪彿
+ unitMeasureName?: string; // 鍗曚綅鍚嶇О
+ requiredQuantity?: number; // 宸ュ崟 BOM 闇�姹傞噺
+ }
}
/** 鏌ヨ棰嗘枡鍑哄簱鍗曡鍒嗛〉 */
@@ -51,3 +61,11 @@
export function deleteProductIssueLine(id: number) {
return requestClient.delete(`/mes/wm/product-issue-line/delete?id=${id}`);
}
+
+/** 鏌ヨ棰嗘枡鍑哄簱鍗曞彲棰嗙墿鏂欏垪琛紙褰撳墠宸ュ崟 BOM 鐗╂枡锛� */
+export function getBomItemList(issueId: number) {
+ return requestClient.get<MesWmProductIssueLineApi.BomItem[]>(
+ '/mes/wm/product-issue-line/bom-item-list',
+ { params: { issueId } },
+ );
+}
diff --git a/src/views/mes/md/item/components/select-dialog.vue b/src/views/mes/md/item/components/select-dialog.vue
index d377f66..fe17e92 100644
--- a/src/views/mes/md/item/components/select-dialog.vue
+++ b/src/views/mes/md/item/components/select-dialog.vue
@@ -140,7 +140,8 @@
};
// 闄愬畾鍙�夌墿鏂欒寖鍥�
if (productIds.value.length > 0) {
- params.pageSize = 1000;
+ // 鍚庣鍒嗛〉姣忛〉鏉℃暟涓婇檺涓� 200锛岀櫧鍚嶅崟鍦烘櫙涓�娆℃媺鍙栧敖閲忓鐨勫彲閫夌墿鏂�
+ params.pageSize = 200;
params.ids = productIds.value.join(',');
}
const result = await getItemPage(params as never);
diff --git a/src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue b/src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue
index 78f182f..89f0827 100644
--- a/src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue
+++ b/src/views/mes/workbench/components/tabs/ProductIssueLineFormModal.vue
@@ -11,6 +11,7 @@
import { useVbenForm } from '#/adapter/form';
import {
createProductIssueLine,
+ getBomItemList,
getProductIssueLine,
updateProductIssueLine,
} from '#/api/mes/wm/productissue/line';
@@ -19,6 +20,37 @@
const emit = defineEmits(['success']);
const formData = ref<MesWmProductIssueLineApi.ProductIssueLine>();
const issueId = ref<number>();
+/** 褰撳墠宸ュ崟 BOM 鍙鐗╂枡 ID 鐧藉悕鍗曪紙涓虹┖鏃堕�夋嫨鍣ㄥ睍绀哄叏閲忕墿鏂欙級 */
+const bomItemIds = ref<number[]>([]);
+
+/**
+ * 鑾峰彇褰撳墠棰嗘枡鍗曞搴斿伐鍗� BOM 鐨勫彲棰嗙墿鏂� ID 鍒楄〃
+ * 浠呮柊澧�/缂栬緫鐗╂枡鏃舵煡璇㈠綋鍓嶈鍗曟墍闇�鐗╂枡锛屽叾浠栫墿鏂欎笉灞曠ず
+ */
+async function loadBomItemIds() {
+ if (!issueId.value) {
+ bomItemIds.value = [];
+ return;
+ }
+ try {
+ const bomItems = await getBomItemList(issueId.value);
+ bomItemIds.value = (bomItems ?? [])
+ .map((item) => item.itemId)
+ .filter((id): id is number => id != null);
+ } catch {
+ bomItemIds.value = [];
+ }
+}
+
+/** 鏇存柊鐗╂枡閫夋嫨鍣ㄧ殑鍙�夎寖鍥达紝浠呭睍绀哄綋鍓嶅伐鍗� BOM 鐗╂枡 */
+async function applyBomItemScope() {
+ await formApi.updateSchema([
+ {
+ fieldName: 'itemId',
+ componentProps: { productIds: bomItemIds.value },
+ },
+ ]);
+}
const getTitle = computed(() => {
return formData.value?.id ? '缂栬緫鐗╂枡' : '娣诲姞鐗╂枡';
@@ -87,17 +119,31 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
+ bomItemIds.value = [];
+ // 鍏抽棴鏃舵仮澶嶉�夋嫨鍣ㄤ负涓嶉檺瀹氳寖鍥�
+ await applyBomItemScope();
return;
}
const data = modalApi.getData<{ id?: number; issueId: number }>();
issueId.value = data.issueId;
+ // 鍔犺浇褰撳墠宸ュ崟 BOM 鍙鐗╂枡鑼冨洿
+ await loadBomItemIds();
if (!data.id) {
await formApi.resetForm();
+ await applyBomItemScope();
return;
}
modalApi.lock();
try {
formData.value = await getProductIssueLine(data.id);
+ // 缂栬緫鍦烘櫙锛氳嫢褰撳墠鐗╂枡涓嶅湪 BOM 鑼冨洿鍐咃紙鍘嗗彶鏁版嵁锛夛紝骞跺叆鐧藉悕鍗曚繚璇佸彲鍥炴樉鍙��
+ if (
+ formData.value?.itemId != null &&
+ !bomItemIds.value.includes(formData.value.itemId)
+ ) {
+ bomItemIds.value = [...bomItemIds.value, formData.value.itemId];
+ }
+ await applyBomItemScope();
await formApi.setValues(formData.value);
} finally {
modalApi.unlock();
--
Gitblit v1.9.3