From e0ae125d20e2f256162d34c06ed87646ef6378c6 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Tue, 19 May 2026 16:44:54 +0800
Subject: [PATCH] 1.生产执行增加机台呼叫，呼叫/回收新托盘列表为历史记录和执行状态，每条记录后加撤销按钮，右上角按钮为新增申请，点击弹框

---
 src/components/Common/CommonTable/index.js         | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/mes/productionExec/productionExecMain/index.js |  6 ++++--
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 6658a04..416fb02 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -3945,6 +3945,8 @@ class CommonTableRc extends React.Component {
                   })
                 : ""}
               {props.choosePlate()}
+              {props.chooseNewcallmaterialTask()}
+              {props.chooseNewemptytrayTask()}
             </div>
           </div>
         ),
@@ -9158,8 +9160,55 @@ const useCommonTableEvent = props => {
       </Button>
     );
   };
-  addState = { ...addState, choosePlate };
 
+  const chooseNewcallmaterialTask = () => {
+    if (props.name !== "callmaterial") return "";
+
+    const btnConfig = props.config?.gdsconfigformslave?.find(item => item.sControlName === "newcallmaterialTask");
+    if (!btnConfig) return "";
+
+    const { showName } = btnConfig;
+
+    return (
+      <Button
+        type="primary"
+        size="large"
+        onClick={() => {
+          props.parentProps.onExecInstructSet({
+            btnConfig,
+          });
+        }}
+      >
+        {showName}
+      </Button>
+    );
+  };
+
+  const chooseNewemptytrayTask = () => {
+    if (props.name !== "emptytray") return "";
+
+    const btnConfig = props.config?.gdsconfigformslave?.find(item => item.sControlName === "newemptytrayTask");
+    if (!btnConfig) return "";
+
+    const { showName } = btnConfig;
+
+    return (
+      <Button
+        type="primary"
+        size="large"
+        onClick={() => {
+          props.parentProps.onExecInstructSet({
+            btnConfig,
+          });
+        }}
+      >
+        {showName}
+      </Button>
+    );
+  };
+  addState = { ...addState, choosePlate };
+  addState = { ...addState, chooseNewcallmaterialTask };
+  addState = { ...addState, chooseNewemptytrayTask };
   // 复制数据到下一行
   const handleCopyToNextLine = ({ index, sName, isAll }) => {
     const { data = [], name } = props;
diff --git a/src/mes/productionExec/productionExecMain/index.js b/src/mes/productionExec/productionExecMain/index.js
index b14c01f..ad6f46d 100644
--- a/src/mes/productionExec/productionExecMain/index.js
+++ b/src/mes/productionExec/productionExecMain/index.js
@@ -599,7 +599,7 @@ const ProductionExecContentByType = props => {
     message.warning("未获取到iInterface字段！");
     return "";
   }
-  const type0 = 
+  const type0 =
     props.workOrderInfoData?.[0]?.bZZ
       ? "type10"
       : "type0";
@@ -761,7 +761,9 @@ const ProductionExecContent0 = props => {
     "palletBatchMaterial",
     "workerOrderBatchMaterial",
     "plateInfo",
-    "jpfpbtable0"
+    "jpfpbtable0",
+    'callmaterial',
+     'emptytray'
   ];
   const formDataNew = props.formData.filter(
     item => item.sGrd && btnTableList.includes(item.sGrd)
--
libgit2 0.22.2