From 9ab9c7419d493d5ff80bece90bf1807c0ca403be Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 10 Jul 2026 10:29:40 +0800
Subject: [PATCH] 1.处理工艺卡复制到工艺，成品工序下面，拿到对应的成品材料

---
 src/components/Manufacture/ProcessCardPackTableTreeNew/index.js | 81 ++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
index 7b9e026..fed79e4 100644
--- a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
+++ b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
@@ -566,41 +566,6 @@ const ProcessCardPackTableTreeNewEvent = props => {
         });
       }
 
-      if (commonUtils.isNotEmptyArr(copyTo.materialsData)) {
-        copyTo.materialsData.filter(item => item.sType === "2").forEach(materialsItem => {
-          newCopyTo.materials = materialsItem;
-          let materialsRow = commonFunc.getDefaultData(config.materialsConfig, newCopyTo); // 取默认值
-          materialsRow = {
-            ...materialsRow,
-            ...commonFunc.getAssignFieldValue(materialsAssignField, materialsItem, newCopyTo),
-          }; // 取赋值字段
-          materialsRow.handleType = "add";
-          materialsRow.sId = commonUtils.createSid();
-          materialsRow.sParentId = masterData.sId;
-          materialsRow.sType = materialsItem.sType;
-          /* 根据从表源sOriginalId找到新sId */
-          let sNewIds = "";
-          let sNewNames = "";
-          const sOldIds = materialsItem.sCombinePartsName;
-          if (commonUtils.isNotEmptyObject(sOldIds)) {
-            const sOldArr = sOldIds.split(",");
-            for (const sId of sOldArr) {
-              const index = slaveData.findIndex(item => item.sOriginalId === sId);
-              if (index > -1) {
-                const tableDataRow = slaveData[index];
-                sNewIds += `${tableDataRow.sId},`;
-                sNewNames += `${tableDataRow.sProductName},`;
-              }
-            }
-            sNewIds = commonUtils.isNotEmptyObject(sNewIds) ? sNewIds.slice(0, -1) : "";
-            sNewNames = commonUtils.isNotEmptyObject(sNewNames) ? sNewNames.slice(0, -1) : "";
-          }
-          materialsRow.sCombinePartsName = sNewIds;
-          materialsRow.sCombinePartsNameNew = sNewNames;
-          materialsData.push(materialsRow);
-        });
-      }
-
       if (commonUtils.isNotEmptyArr(copyTo.processData)) {
         copyTo.processData.filter(item => item.sType === "3").forEach(processItem => {
           newCopyTo.process = processItem;
@@ -671,6 +636,52 @@ const ProcessCardPackTableTreeNewEvent = props => {
         });
       }
 
+      if (commonUtils.isNotEmptyArr(copyTo.materialsData)) {
+        copyTo.materialsData.filter(item => item.sType === "2").forEach(materialsItem => {
+          newCopyTo.materials = materialsItem;
+          let materialsRow = commonFunc.getDefaultData(config.materialsConfig, newCopyTo); // 取默认值
+          materialsRow = {
+            ...materialsRow,
+            ...commonFunc.getAssignFieldValue(materialsAssignField, materialsItem, newCopyTo),
+          }; // 取赋值字段
+          materialsRow.handleType = "add";
+          materialsRow.sId = commonUtils.createSid();
+          materialsRow.sParentId = masterData.sId;
+          materialsRow.sType = materialsItem.sType;
+          /* 根据从表源sOriginalId找到新sId */
+          let sNewIds = "";
+          let sNewNames = "";
+          const sOldIds = materialsItem.sCombinePartsName;
+          if (commonUtils.isNotEmptyObject(sOldIds)) {
+            const sOldArr = sOldIds.split(",");
+            for (const sId of sOldArr) {
+              const index = slaveData.findIndex(item => item.sOriginalId === sId);
+              if (index > -1) {
+                const tableDataRow = slaveData[index];
+                sNewIds += `${tableDataRow.sId},`;
+                sNewNames += `${tableDataRow.sProductName},`;
+              }
+            }
+            sNewIds = commonUtils.isNotEmptyObject(sNewIds) ? sNewIds.slice(0, -1) : "";
+            sNewNames = commonUtils.isNotEmptyObject(sNewNames) ? sNewNames.slice(0, -1) : "";
+          }
+          materialsRow.sCombinePartsName = sNewIds;
+          materialsRow.sCombinePartsNameNew = sNewNames;
+
+          if (commonUtils.isNotEmptyArr(processData)) {
+            const iProcessIndex = processData.findIndex(
+              item =>  item.sSrcProcessTbId === materialsItem.sProcessTbId
+            );
+            if (iProcessIndex > -1) {
+              materialsRow.sProcessTbId = processData[iProcessIndex].sId;
+            }
+          }
+          materialsData.push(materialsRow);
+        });
+      }
+
+
+
       if (commonUtils.isNotEmptyArr(copyTo.colorData)) {
         if (commonUtils.isNotEmptyObject(config.colorConfig)) {
           copyTo.colorData.forEach(colorItem => {
--
libgit2 0.22.2