Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi

Min
2 parents 2b0ac33d 49e8874c
Showing 34 changed files with 111 additions and 111 deletions
src/components/AuditInformation/AuditInformation.js
src/components/Common/CommonBillDeliverEvent.js
src/components/Common/CommonBillEvent.js
src/components/Common/CommonCheckBillEvent.js
src/components/Common/CommonCostomTabBill.js
src/components/Common/CommonElementEvent.js
src/components/Common/CommonGroupBillEvent.js
src/components/Common/CommonJurisdictionEvent.js
src/components/Common/CommonJurisdictionNewEvent.js
src/components/Common/CommonListEditEvent.js
src/components/Common/CommonListEvent.js
src/components/Common/CommonListTabEvent.js
src/components/Common/CommonListTreeEvent.js
src/components/Common/CommonNewBillEvent.js
src/components/Common/CommonNewTabBillEvent.js
src/components/Common/CommonProductionPlanEvent.js
src/components/Common/CommonProductionPlanOutsideEvent.js
src/components/Common/CommonProductionPlanTreeEvent.js
src/components/Common/CommonSubBillEvent.js
src/components/Common/CommonSystemSettingEvent.js
@@ -33,7 +33,7 @@ class AuditInformation extends Component {
     let { masterConfig, canSendMsg } = nextProps;
     const { userinfo } = app;
     if (commonUtils.isEmptyArr(masterConfig) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       masterConfig = formData.filter(item => !item.bGrd)[0];
       const checkConfig = formData.filter(item => item.bGrd && item.sTbName === 'sysbillcheckresult')[0];
@@ -58,7 +58,7 @@ class AuditInformation extends Component {
   /**   获取主表数据   */
   handleGetData = async (masterConfig, checkConfig) => {
     const { currentId } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : '';
+    const sId = currentId || this.props.masterData?.sId || '';
     await this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' } });
     const { masterData } = this.props;
     if (!commonUtils.isEmptyObject(checkConfig) && !commonUtils.isEmptyObject(masterData)) {
@@ -47,7 +47,7 @@ export default (ChildComponent) =&gt; {
         employeeConfig: employeeConfigOld,
       } = nextProps;
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment' && sModelsType !== 'quality/accident' && sModelsType !== 'purchase/purchaseEnquiry' && sModelsType !== 'complaint/complaint' && sModelsType !== 'print/printLabel' && sModelsType !== 'commonBill/onlyMaster' && formRoute.indexOf('indexOee') === -1)) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const BtnDesignFunctionConfig = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'BtnBsOperation.BtnDesignFunction') : {};
@@ -274,7 +274,7 @@ export default (ChildComponent) =&gt; {
         });
       } else if (commonUtils.isEmptyObject(masterConfigOld) && formData.length === 1 && (sModelsType === 'cashier/financialTransfer' || sModelsType === 'purchase/purchaseEnquiry' || sModelsType === 'cashier/financialAdjustment' || sModelsType === 'print/printLabel' || sModelsType === 'complaint/complaint' || sModelsType === 'commonBill/onlyMaster') && formRoute.indexOf('indexOee') === -1) {
         const config = {};
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         let addState = {};
@@ -296,7 +296,7 @@ export default (ChildComponent) =&gt; {
           masterConfig, sId, pageLoading: false, ...addState,
         });
       } else if (commonUtils.isEmptyObject(slaveConfigOld) && commonUtils.isEmptyObject(masterConfigOld) && formData.length === 2 && (sModelsType === 'quality/accident') && formRoute.indexOf('indexOee') === -1) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'mftqualityaccidentSlave')[0];
@@ -319,7 +319,7 @@ export default (ChildComponent) =&gt; {
         });
       } else if (formRoute.indexOf('indexOee') > -1 && commonUtils.isEmptyObject(employeeConfigOld) && commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0) {
         if (formRoute === '/indexOee/labelPrint' && commonUtils.isEmpty(slaveConfigOld)) { /* 入库标签打印 */
-          const sId = currentId !== undefined ? currentId : '';
+          const sId = currentId || nextProps.masterData?.sId || '';
           /* 数据Id */
           const masterConfig = formData[0];
           const slaveConfig = formData[0];
@@ -507,7 +507,7 @@ export default (ChildComponent) =&gt; {
     /**   获取主表、从表、审核表数据   */
     handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       await this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -544,7 +544,7 @@ export default (ChildComponent) =&gt; {
     /* 获取表数据 */
     handleGetMemoData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig) => {
       const { currentId, sModelsType } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       const addStateControl = await this.props.handleGetDataSet({
         name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
       });
@@ -597,7 +597,7 @@ export default (ChildComponent) =&gt; {
     /* 获取单张表数据 */
     handleGetOneMemoData = (memoName, memoConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
         this.props.handleGetDataSet({
           name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -79,7 +79,7 @@ export default (ChildComponent) =&gt; {
         slaveInfoList: slaveInfoListOld,
       } = nextProps;
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (sModelsId === '12710101117024321284220' || (sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment' && sModelsType !== 'quality/accident' && sModelsType !== 'purchase/purchaseEnquiry' && sModelsType !== 'complaint/complaint' && sModelsType !== 'print/printLabel' && sModelsType !== 'commonBill/onlyMaster' && (formRoute.indexOf('indexOee') === -1 || formRoute === '/indexOee/commonOeeBill')))) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const BtnDesignFunctionConfig = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'BtnBsOperation.BtnDesignFunction') : {};
@@ -494,7 +494,7 @@ export default (ChildComponent) =&gt; {
         });
       } else if (commonUtils.isEmptyObject(masterConfigOld) && formData.length === 1 && (sModelsType === 'cashier/financialTransfer' || sModelsType === 'purchase/purchaseEnquiry' || sModelsType === 'cashier/financialAdjustment' || sModelsType === 'print/printLabel' || sModelsType === 'complaint/complaint' || sModelsType === 'commonBill/onlyMaster') && formRoute.indexOf('indexOee') === -1) {
         const config = {};
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         let addState = {};
@@ -516,7 +516,7 @@ export default (ChildComponent) =&gt; {
           masterConfig, sId, pageLoading: false, ...addState,
         });
       } else if (commonUtils.isEmptyObject(slaveConfigOld) && commonUtils.isEmptyObject(masterConfigOld) && formData.length === 2 && (sModelsType === 'quality/accident') && formRoute.indexOf('indexOee') === -1) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'mftqualityaccidentSlave')[0];
@@ -551,7 +551,7 @@ export default (ChildComponent) =&gt; {
         //   employeeConfig, employeeColumn, masterConfig, ...addState,
         // });
         if (formRoute === '/indexOee/labelPrint' && commonUtils.isEmpty(slaveConfigOld)) { /* 入库标签打印 */
-          const sId = currentId !== undefined ? currentId : '';
+          const sId = currentId || nextProps.masterData?.sId || '';
           /* 数据Id */
           const masterConfig = formData[0];
           const slaveConfig = formData[0];
@@ -801,7 +801,7 @@ export default (ChildComponent) =&gt; {
     /* 获取表数据 */
     handleGetMemoData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig) => {
       const { currentId, sModelsType } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       const addStateControl = await this.props.handleGetDataSet({
         name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
       });
@@ -860,7 +860,7 @@ export default (ChildComponent) =&gt; {
     /* 获取单张表数据 */
     handleGetOneMemoData = (memoName, memoConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
         this.props.handleGetDataSet({
           name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -72,7 +72,7 @@ export default (ChildComponent) =&gt; {
         employeeConfig: employeeConfigOld,
       } = nextProps;
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment' && sModelsType !== 'quality/accident' && sModelsType !== 'purchase/purchaseEnquiry' && sModelsType !== 'complaint/complaint' && sModelsType !== 'print/printLabel' && sModelsType !== 'commonBill/onlyMaster' && (formRoute.indexOf('indexOee') === -1 || formRoute === '/indexOee/commonOeeBill'))) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const BtnDesignFunctionConfig = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'BtnBsOperation.BtnDesignFunction') : {};
@@ -373,7 +373,7 @@ export default (ChildComponent) =&gt; {
         });
       } else if (commonUtils.isEmptyObject(masterConfigOld) && formData.length === 1 && (sModelsType === 'cashier/financialTransfer' || sModelsType === 'purchase/purchaseEnquiry' || sModelsType === 'cashier/financialAdjustment' || sModelsType === 'print/printLabel' || sModelsType === 'complaint/complaint' || sModelsType === 'commonBill/onlyMaster') && formRoute.indexOf('indexOee') === -1) {
         const config = {};
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         let addState = {};
@@ -395,7 +395,7 @@ export default (ChildComponent) =&gt; {
           masterConfig, sId, pageLoading: false, ...addState,
         });
       } else if (commonUtils.isEmptyObject(slaveConfigOld) && commonUtils.isEmptyObject(masterConfigOld) && formData.length === 2 && (sModelsType === 'quality/accident') && formRoute.indexOf('indexOee') === -1) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'mftqualityaccidentSlave')[0];
@@ -430,7 +430,7 @@ export default (ChildComponent) =&gt; {
         //   employeeConfig, employeeColumn, masterConfig, ...addState,
         // });
         if (formRoute === '/indexOee/labelPrint' && commonUtils.isEmpty(slaveConfigOld)) { /* 入库标签打印 */
-          const sId = currentId !== undefined ? currentId : '';
+          const sId = currentId || nextProps.masterData?.sId || '';
           /* 数据Id */
           const masterConfig = formData[0];
           const slaveConfig = formData[0];
@@ -618,7 +618,7 @@ export default (ChildComponent) =&gt; {
     /**   获取主表、从表、审核表数据   */
     handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       const addStateMaster = await this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, isWait: true, bEditClick,
       });
@@ -669,7 +669,7 @@ export default (ChildComponent) =&gt; {
     /* 获取表数据 */
     handleGetMemoData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig) => {
       const { currentId, sModelsType } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       let addStateControl = {};
       if (commonUtils.isNotEmptyObject(controlConfig)) {
         addStateControl = await this.props.handleGetDataSet({
@@ -732,7 +732,7 @@ export default (ChildComponent) =&gt; {
     /* 获取单张表数据 */
     handleGetOneMemoData = (memoName, memoConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
         this.props.handleGetDataSet({
           name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -2556,7 +2556,7 @@ class CommonNewBill extends Component {
   // 刷新工单交期
   handleRefreshGdjq = async() => {
     const { currentId, slave2Child0Config, slave2Child0InfoConfig } =  this.props;
-    const sId = currentId !== undefined ? currentId : '';
+    const sId = currentId || this.props.masterData?.sId || '';
     const conditonValues1 = this.props.onGetSqlConditionValues(slave2Child0Config);
     let returnData1 = await this.props.handleGetDataSet({
       name: "slave2Child0",
@@ -35,7 +35,7 @@ export default (ChildComponent) =&gt; {
         eleknifemouldproductConfig: eleknifemouldOldproductConfig, eleteststandarditemConfig: eleteststandardOlditemConfig,
       } = nextProps;
       if (commonUtils.isEmptyObject(contactOldConfig) && (sModelsType === 'element/supplyInfo' || sModelsType === 'element/customerInfo') && formData.length > 0) {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         if (sModelsType === 'element/customerInfo') {
@@ -91,7 +91,7 @@ export default (ChildComponent) =&gt; {
         }
       }
       if (commonUtils.isEmptyObject(supplyOldConfig) && formData.length > 0 && sModelsType === 'element/materialsInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -122,7 +122,7 @@ export default (ChildComponent) =&gt; {
       }
       /*  印件分类 */
       if (commonUtils.isEmptyObject(sisproductclassifyProcessClassifyConfig) && formData.length > 0 && sModelsType === 'element/sisproductclassify') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -147,7 +147,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(masterConfig) && formData.length > 0 && sModelsType === 'element/processInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -214,7 +214,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(picFileOldConfig) && formData.length > 0 && sModelsType === 'element/printInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -250,7 +250,7 @@ export default (ChildComponent) =&gt; {
       }
       // 常用规格信息  commonUtils.isEmptyArr(siscommonstyleproductclassifyColumn)
       if (commonUtils.isEmptyObject(siscommonstyleproductclassifyConfig) && formData.length > 0 && sModelsType === 'element/siscommonstyle') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -276,7 +276,7 @@ export default (ChildComponent) =&gt; {
       }
       // 班组信息
       if (commonUtils.isEmptyObject(eleemployeeOldConfig) && formData.length > 0 && sModelsType === 'element/teamInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'eleteam')[0];
         const eleemployeeConfig = formData.filter(item => item.bGrd && item.sTbName === 'eleteamemployee')[0];
         const eleemployeeColumn = commonFunc.getHeaderConfig(eleemployeeConfig);
@@ -306,7 +306,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(jurgroupOldConfig) && formData.length > 0 && sModelsType === 'element/sftloginInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -382,7 +382,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'system/sisformulaInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sisformula')[0];
         const paramConfig = formData.filter(item => item.bGrd && item.sTbName === 'sisformulaparam')[0];
         let customizeParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')) ? formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {};
@@ -553,7 +553,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'element/machineInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0];
         let addState = {};
         let slaveConfig = {};
@@ -627,7 +627,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(userOldConfig) && formData.length > 0 && sModelsType === 'element/checkModelInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elecheckmodel')[0];
         /* bGrd代表是否是表格 */
@@ -662,7 +662,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(sischeckphaselogininfoOldConfig) && formData.length > 0 && sModelsType === 'element/checkPhaseInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sischeckphase')[0];
         /* bGrd代表是否是表格 */
@@ -687,7 +687,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'sis/paymentTerms') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sispayment')[0];
         const firstRow = masterConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName === 'sName');
@@ -713,7 +713,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(employeeConfig) && formData.length > 0 && sModelsType === 'element/employeeInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -735,7 +735,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (formData.length > 0 && commonUtils.isEmptyObject(sysmsguserOldConfig) && sModelsType === 'smg/sendMailMsg') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
@@ -762,7 +762,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (formData.length > 0 && commonUtils.isEmptyObject(masterConfig) && sModelsType === 'sis/monthEndingClosing') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         masterConfig = formData.filter(item => !item.bGrd)[0];
         const firstRow = masterConfig.gdsconfigformslave[0];
@@ -784,7 +784,7 @@ export default (ChildComponent) =&gt; {
       }
       /* 刀模信息 */
       if (commonUtils.isEmptyObject(eleknifemouldOldproductConfig) && formData.length > 0 && sModelsType === 'element/knifemouldInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -821,7 +821,7 @@ export default (ChildComponent) =&gt; {
       }
       /* 检验标准 */
       if (commonUtils.isEmptyObject(eleteststandardOlditemConfig) && formData.length > 0 && sModelsType === 'element/eleteststandInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -64,7 +64,7 @@ export default (ChildComponent) =&gt; {
       } = nextProps;
       const { masterConfig: masterConfigOld, app } = nextProps;
       if (commonUtils.isEmptyObject(masterConfigOld) && formData.length > 0) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const sReasonTitle = commonUtils.isNotEmptyObject(commonFunc.showMessage(app.commonConst, 'sReason'))?
@@ -360,7 +360,7 @@ export default (ChildComponent) =&gt; {
     /**   获取主表、从表、审核表数据   */
     handleGetData = async (masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config, bEditClick, slave5Config, slave6Config, slave7Config, slave8Config, slave9Config, slave10Config) => {
       const { currentId, app } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       const { sModelsId, masterData, sModelsType, slaveSelectedRowKeys } = this.props;
       await this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick });
       let addStateSlave = {};
@@ -530,7 +530,7 @@ export default (ChildComponent) =&gt; {
     /* 获取表数据 */
     handleGetMemoData = async (slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       const addStateSlave = slaveConfig ? await this.props.handleGetDataSet({
         name: 'slave', configData: slaveConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
       }) : '';
@@ -564,7 +564,7 @@ export default (ChildComponent) =&gt; {
     /* 获取单张表数据 */
     handleGetOneMemoData = (memoName, memoConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
         this.props.handleGetDataSet({
           name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -22,7 +22,7 @@ export default (ChildComponent) =&gt; {
         formData, currentId, groupConfig, treeData,
       } = nextProps;
       let { bReceived } = nextProps;
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       if (commonUtils.isEmptyObject(groupConfig) && bReceived === undefined) {
         const masterConfig = formData.filter(item => !item.bGrd)[0];
@@ -199,7 +199,7 @@ export default (ChildComponent) =&gt; {
     handleGetSlaveData = (getType, sName, currConfig) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       if (getType === 'One') {
         this.props.handleGetDataOne({
           name: 'master', configData: currConfig, condition: { sId, pageSize: '', pageNum: '' },
@@ -23,7 +23,7 @@ export default (ChildComponent) =&gt; {
         formData, currentId, groupConfig, treeData, formRoute,
       } = nextProps;
       let { bReceived } = nextProps;
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       if (commonUtils.isEmptyObject(groupConfig) && bReceived === undefined) {
         const masterConfig = formData.filter(item => !item.bGrd)[0];
@@ -228,7 +228,7 @@ export default (ChildComponent) =&gt; {
     handleGetSlaveData = (getType, sName, currConfig) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       if (getType === 'One') {
         this.props.handleGetDataOne({
           name: 'master', configData: currConfig, condition: { sId, pageSize: '', pageNum: '' },
@@ -65,7 +65,7 @@ export default (ChildComponent) =&gt; {
         }
       }
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (formRoute.indexOf('/indexOee') > -1 || searchSolution !== undefined)) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const slaveConfig = formData[0];
         let addState = {};
@@ -65,7 +65,7 @@ export default (ChildComponent) =&gt; {
         }
       }
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (formRoute.indexOf('/indexOee') > -1 || searchSolution !== undefined)) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const slaveConfig = formData[0];
         let addState = {};
@@ -65,7 +65,7 @@ export default (ChildComponent) =&gt; {
         }
       }
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (formRoute.indexOf('/indexOee') > -1 || searchSolution !== undefined)) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const slaveConfig = formData[0];
         let addState = {};
@@ -58,7 +58,7 @@ export default (ChildComponent) =&gt; {
       let { iPageSize } = nextProps;
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (formRoute.indexOf('/indexOee') > -1 || searchSolution !== undefined)) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const slaveConfig = formData[0];
         const addState = {};
@@ -66,7 +66,7 @@ export default (ChildComponent) =&gt; {
       } = nextProps;
       const { masterConfig: masterConfigOld, app } = nextProps;
       if (commonUtils.isEmptyObject(masterConfigOld) && formData.length > 0) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const sReasonTitle = commonUtils.isNotEmptyObject(commonFunc.showMessage(app.commonConst, 'sReason'))?
@@ -593,7 +593,7 @@ export default (ChildComponent) =&gt; {
     /* 获取表数据 */
     handleGetMemoData = async (slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       const addStateSlave = slaveConfig ? await this.props.handleGetDataSet({
         name: 'slave', configData: slaveConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
       }) : '';
@@ -627,7 +627,7 @@ export default (ChildComponent) =&gt; {
     /* 获取单张表数据 */
     handleGetOneMemoData = (memoName, memoConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
         this.props.handleGetDataSet({
           name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -65,7 +65,7 @@ export default (ChildComponent) =&gt; {
       } = nextProps;
       const { masterConfig: masterConfigOld, app } = nextProps;
       if (commonUtils.isEmptyObject(masterConfigOld) && formData.length > 0) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const sReasonTitle = commonUtils.isNotEmptyObject(commonFunc.showMessage(app.commonConst, 'sReason'))?
@@ -514,7 +514,7 @@ export default (ChildComponent) =&gt; {
       }
       const { currentId, app } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       const { sModelsId, masterData, sModelsType, slaveSelectedRowKeys } = this.props;
       const conditonValues = this.handleGetSqlConditionValues(masterConfig)
       await this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sSqlCondition: { ...conditonValues }, sId, pageSize: '', pageNum: '' }, bEditClick });
@@ -707,7 +707,7 @@ export default (ChildComponent) =&gt; {
     handleGetData1 = async (configArr, bEditClick, other, isWait) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       let addState = {};
@@ -846,7 +846,7 @@ export default (ChildComponent) =&gt; {
     /* 获取表数据 */
     handleGetMemoData = async (slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       const addStateSlave = slaveConfig ? await this.props.handleGetDataSet({
         name: 'slave', configData: slaveConfig, condition: { sSqlCondition: { ...this.handleGetSqlConditionValues(slaveConfig), sParentId: sId } }, isWait: true,
       }) : '';
@@ -880,7 +880,7 @@ export default (ChildComponent) =&gt; {
     /* 获取单张表数据 */
     handleGetOneMemoData = (memoName, memoConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
         this.props.handleGetDataSet({
           name: memoName, configData: memoConfig, condition: { sSqlCondition: { ...this.handleGetSqlConditionValues(memoConfig), sParentId: sId } },
@@ -34,7 +34,7 @@ export default (ChildComponent) =&gt; {
       const { otherCondition } = currentPane;
       if (formData.length > 0 && commonUtils.isEmptyObject(teamConfig) && commonUtils.isEmptyArr(searchSolution)) {
         isReceive = false;
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'eleteam')[0];
         teamConfig = formData.filter(item => item.sTbName === 'Sp_Manufacture_ProductionPlanInfo_WorkCenter')[0];
@@ -36,7 +36,7 @@ export default (ChildComponent) =&gt; {
       const { otherCondition } = currentPane;
       if (formData.length > 0 && commonUtils.isEmptyObject(teamConfig) && commonUtils.isEmptyArr(searchSolution)) {
         isReceive = false;
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'eleteam')[0];
         teamConfig = formData.filter(item => item.sTbName === 'Sp_Manufacture_ProductionPlanInfo_WorkCenter2')[0];
@@ -102,7 +102,7 @@ export default (ChildComponent) =&gt; {
       const { otherCondition } = currentPane;
       if (formData.length > 0 && !treeLoaded && searchSolution !== undefined) {
         isReceive = false;
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'eleteam')[0];
         treeLoaded = true;
         // teamConfig = formData.filter(item => item.sTbName === 'Sp_Manufacture_ProductionPlanInfo_WorkCenter')[0];
@@ -51,7 +51,7 @@ export default (ChildComponent) =&gt; {
         employeeConfig: employeeConfigOld,
       } = nextProps;
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment' && sModelsType !== 'quality/accident' && sModelsType !== 'purchase/purchaseEnquiry' && sModelsType !== 'complaint/complaint' && sModelsType !== 'print/printLabel' && sModelsType !== 'commonBill/onlyMaster' && formRoute.indexOf('indexOee') === -1)) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const BtnDesignFunctionConfig = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'BtnBsOperation.BtnDesignFunction') : {};
@@ -506,7 +506,7 @@ export default (ChildComponent) =&gt; {
         });
       } else if (commonUtils.isEmptyObject(masterConfigOld) && formData.length === 1 && (sModelsType === 'cashier/financialTransfer' || sModelsType === 'purchase/purchaseEnquiry' || sModelsType === 'cashier/financialAdjustment' || sModelsType === 'print/printLabel' || sModelsType === 'complaint/complaint' || sModelsType === 'commonBill/onlyMaster') && formRoute.indexOf('indexOee') === -1) {
         const config = {};
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         let addState = {};
@@ -528,7 +528,7 @@ export default (ChildComponent) =&gt; {
           masterConfig, sId, pageLoading: false, ...addState,
         });
       } else if (commonUtils.isEmptyObject(slaveConfigOld) && commonUtils.isEmptyObject(masterConfigOld) && formData.length === 2 && (sModelsType === 'quality/accident') && formRoute.indexOf('indexOee') === -1) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'mftqualityaccidentSlave')[0];
@@ -551,7 +551,7 @@ export default (ChildComponent) =&gt; {
         });
       } else if (formRoute.indexOf('indexOee') > -1 && commonUtils.isEmptyObject(employeeConfigOld) && commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0) {
         if (formRoute === '/indexOee/labelPrint' && commonUtils.isEmpty(slaveConfigOld)) { /* 入库标签打印 */
-          const sId = currentId !== undefined ? currentId : '';
+          const sId = currentId || nextProps.masterData?.sId || '';
           /* 数据Id */
           const masterConfig = formData[0];
           const slaveConfig = formData[0];
@@ -745,7 +745,7 @@ export default (ChildComponent) =&gt; {
     /**   获取主表、从表、审核表数据   */
     handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
       const { currentId, sModelsId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       await this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -786,7 +786,7 @@ export default (ChildComponent) =&gt; {
     /* 获取表数据 */
     handleGetMemoData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig) => {
       const { currentId, sModelsType } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       const addStateControl = await this.props.handleGetDataSet({
         name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
       });
@@ -839,7 +839,7 @@ export default (ChildComponent) =&gt; {
     /* 获取单张表数据 */
     handleGetOneMemoData = (memoName, memoConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       if (commonUtils.isNotEmptyObject(sId)) { /* 解决detail数据没有问题 */
         this.props.handleGetDataSet({
           name: memoName, configData: memoConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -849,7 +849,7 @@ export default (ChildComponent) =&gt; {
     handleGetMemoData1 = async (memoDataList, isWait) => {
       const { currentId, sModelsType, sModelsId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       let addState = {};
       // eslint-disable-next-line no-plusplus
       for (let i = 0; i < memoDataList.length; i++) {
@@ -23,7 +23,7 @@ export default (ChildComponent) =&gt; {
       const { formData, currentId } = nextProps;
       let { masterConfig } = nextProps;
       if (commonUtils.isEmptyArr(masterConfig) && formData.length > 0) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         masterConfig = formData.filter(item => !item.bGrd)[0];
         const sysaccountperiodConfig = formData.filter(item => item.bGrd && item.sTbName === 'sysaccountperiod')[0];
         const sysaccountperiodColumn = commonFunc.getHeaderConfig(sysaccountperiodConfig);
@@ -58,7 +58,7 @@ export default (ChildComponent) =&gt; {
     }
     handleGetData = (masterConfig, sysaccountperiodConfig, sysbillnosettingsConfig, syspushMsgConfig) => {
       const { currentId, year } = this.props;
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       const condition = {
         sSqlCondition: {
           sParentId: masterConfig.sId,
@@ -55,7 +55,7 @@ class ProcessCard extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       /* bGrd代表是否是表格 */
@@ -136,7 +136,7 @@ class ProcessCard extends Component {
     }
     // // 未清复制到时，产品ID需要再获取动态部件
-    // const sId = currentId !== undefined ? currentId : '';
+    // const sId = currentId || nextProps.masterData?.sId || '';
     // if (sId === '' && commonUtils.isNotEmptyObject(this.props.masterData) && !this.props.bGetPartsData) {
     //   const { sAllPartsName } = this.props.masterData;
     //   if (sAllPartsName !== undefined) {
@@ -164,7 +164,7 @@ class ProcessCard extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, colorConfig, dailyConfig, extraState = {}) => {
     const { currentId } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -80,7 +80,7 @@ class ProcessCardPack extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       /* bGrd代表是否是表格 */
@@ -210,7 +210,7 @@ class ProcessCardPack extends Component {
       }
     }
     // // 未清复制到时，产品ID需要再获取动态部件;
-    // const sId = currentId !== undefined ? currentId : '';
+    // const sId = currentId || nextProps.masterData?.sId || '';
     // if (sId === '' && commonUtils.isNotEmptyObject(this.props.masterData) && !this.props.bGetPartsData) {
     //   const { sAllPartsName } = this.props.masterData;
     //   if (sAllPartsName !== undefined) {
@@ -287,7 +287,7 @@ class ProcessCardPack extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, colorConfig, dailyConfig, packConfig, extraState = {}) => {
     const { currentId, slaveData  } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -98,7 +98,7 @@ class ProcessCardPackTableTree extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       if(masterConfig && masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'bLayout')[0]) {
@@ -273,7 +273,7 @@ class ProcessCardPackTableTree extends Component {
       });
     }
     // // 未清复制到时，产品ID需要再获取动态部件;
-    // const sId = currentId !== undefined ? currentId : '';
+    // const sId = currentId || nextProps.masterData?.sId || '';
     // if (sId === '' && commonUtils.isNotEmptyObject(this.props.masterData) && !this.props.bGetPartsData) {
     //   const { sAllPartsName } = this.props.masterData;
     //   if (sAllPartsName !== undefined) {
@@ -426,7 +426,7 @@ class ProcessCardPackTableTree extends Component {
   /* 获取表数据 */
   handleGetData1 = async (controlConfig, materialsConfig, processConfig, colorConfig, dailyConfig, packConfig, extraState = {}, configMap) => {
     const { currentId, slaveData, masterData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -703,7 +703,7 @@ class ProcessCardPackTableTree extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, colorConfig, dailyConfig, packConfig, extraState = {}, configMap) => {
     const { currentId, slaveData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     this.handleGetAllData(controlConfig, processConfig, sId, materialsConfig, colorConfig, dailyConfig,  packConfig, extraState, configMap);
   };
@@ -711,7 +711,7 @@ class ProcessCardPackTableTree extends Component {
   handleGetOtherData = async (tableList, childTableList, configMap) => {
     const { currentId, slaveData, sModelsType, masterData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     if(commonUtils.isNotEmptyObject(configMap)){
       for (const configName of Object.keys(configMap)) {
         const tableName = configName.replace('Config', '').trim();
@@ -100,7 +100,7 @@ class WorkOrder extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       /* bGrd代表是否是表格 */
@@ -167,7 +167,7 @@ class WorkOrder extends Component {
     }
     // // 未清复制到时，产品ID需要再获取动态部件
-    // const sId = currentId !== undefined ? currentId : '';
+    // const sId = currentId || nextProps.masterData?.sId || '';
     // if (sId === '' && commonUtils.isNotEmptyObject(this.props.masterData) && !this.props.bGetPartsData) {
     //   const { sAllPartsName } = this.props.masterData;
     //   if (sAllPartsName !== undefined) {
@@ -220,7 +220,7 @@ class WorkOrder extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, colorConfig, extraState = {}) => {
     const { currentId } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -95,7 +95,7 @@ class WorkOrderPack extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       /* bGrd代表是否是表格 */
@@ -300,7 +300,7 @@ class WorkOrderPack extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig, extraState = {}) => {
     const { currentId, slaveData, sModelsType } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -140,7 +140,7 @@ class WorkOrderPack extends Component {
     } = nextProps;
     const { formData, currentId, sModelsId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       if(masterConfig && masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'bLayout')[0]) {
@@ -613,7 +613,7 @@ class WorkOrderPack extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig, extraState = {}) => {
     const { currentId, slaveData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     this.handleGetAllData(controlConfig, processConfig, sId, materialsConfig, colorConfig, packConfig, extraState);
   };
@@ -621,7 +621,7 @@ class WorkOrderPack extends Component {
   handleGetOtherData = async (tableList, childTableList, configMap) => {
     const { currentId, slaveData, sModelsType, masterData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     if(commonUtils.isNotEmptyObject(configMap)){
       for (const configName of Object.keys(configMap)) {
         const tableName = configName.replace('Config', '').trim();
@@ -117,7 +117,7 @@ class WorkOrderPack extends Component {
     } = nextProps;
     const { formData, currentId, sModelsId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       if(masterConfig && masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'bLayout')[0]) {
@@ -428,7 +428,7 @@ class WorkOrderPack extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, colorConfig, packConfig, extraState = {}) => {
     const { currentId, slaveData, sModelsType, masterData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -540,7 +540,7 @@ class WorkOrderPack extends Component {
   handleGetOtherData = async (tableList, childTableList, configMap) => {
     const { currentId, slaveData, sModelsType, masterData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     if(commonUtils.isNotEmptyObject(configMap)){
       for (const configName of Object.keys(configMap)) {
         const tableName = configName.replace('Config', '').trim();
@@ -50,7 +50,7 @@ class ProductionReport extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(employeeColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       /* bGrd代表是否是表格 */
@@ -115,7 +115,7 @@ class ProductionReport extends Component {
   /* 获取表数据 */
   handleGetData = (employeeConfig, extraState = {}) => {
     const { currentId } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     this.props.handleGetDataSet({
       name: 'employee', configData: employeeConfig, condition: { sSqlCondition: { sParentId: sId } },
     });
@@ -364,7 +364,7 @@ class ProductionReport extends Component {
   /**   获取主表、从表、审核表、员工表数据   */
   handleGetTableData = (masterConfig, slaveConfig, checkConfig, employeeConfig) => {
     const { currentId } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : '';
+    const sId = currentId || this.props.masterData?.sId || '';
     this.props.handleGetDataOne({
       name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' },
     });
@@ -63,7 +63,7 @@ class Quotation extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       /* bGrd代表是否是表格 */
@@ -177,7 +177,7 @@ class Quotation extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, manyqtysConfig, colorConfig, extraState = {}) => {
     const { currentId } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -80,7 +80,7 @@ class QuotationPack extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       /* bGrd代表是否是表格 */
@@ -291,7 +291,7 @@ class QuotationPack extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, manyqtysConfig, colorConfig, packConfig, extraState = {}) => {
     const { currentId, slaveData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -101,7 +101,7 @@ class QuotationPackTableTree extends Component {
     } = nextProps;
     const { formData, currentId } = nextProps;
     if (commonUtils.isEmptyArr(controlColumn) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       /* 数据Id */
       const masterConfig = formData.filter(item => !item.bGrd)[0];
       if(masterConfig && masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'bLayout')[0]) {
@@ -382,7 +382,7 @@ class QuotationPackTableTree extends Component {
   /* 获取表数据 */
   handleGetData = async (controlConfig, materialsConfig, processConfig, manyqtysConfig, colorConfig, packConfig, extraState = {}) => {
     const { currentId, masterData, slaveData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     const addStateControl = await this.props.handleGetDataSet({
       name: 'control', configData: controlConfig, condition: { sSqlCondition: { sParentId: sId } }, isWait: true,
     });
@@ -654,7 +654,7 @@ class QuotationPackTableTree extends Component {
   handleGetOtherData = async (tableList, childTableList, configMap) => {
     const { currentId, slaveData, sModelsType, masterData } = this.props; /* 当前页签数据 */
-    const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+    const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
     if(commonUtils.isNotEmptyObject(configMap)){
       for (const configName of Object.keys(configMap)) {
         const tableName = configName.replace('Config', '').trim();
@@ -25,7 +25,7 @@ export default (ChildComponent) =&gt; {
         formData, currentId, masterConfig: masterConfigOld, sModelsId,
       } = nextProps;
       if (commonUtils.isEmptyObject(masterConfigOld) && formData.length > 0) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const slaveConfig = formData.filter(item => item.bGrd)[0];
@@ -777,7 +777,7 @@ export default (ChildComponent) =&gt; {
     /**   获取主表、从表、审核表数据   */
     handleGetData = async (masterConfig, slaveConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       await this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' } });
       if (!commonUtils.isEmptyObject(slaveConfig)) {
         this.props.handleGetDataSet({
@@ -788,7 +788,7 @@ export default (ChildComponent) =&gt; {
     handleGetMemoData = async (employeeConfig) => {
       const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : ''; /* 数据Id */
+      const sId = currentId || this.props.masterData?.sId || ''; /* 数据Id */
       this.props.handleGetDataSet({
         name: 'employee', configData: employeeConfig, condition: { sSqlCondition: { sParentId: sId } },
       });
@@ -25,7 +25,7 @@ export default (ChildComponent) =&gt; {
         formData, currentId, masterConfig: masterConfigOld, sModelsId,
       } = nextProps;
       if (commonUtils.isEmptyObject(masterConfigOld) && formData.length > 0) {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         const slaveConfig = formData.filter(item => item.bGrd)[0];
@@ -59,7 +59,7 @@ class ProcessReportMobileComponent extends React.Component {
   componentWillReceiveProps(nextProps) {
     const { formData, employeeConfig, currentId } = nextProps;
     if (commonUtils.isEmptyObject(employeeConfig) && formData.length > 0) {
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || nextProps.masterData?.sId || '';
       const employeeConfig = formData.filter(item => item.sTbName.toUpperCase() === 'mftproductionreportemployee'.toUpperCase())[0];
       const addState = {};
       if (sId === '') {