From 4dee4cb5b31a7f1dcd2c7b3d72f74b78d2fe3f29 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 18 九月 2026 15:56:41 +0800
Subject: [PATCH] fix: 质检是否入库
---
src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue | 98 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 97 insertions(+), 1 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue b/src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue
index 739facb..cda3dd2 100644
--- a/src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue
+++ b/src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue
@@ -6,12 +6,19 @@
@close="handleClose">
<div class="material-toolbar">
<el-button type="primary"
+ plain
+ @click="handleAddPurchase">鏂板閲囪喘</el-button>
+ <el-button type="primary"
@click="handleAddMaterialRow">鏂板</el-button>
</div>
<el-table v-loading="materialTableLoading"
:data="materialTableData"
border
+ @selection-change="handleMaterialSelectionChange"
row-key="tempId">
+ <el-table-column align="center"
+ type="selection"
+ width="55" />
<el-table-column label="宸ュ簭鍚嶇О"
min-width="100">
<template #default="{ row }">
@@ -80,13 +87,20 @@
@change="val => handleRequiredQtyChange(row, val)" />
</template>
</el-table-column>
+ <el-table-column label="搴撳瓨浣欓噺"
+ min-width="90">
+ <template #default="{ row }">
+ <span v-if="row.stockQty === null">-</span>
+ <span v-else>{{ stripTrailingZeros(row.stockQty) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="宸查鏁伴噺"
min-width="90">
<template #default="{ row }">
{{ stripTrailingZeros(row.pickedQty) ?? 0 }}
</template>
</el-table-column>
- <el-table-column label="鍓╀綑鍙"
+ <el-table-column label="鍓╀綑闇�棰�"
min-width="90">
<template #default="{ row }">
<span :class="{ 'remaining-empty': Number(row.remainingQty) <= 0 }">
@@ -136,6 +150,8 @@
<ProductSelectDialog v-model="materialProductDialogVisible"
@confirm="handleMaterialProductConfirm"
single />
+ <PurchaseLedgerAddDialog ref="purchaseLedgerAddDialogRef"
+ v-model="purchaseLedgerDialogVisible" />
<!-- request-url="/stockInventory/rawMaterials" -->
</div>
</template>
@@ -144,7 +160,9 @@
import { computed, ref, watch } from "vue";
import { ElMessage } from "element-plus";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
+ import PurchaseLedgerAddDialog from "./PurchaseLedgerAddDialog.vue";
import { findProductProcessRouteItemList } from "@/api/productionManagement/productProcessRoute.js";
+ import { getStockInventoryByModelId } from "@/api/inventoryManagement/stockInventory.js";
import {
listMaterialPickingDetail,
listMaterialPickingBom,
@@ -166,6 +184,9 @@
const materialTableLoading = ref(false);
const materialSaving = ref(false);
const materialTableData = ref([]);
+ const selectedMaterialRows = ref([]);
+ const purchaseLedgerDialogVisible = ref(false);
+ const purchaseLedgerAddDialogRef = ref(null);
const isSaveDisabled = computed(() => {
if (materialTableLoading.value) return true;
@@ -222,6 +243,7 @@
returnedQty,
remainingQty,
pickQty: 0,
+ stockQty: null,
batchNo: [],
batchNoList,
};
@@ -349,6 +371,17 @@
})
);
});
+ // 鍏堟煡鍑哄簱瀛樹綑閲忓啀鍏ヨ〃锛屼繚璇侀娆℃墦寮�鍗冲睍绀猴紙rows 灏氭湭杞负鍝嶅簲寮忎唬鐞嗭紝
+ // 鍏ヨ〃鍚庡啀鏀瑰師濮嬪璞′笉浼氳Е鍙戣鍥炬洿鏂帮級
+ await loadStockQtyForRows(rows);
+ // 鎵撳紑棰嗘枡鍙拌处榛樿锛氳嚜鍔ㄩ�変腑绗竴涓彲鐢ㄦ壒鍙凤紝棰嗙敤鏁伴噺=闇�姹傛暟閲�
+ rows.forEach(row => {
+ const batchNoList = Array.isArray(row.batchNoList) ? row.batchNoList : [];
+ if (batchNoList.length > 0) {
+ row.batchNo = [batchNoList[0]];
+ row.pickQty = toNumber(row.demandedQuantity);
+ }
+ });
materialTableData.value = rows;
} finally {
materialTableLoading.value = false;
@@ -366,11 +399,73 @@
const handleClose = () => {
materialTableData.value = [];
+ selectedMaterialRows.value = [];
currentMaterialSelectRowIndex.value = -1;
+ };
+
+ // 鎸夊瀷鍙锋眹鎬绘墍鏈夋壒娆＄殑鍘熸枡鍙敤搴撳瓨浣欓噺
+ const loadStockQtyForRows = async rows => {
+ const modelIds = [
+ ...new Set(rows.map(row => row.materialModelId).filter(Boolean)),
+ ];
+ const stockMap = new Map();
+ await Promise.all(
+ modelIds.map(async modelId => {
+ try {
+ const res = await getStockInventoryByModelId(modelId);
+ const list = Array.isArray(res?.data)
+ ? res.data
+ : res?.data?.records || res?.data?.rows || [];
+ const total = list.reduce(
+ (sum, item) => sum + toNumber(item?.qualitity ?? item?.quantity),
+ 0
+ );
+ stockMap.set(modelId, roundQuantity(total));
+ } catch (e) {
+ stockMap.set(modelId, 0);
+ }
+ })
+ );
+ rows.forEach(row => {
+ if (!row.materialModelId) {
+ row.stockQty = null;
+ return;
+ }
+ row.stockQty = stockMap.has(row.materialModelId)
+ ? stockMap.get(row.materialModelId)
+ : 0;
+ });
};
const handleAddMaterialRow = () => {
materialTableData.value.push(createMaterialRow());
+ };
+
+ const handleMaterialSelectionChange = selection => {
+ selectedMaterialRows.value = selection;
+ };
+
+ const handleAddPurchase = () => {
+ if (selectedMaterialRows.value.length === 0) {
+ ElMessage.warning("璇烽�夋嫨闇�瑕佹柊澧為噰璐殑鍘熸枡琛�");
+ return;
+ }
+ const rowsWithModel = selectedMaterialRows.value.filter(
+ row => row.materialModelId
+ );
+ if (rowsWithModel.length === 0) {
+ ElMessage.warning("鎵�閫夎缂哄皯鍘熸枡鍨嬪彿锛岃鍏堥�夋嫨鍘熸枡鍚庡啀鏂板閲囪喘");
+ return;
+ }
+ const productRows = rowsWithModel.map(row => ({
+ productModelId: row.materialModelId,
+ productCategory: row.materialName,
+ specificationModel: row.materialModel,
+ unit: row.unit,
+ quantity: row.demandedQuantity,
+ isChecked: false,
+ }));
+ purchaseLedgerAddDialogRef.value?.open(productRows);
};
const handleDeleteMaterialRow = index => {
@@ -416,6 +511,7 @@
row.batchNo = [];
currentMaterialSelectRowIndex.value = -1;
materialProductDialogVisible.value = false;
+ loadStockQtyForRows([row]);
};
const validateMaterialRows = () => {
--
Gitblit v1.9.3