diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js
index 16e23e2..f389048 100644
--- a/src/components/Common/CommonHooks/useCommonBase.js
+++ b/src/components/Common/CommonHooks/useCommonBase.js
@@ -41,8 +41,6 @@ const useCommonBase = props => {
   const [state, dispatch] = useReducer(reducer, getInitialState(props));
   const tempRef = useRef({});
   let mounted = true
-  console.log(props, 'useCommonBase');
-
   const setTempRef = (params, bRewrite) => {
     if (bRewrite) {
       tempRef.current = params;
@@ -228,8 +226,16 @@ const useCommonBase = props => {
     const { token, formSrcRoute } = state;
     const configUrl = `${commonConfig.server_host
       }business/getModelBysId/${sModelsId}?sModelsId=${sModelsId}&sName=${formSrcRoute}`;
+    const configUrlModel = `${commonConfig.server_host
+      }/gdsmodule/getGdsmoduleById/${sModelsId}?sModelsId=${sModelsId}&sName=${formSrcRoute}`;
+    // const getGdsmoduleById
+    const configReturnModel = (await commonServices.getService(token, configUrlModel))
+      .data;
+    console.log("🚀 ~ handleGetModelConfig ~ configReturnModel:", configReturnModel)
+
     const configReturn = (await commonServices.getService(token, configUrl))
       .data;
+
     let formData = [];
     if (configReturn.code === 1) {
       const [configData] = configReturn.dataset.rows;
@@ -237,6 +243,12 @@ const useCommonBase = props => {
     } else {
       getServiceError(configReturn);
     }
+    const configReturnModelData = configReturnModel.dataset.rows[0]
+    if (configReturnModelData) {
+      formData.forEach(item => {
+        item.sModelType = configReturnModelData?.sModelType
+      })
+    }
     return formData;
   };
 
diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js
index 587c836..48d2a8f 100644
--- a/src/components/Common/CommonInstructSet.js
+++ b/src/components/Common/CommonInstructSet.js
@@ -147,7 +147,7 @@ const addExtraData = props => {
       }
     });
   }
-  
+
   const globalData = commonUtils.convertStrToObj(
     localStorage.xlybusinessglobalData
   );
@@ -336,7 +336,7 @@ const instructSetInit = async props => {
       props.callback && props.callback();
     });
   });
-  
+
   props.inscallback && props.inscallback({ ...props, ...addStateNew });
 };
 
@@ -973,9 +973,8 @@ const handleMesSaveAll = async (props, onSucess) => {
 
   const { sModelsId, app } = props;
   const { token } = app;
-  const dataUrl = `${
-    commonConfig.server_host
-  }instruct/save?sModelsId=${sModelsId}`;
+  const dataUrl = `${commonConfig.server_host
+    }instruct/save?sModelsId=${sModelsId}`;
   const values = {
     opr: "save",
     data: saveDataTodo
@@ -1105,7 +1104,7 @@ const handleMsg = async (props, instruct) => {
       title: "温馨提示:",
       content: <div>{msg}</div>,
       okText: "确认",
-      onOk() {}
+      onOk() { }
     });
   } else if (code === -7) {
     const result = await new Promise(resolve => {
@@ -1130,7 +1129,7 @@ const handleMsg = async (props, instruct) => {
       title: "错误提示:",
       content: <div>{msg}</div>,
       okText: "确认",
-      onOk() {}
+      onOk() { }
     });
     throw new Error(msg);
   } else {
@@ -1158,9 +1157,8 @@ const handleSendMsgAll = async props => {
 
   const { sModelsId, app } = props;
   const { token } = app;
-  const dataUrl = `${
-    commonConfig.server_host
-  }instruct/sendmsg?sModelsId=${sModelsId}`;
+  const dataUrl = `${commonConfig.server_host
+    }instruct/sendmsg?sModelsId=${sModelsId}`;
   const values = sendMsgDataTodo;
   const dataReturn = (await commonServices.postValueService(
     token,
@@ -1228,9 +1226,8 @@ const handlePrint = (props, instruct) => {
     throw new Error("打印报表名称不能为空！");
   }
 
-  const dataUrl = `${
-    commonConfig.file_host
-  }printReport/printInstruct/${reportName}`;
+  const dataUrl = `${commonConfig.file_host
+    }printReport/printInstruct/${reportName}`;
 
   const params = {
     sModelsId,
@@ -1376,9 +1373,8 @@ const handleFaceAuth = async (props, instruct) => {
   } else if (loginType === 2) {
     // 账号密码登陆
     let loginConfig;
-    const configUrl = `${
-      commonConfig.server_host
-    }business/getModelBysId/${sModelsId}?sModelsId=${sModelsId}&sName=/commonAuto`;
+    const configUrl = `${commonConfig.server_host
+      }business/getModelBysId/${sModelsId}?sModelsId=${sModelsId}&sName=/commonAuto`;
     const configReturn = (await commonServices.getService("", configUrl)).data;
     if (configReturn.code === 1) {
       const dataReturn = configReturn.dataset.rows;
@@ -1422,9 +1418,8 @@ const handleFaceAuth = async (props, instruct) => {
             }
 
             const { sBrandsId, sSubsidiaryId } = mesSysbrands;
-            const url = `${
-              commonConfig.server_host
-            }userloginUserNo/${sBrandsId}/${sSubsidiaryId}`;
+            const url = `${commonConfig.server_host
+              }userloginUserNo/${sBrandsId}/${sSubsidiaryId}`;
             const value = {
               username: loginInfo.sUserNo || loginInfo.sUserName,
               password: loginInfo.sPassWord
@@ -1586,9 +1581,8 @@ const handleOpenSql = async (props, instruct) => {
 const handleGetSqlValue = async (props, data, srcDatasetRow = {}) => {
   const { sModelsId, app } = props;
   const { token } = app;
-  const dataUrl = `${
-    commonConfig.server_host
-  }instruct/opensql?sModelsId=${sModelsId}`;
+  const dataUrl = `${commonConfig.server_host
+    }instruct/opensql?sModelsId=${sModelsId}`;
   const values = {
     opr: "opensql",
     data: [
@@ -2009,9 +2003,8 @@ const handleExeSqlAll = async (props, onSucess) => {
 
   const { sModelsId, app } = props;
   const { token } = app;
-  const dataUrl = `${
-    commonConfig.server_host
-  }instruct/exesql?sModelsId=${sModelsId}`;
+  const dataUrl = `${commonConfig.server_host
+    }instruct/exesql?sModelsId=${sModelsId}`;
   const values = {
     opr: "exesql",
     data: exesqlTodo
@@ -2143,9 +2136,8 @@ const handleCalcprocedure = async (props, instruct) => {
 
   const { sModelsId, app } = props;
   const { token } = app;
-  const dataUrl = `${
-    commonConfig.server_host
-  }calcprocedure/calc?sModelsId=${sModelsId}`;
+  const dataUrl = `${commonConfig.server_host
+    }calcprocedure/calc?sModelsId=${sModelsId}`;
   const values = {
     allTableMap,
     sButtonParam,
@@ -2172,7 +2164,7 @@ const handleCalcprocedure = async (props, instruct) => {
       title: "温馨提示:",
       content: <div>{msg}</div>,
       okText: "确认",
-      onOk() {}
+      onOk() { }
     });
   } else if (code === -7) {
     const result = await new Promise(resolve => {
@@ -2197,7 +2189,7 @@ const handleCalcprocedure = async (props, instruct) => {
       title: "错误提示:",
       content: <div>{msg}</div>,
       okText: "确认",
-      onOk() {}
+      onOk() { }
     });
     throw new Error(msg);
   } else {
@@ -2379,6 +2371,7 @@ const utils = {
       props.onSaveState({
         loading: false
       });
+      // handleRefresh(props, { dataset: props.name });
       return false;
     }
 
@@ -2391,7 +2384,7 @@ const utils = {
           params.iFlag = 1;
           utils.saveData(params);
         },
-        onCancel() {},
+        onCancel() { },
         okText: "保存",
         cancelText: "不保存"
       });
@@ -2400,6 +2393,13 @@ const utils = {
       });
       return true;
     }
+    if (returnData.code === 1) {
+      props.onSaveState({
+        enabled: false,
+        currentId: masterData.sId,
+        loading: false
+      });
+    }
     props.onSendSocketMessage(
       "release",
       "noAction",
@@ -2409,8 +2409,6 @@ const utils = {
       null
     );
     props.onSaveState({
-      enabled: false,
-      currentId: masterData.sId,
       loading: false
     });
     return true;
@@ -2550,7 +2548,7 @@ const utils = {
         let tempResult = false;
         try {
           tempResult = reg.test(str);
-        } catch (error) {}
+        } catch (error) { }
         return tempResult;
       };
 
@@ -2822,8 +2820,8 @@ const utils = {
       const [tableName, filterType] = item.split("@");
       const tableData =
         item.split("@").length <= 1 &&
-        desDataset === tableName &&
-        datasetListExtra[tableName + "One"]
+          desDataset === tableName &&
+          datasetListExtra[tableName + "One"]
           ? [datasetListExtra[tableName + "One"]]
           : utils.getFilterData(props, tableName, filterType);
       if (commonUtils.isNotEmptyArr(tableData)) {
@@ -3093,7 +3091,7 @@ const utils = {
       let tempResult = false;
       try {
         tempResult = reg.test(str);
-      } catch (error) {}
+      } catch (error) { }
       return tempResult;
     };
 
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 3abd622..d258322 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -4864,6 +4864,8 @@ class CommonTableRc extends React.Component {
                       const { selectedRowKeys = [] } = props;
                       if (sControlName.includes('BtnTableCopyTo.ActProduceReport')) {
                         const copyToConfig = props?.config?.gdsconfigformslave.filter(x=>x.sControlName.includes('BtnTableCopyTo.ActProduceReport'))
+                        console.log(props, 'record');
+                        
                         props.onCopyTo(props.name, config.sActiveId, config, copyToConfig, record)
                         return
                       }
diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js
index 9816c04..62ca65d 100644
--- a/src/components/Common/commonFunc.js
+++ b/src/components/Common/commonFunc.js
@@ -149,6 +149,10 @@ export function getDefaultData(config, allTableData = {}, extraData = {}) {
   if (commonUtils.isNotEmptyObject(config) && commonUtils.isNotEmptyObject(config.gdsconfigformslave)) {
     config.gdsconfigformslave.forEach((childConfig) => {
       const { sDefault, sName } = childConfig;
+      if (sName === 'sTeamName') {
+        // console.log(sDefault,config,childConfig, 'sDefault');
+        
+      }
       if (typeof sDefault === 'string' && sDefault !== '' && sName && sDefault !== undefined && sDefault.indexOf(':') > -1 && sDefault.indexOf('.') > -1) {
         const oldFieldName = sDefault.split(':')[1];
         const tableName = oldFieldName.split('.')[0];
@@ -247,7 +251,7 @@ const handleDefaultSName = (itemConfig) => {
   const key = sControlName?.split('-')?.[1];
   if (!key || sDefault) return false;
   try {
-    let userinfo = localStorage.getItem(`${config.prefix}userinfo`);
+    let userinfo = localStorage.getItem('xlybusinessuserinfo');
     userinfo = JSON.parse(userinfo);
     const userinfoKey = Object.keys(userinfo);
     if (userinfoKey.includes(key)) {
diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index 9515d3a..06ee3d8 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -255,6 +255,10 @@ const useCommonModelEvent = props => {
   };
 
   const [refreshCount, setRefreshCount] = useState(0);
+  const sModelType =
+    Array.isArray(formData) && formData.length > 0
+      ? (formData[0]?.sModelType || '')
+      : '';
   // 初始化事件
   useEffect(
     async () => {
@@ -282,7 +286,7 @@ const useCommonModelEvent = props => {
             result = await handleGetData(tableList, true, true);
 
           } else if (noGetData) {
-            result = await await handleGetData(
+            result = await handleGetData(
               tableList.filter(
                 item =>
                   item === "workerOrderBatchMaterial" || item === "plateInfo"
@@ -332,13 +336,13 @@ const useCommonModelEvent = props => {
     },
     [
       formData.length,
-      refreshCount,
-      // enabled,
+      ['production/productionReport', 'commonBill'].includes(sModelType) ? enabled : refreshCount,
       noGetData,
       JSON.stringify(sFilterConditions)
     ]
   );
 
+
   // 初始化后执行一次指令集
   useEffect(
     () => {
@@ -421,7 +425,15 @@ const useCommonModelEvent = props => {
   const { gdsconfigformslave } = props?.slaveConfig || {}
   useEffect(() => {
     const { btnConfig = {}, copyToConfig = [], record = {} } = props?.parentProps || {}
-    if (!props.masterData) return
+    if (
+      !props.masterData ||
+      !props.masterData.sId ||
+      typeof props.masterData.sId !== 'string' ||
+      props.masterData.sId.trim() === ''
+    ) {
+      return;
+    }
+    if (props.masterData.sBillNo) return
     if (!copyToConfig) return
     const addState = {};  // 始终初始化为对象
     if (Array.isArray(copyToConfig) && copyToConfig.length > 0) {
@@ -431,7 +443,7 @@ const useCommonModelEvent = props => {
           if (nameList && nameList.length > 2) {
             const name = nameList.pop()
             addState[`${name}Data`] = [{
-              ...commonFunc.getDefaultData(`${name}Config`),
+              ...commonFunc.getDefaultData(props[`${name}Config`]),
               handleType: "add",
               sId: commonUtils.createSid(),
               sParentId: props.masterData.sId,
@@ -445,25 +457,7 @@ const useCommonModelEvent = props => {
 
   }, [props.masterData])
 
-  // 如果是表单类型，并且主表数据为空，默认为编辑状态
-  // useEffect(
-  //   () => {
-  //     const { masterData, masterConfig, sModelsId } = props;
-  //     if (
-  //       commonUtils.isNotEmptyObject(masterConfig) &&
-  //       commonUtils.isEmptyObject(masterData)
-  //     ) {
-  //       const masterDataNew = {
-  //         ...commonFunc.getDefaultData(masterConfig),
-  //         handleType: "add",
-  //         sId: commonUtils.createSid(),
-  //         sFormId: sModelsId
-  //       };
-  //       props.onSaveState({ masterData: masterDataNew, enabled: true });
-  //     }
-  //   },
-  //   [props.bFinish]
-  // );
+
 
   // 获取表头数据
   const handleGetColumnData = (tableList = [], isWait) => {
@@ -489,7 +483,7 @@ const useCommonModelEvent = props => {
   // 获取数据集
   const handleGetData = async (tableList = [], isWait, bInit) => {
     let addState = {};
-    const currentIds =  currentId ? currentId : props?.parentProps?.record?.sId 
+    const currentIds = currentId ? currentId : props?.parentProps?.record?.sId
     for (let i = 0; i < tableList.length; i++) {
       const tableName = tableList[i];
       const config = formData.find(item => item.sGrd === tableName);
@@ -605,11 +599,11 @@ const useCommonModelEvent = props => {
       const masterState = {};
       if (currentIds && tableName === 'master') {
         masterState.sId = currentId;
-      } 
+      }
       if (currentIds && tableName !== 'master') {
         conditonValues.sParentId = currentIds;
       }
-      
+
       const result =
         (await props.onGetDataSet({
           name: tableName,
@@ -623,7 +617,7 @@ const useCommonModelEvent = props => {
           sModelTypes: props.parentProps,
           isWait: true
         })) || {};
-        
+
       props.setTempRef(result);
 
       if (tableName?.includes("master")) {
diff --git a/src/mes/common/commonOperationBarComponent/MesToolbar.js b/src/mes/common/commonOperationBarComponent/MesToolbar.js
index 428e941..cba5e3a 100644
--- a/src/mes/common/commonOperationBarComponent/MesToolbar.js
+++ b/src/mes/common/commonOperationBarComponent/MesToolbar.js
@@ -74,7 +74,6 @@ const ToolbarFun = async (props) => {
       }
     } else {
       console.log(props, 'masterData');
-
       // props.onBtnExamine();
     }
   }
@@ -149,7 +148,7 @@ const handleSave = (props) => {
     },
     inscallback: () => {
       props.onSaveState({
-        currentId: props.masterData.sId, enabled: false
+        currentId: props.masterData.sId,
       });
     }
   });