From 7cf040285e74c2c3b9ee011abdab15021d139c30 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 17 七月 2026 11:16:03 +0800
Subject: [PATCH] 领料传参修改
---
src/views/wls/productissue/data.ts | 2 +-
src/views/wls/materialstock/components/select-dialog.vue | 4 +++-
src/api/mes/wm/productissue/detail/index.ts | 1 +
src/views/wls/materialstock/components/select.vue | 3 +++
src/api/mes/wm/productissue/line/index.ts | 1 +
src/views/wls/productissue/modules/detail-form.vue | 8 ++++++++
src/views/wls/productissue/modules/line-list.vue | 4 ++--
7 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/api/mes/wm/productissue/detail/index.ts b/src/api/mes/wm/productissue/detail/index.ts
index 6f7cbc1..e759b45 100644
--- a/src/api/mes/wm/productissue/detail/index.ts
+++ b/src/api/mes/wm/productissue/detail/index.ts
@@ -8,6 +8,7 @@
lineId?: number; // 棰嗘枡鍗曡缂栧彿
materialStockId?: number; // 搴撳瓨璁板綍缂栧彿
itemId?: number; // 鐗╂枡缂栧彿
+ mdmItemId?: number; // MDM鐗╂枡缂栧彿
quantity?: number; // 鏁伴噺
batchId?: number; // 鎵规缂栧彿
batchCode?: string; // 鎵规鍙�
diff --git a/src/api/mes/wm/productissue/line/index.ts b/src/api/mes/wm/productissue/line/index.ts
index 26112d8..45167c2 100644
--- a/src/api/mes/wm/productissue/line/index.ts
+++ b/src/api/mes/wm/productissue/line/index.ts
@@ -8,6 +8,7 @@
id?: number; // 琛岀紪鍙�
issueId?: number; // 棰嗘枡鍗曠紪鍙�
itemId?: number; // 鐗╂枡缂栧彿
+ mdmItemId?: number; // MDM鐗╂枡缂栧彿
itemCode?: string; // 鐗╂枡缂栫爜
itemName?: string; // 鐗╂枡鍚嶇О
specification?: string; // 瑙勬牸鍨嬪彿
diff --git a/src/views/wls/materialstock/components/select-dialog.vue b/src/views/wls/materialstock/components/select-dialog.vue
index 6e0de0e..477359d 100644
--- a/src/views/wls/materialstock/components/select-dialog.vue
+++ b/src/views/wls/materialstock/components/select-dialog.vue
@@ -19,12 +19,14 @@
defineProps<{
batchId?: number;
itemId?: number;
+ mdmItemId?: number;
virtualFilter?: VirtualFilter;
warehouseId?: number;
}>(),
{
batchId: undefined,
itemId: undefined,
+ mdmItemId: undefined,
virtualFilter: 'exclude',
warehouseId: undefined,
},
@@ -159,7 +161,7 @@
// 榛樿鏌ユ湭鍐荤粨
frozen: false,
itemTypeId: searchItemTypeId.value,
- itemId: formValues.itemId ?? props.itemId,
+ itemId: formValues.mdmItemId ?? props.mdmItemId,
warehouseId: formValues.warehouseId ?? props.warehouseId,
virtualFilter:
props.virtualFilter === 'all' ? undefined : props.virtualFilter,
diff --git a/src/views/wls/materialstock/components/select.vue b/src/views/wls/materialstock/components/select.vue
index ea05867..cbd0599 100644
--- a/src/views/wls/materialstock/components/select.vue
+++ b/src/views/wls/materialstock/components/select.vue
@@ -19,6 +19,7 @@
batchId?: number;
disabled?: boolean;
itemId?: number;
+ mdmItemId?: number;
modelValue?: number;
placeholder?: string;
virtualFilter?: 'all' | 'exclude' | 'only';
@@ -29,6 +30,7 @@
batchId: undefined,
disabled: false,
itemId: undefined,
+ mdmItemId: undefined,
modelValue: undefined,
placeholder: '璇烽�夋嫨搴撳瓨',
virtualFilter: 'exclude',
@@ -151,6 +153,7 @@
ref="dialogRef"
:batch-id="batchId"
:item-id="itemId"
+ :mdm-item-id="mdmItemId"
:virtual-filter="virtualFilter"
:warehouse-id="warehouseId"
@selected="handleSelected"
diff --git a/src/views/wls/productissue/data.ts b/src/views/wls/productissue/data.ts
index 3fe3931..28f37ed 100644
--- a/src/views/wls/productissue/data.ts
+++ b/src/views/wls/productissue/data.ts
@@ -399,7 +399,7 @@
dependencies: {
triggerFields: ['itemId'],
componentProps: (values) => ({
- itemId: values.itemId,
+ mdmItemId: values.itemId,
}),
},
},
diff --git a/src/views/wls/productissue/modules/detail-form.vue b/src/views/wls/productissue/modules/detail-form.vue
index 43faa4e..404dfc0 100644
--- a/src/views/wls/productissue/modules/detail-form.vue
+++ b/src/views/wls/productissue/modules/detail-form.vue
@@ -54,6 +54,10 @@
(await formApi.getValues()) as MesWmProductIssueDetailApi.ProductIssueDetail;
data.issueId = issueId.value;
data.lineId = lineId.value;
+ // itemId 浣跨敤 mdmItemId 鐨勫��
+ if (data.mdmItemId) {
+ data.itemId = data.mdmItemId;
+ }
try {
await (formData.value?.id
? updateProductIssueDetail({ ...data, id: formData.value.id })
@@ -85,6 +89,10 @@
modalApi.lock();
try {
formData.value = await getProductIssueDetail(data.detailId);
+ // 缂栬緫鏃惰〃鍗� itemId 浣跨敤 mdmItemId 鐨勫��
+ if (formData.value.mdmItemId) {
+ formData.value.itemId = formData.value.mdmItemId;
+ }
// 璁剧疆鍒� values
await formApi.setValues(formData.value);
} finally {
diff --git a/src/views/wls/productissue/modules/line-list.vue b/src/views/wls/productissue/modules/line-list.vue
index 7b83523..9c08bf1 100644
--- a/src/views/wls/productissue/modules/line-list.vue
+++ b/src/views/wls/productissue/modules/line-list.vue
@@ -83,7 +83,7 @@
/** 鎷ｈ揣锛氱洿鎺ユ墦寮�鏄庣粏鍒涘缓琛ㄥ崟 */
function handlePicking(row: MesWmProductIssueLineApi.ProductIssueLine) {
- openDetailForm(row.id!, row.itemId);
+ openDetailForm(row.id!, row.mdmItemId);
}
/** 鎵撳紑鎷ｈ揣鏄庣粏琛ㄥ崟 */
@@ -184,7 +184,7 @@
<DetailList
:details="getExpandedDetails(row)"
:form-type="formType"
- @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+ @edit="(detailId) => openDetailForm(row.id!, row.mdmItemId, detailId)"
@refresh="loadLineDetails(row.id!)"
/>
</template>
--
Gitblit v1.9.3