Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

Bin/x64/Debug/Config/ConfigTemplate/BatteryCleannessA/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="CleannessA">
-  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Cleanness_F" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" ParticleSelectionCondition="dmax:1-2,dmin:3-5" ErrodDilateParam="0" OverlapParam="0">
+<XMLData RunMode="ProfessionalMode" SysType="IncA">
+  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" UseSysSTD="true" />
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" ErrodDilateParam="0" ParticleSelectionCondition="dmax:1-2,dmin:3-5" OverlapParam="0">
     <Member RegName="BGGray" end="255" start="80" />
     <Member RegName="IncArea" end="100" start="3" />
     <Member RegName="ParticleGray" end="255" start="0" />

Bin/x64/Debug/Config/ConfigTemplate/BatteryCleannessA/OTSReportMgrParam.rpf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="CleannessA">
+<XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
-  <Member RegName="ElementsColName" strValue="Al,Si,C,S,N,O,Fe,Cr,Ni,Ca,Mg" />
+  <Member RegName="ElementsColName" strValue="C,Al,Cl,Ca,Ti,Fe,Zn,Ba,W,Mg,P,K,Cr,Sn,Pb,Si,S,Ni,Cu,Cd,Mn" />
   <Member RegName="PartSizeFile" name="lj.psf" />
 </XMLData>

Bin/x64/Debug/Config/ConfigTemplate/BatteryCleannessA/ReportTemplateConfig.xml

@@ -1,130 +0,0 @@
-<XmlConfig>
-  <M_SY>
-    <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>宁德时代</str_tb_FBT>
-    <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
-    <b_ck_ypsm>True</b_ck_ypsm>
-    <b_ck_jggk>True</b_ck_jggk>
-    <str_bz>
-    </str_bz>
-    <str_xzkl>全部颗粒</str_xzkl>
-    <int_xzkl>0</int_xzkl>
-  </M_SY>
-  <M_YMYJ>
-    <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
-    <str_tb_KHH>Copi0000123012</str_tb_KHH>
-    <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>OTS Result</str_tb_yjwb>
-  </M_YMYJ>
-  <M_KLFXJG>
-    <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
-    <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
-    <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
-    <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
-    <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
-    <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
-    <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
-    <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
-    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
-    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
-    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
-  </M_KLFXJG>
-  <M_YSFXJG>
-    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
-    <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
-    <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
-    <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
-    <list_str_tb_ysfx_xsys>
-      <YS0>Al</YS0>
-      <YS1>Si</YS1>
-      <YS2>C</YS2>
-      <YS3>S</YS3>
-      <YS4>N</YS4>
-      <YS5>O</YS5>
-      <YS6>Fe</YS6>
-      <YS7>Ti</YS7>
-      <YS8>Mn</YS8>
-      <YS9>Mg</YS9>
-      <YS10>Ca</YS10>
-      <YS11>Ce</YS11>
-      <YS12>La</YS12>
-    </list_str_tb_ysfx_xsys>
-    <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
-    <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
-    <index_cb_yscf_jsfs>0</index_cb_yscf_jsfs>
-    <index_cb_yscf_klfw>0</index_cb_yscf_klfw>
-    <str_tb_yscf_ysxx>H</str_tb_yscf_ysxx>
-    <list_str_tb_yscf_ysxx>
-      <YS0>H</YS0>
-    </list_str_tb_yscf_ysxx>
-  </M_YSFXJG>
-  <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
-    <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
-    <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
-    <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
-    <list_lbv_syxt_mblb>
-      <MB0>MgO.CaO.Al₂O₃</MB0>
-      <MB1>CaO.SiO₂.Al₂O₃</MB1>
-    </list_lbv_syxt_mblb>
-    <list_lbv_syxt_mblb_index>
-      <MBIndex0>0</MBIndex0>
-      <MBIndex1>2</MBIndex1>
-    </list_lbv_syxt_mblb_index>
-  </M_SYXT>
-  <M_KLLBXX>
-    <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>
-    <index_cb_kllb_jsfs>0</index_cb_kllb_jsfs>
-    <index_cb_kllb_klfw>0</index_cb_kllb_klfw>
-    <int_tb_kllb_ylsx>1</int_tb_kllb_ylsx>
-    <str_tb_kllb_sxys>O,Al,Mg,Ca,Ti,Si,S,Mn</str_tb_kllb_sxys>
-    <list_str_tb_lllb_sxys>
-      <YS0>O</YS0>
-      <YS1>Al</YS1>
-      <YS2>Mg</YS2>
-      <YS3>Ca</YS3>
-      <YS4>Ti</YS4>
-      <YS5>Si</YS5>
-      <YS6>S</YS6>
-      <YS7>Mn</YS7>
-    </list_str_tb_lllb_sxys>
-    <b_ck_kllb_ystx>True</b_ck_kllb_ystx>
-    <b_ck_kllb_fdtx>False</b_ck_kllb_fdtx>
-    <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
-    <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
-    <index_cb_kllb_sort>2</index_cb_kllb_sort>
-    <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
-    <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
-    <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
-    <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
-    <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
-    <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
-    <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
-    <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
-    <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
-    <list_str_kllb_qcys>
-      <YS0>C</YS0>
-    </list_str_kllb_qcys>
-    <str_kllb_qcys>C</str_kllb_qcys>
-    <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
-    <list_str_kllb_DeleteClass>
-      <YS0>misc</YS0>
-    </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>20</list_int_kllb_number>
-  </M_KLLBXX>
-  <M_address>
-    <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
-  </M_address>
-  <M_JZWZB>
-    <b_ck_surface>False</b_ck_surface>
-    <b_ck_chart>False</b_ck_chart>
-  </M_JZWZB>
-</XmlConfig>

Bin/x64/Debug/Config/ConfigTemplate/CleannessA/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="CleannessA">
-  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="OTSCleanlinessSTD1" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" ParticleSelectionCondition="dmax:1-2,dmin:3-5" ErrodDilateParam="0" OverlapParam="0">
+<XMLData RunMode="ProfessionalMode" SysType="IncA">
+  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" UseSysSTD="true" />
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" ErrodDilateParam="0" ParticleSelectionCondition="dmax:1-2,dmin:3-5" OverlapParam="0">
     <Member RegName="BGGray" end="255" start="80" />
     <Member RegName="IncArea" end="100" start="3" />
     <Member RegName="ParticleGray" end="255" start="0" />

Bin/x64/Debug/Config/ConfigTemplate/CleannessA/OTSReportMgrParam.rpf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="CleannessA">
+<XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
-  <Member RegName="ElementsColName" strValue="Al,Si,C,S,N,O,Fe,Cr,Ni,Ca,Mg" />
+  <Member RegName="ElementsColName" strValue="C,Al,Cl,Ca,Ti,Fe,Zn,Ba,W,Mg,P,K,Cr,Sn,Pb,Si,S,Ni,Cu,Cd,Mn" />
   <Member RegName="PartSizeFile" name="lj.psf" />
 </XMLData>

Bin/x64/Debug/Config/ConfigTemplate/CleannessA/ReportTemplateConfig.xml

@@ -1,130 +0,0 @@
-<XmlConfig>
-  <M_SY>
-    <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>宁德时代</str_tb_FBT>
-    <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
-    <b_ck_ypsm>True</b_ck_ypsm>
-    <b_ck_jggk>True</b_ck_jggk>
-    <str_bz>
-    </str_bz>
-    <str_xzkl>全部颗粒</str_xzkl>
-    <int_xzkl>0</int_xzkl>
-  </M_SY>
-  <M_YMYJ>
-    <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
-    <str_tb_KHH>Copi0000123012</str_tb_KHH>
-    <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>OTS Result</str_tb_yjwb>
-  </M_YMYJ>
-  <M_KLFXJG>
-    <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
-    <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
-    <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
-    <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
-    <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
-    <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
-    <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
-    <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
-    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
-    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
-    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
-  </M_KLFXJG>
-  <M_YSFXJG>
-    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
-    <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
-    <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
-    <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
-    <list_str_tb_ysfx_xsys>
-      <YS0>Al</YS0>
-      <YS1>Si</YS1>
-      <YS2>C</YS2>
-      <YS3>S</YS3>
-      <YS4>N</YS4>
-      <YS5>O</YS5>
-      <YS6>Fe</YS6>
-      <YS7>Ti</YS7>
-      <YS8>Mn</YS8>
-      <YS9>Mg</YS9>
-      <YS10>Ca</YS10>
-      <YS11>Ce</YS11>
-      <YS12>La</YS12>
-    </list_str_tb_ysfx_xsys>
-    <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
-    <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
-    <index_cb_yscf_jsfs>0</index_cb_yscf_jsfs>
-    <index_cb_yscf_klfw>0</index_cb_yscf_klfw>
-    <str_tb_yscf_ysxx>H</str_tb_yscf_ysxx>
-    <list_str_tb_yscf_ysxx>
-      <YS0>H</YS0>
-    </list_str_tb_yscf_ysxx>
-  </M_YSFXJG>
-  <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
-    <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
-    <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
-    <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
-    <list_lbv_syxt_mblb>
-      <MB0>MgO.CaO.Al₂O₃</MB0>
-      <MB1>CaO.SiO₂.Al₂O₃</MB1>
-    </list_lbv_syxt_mblb>
-    <list_lbv_syxt_mblb_index>
-      <MBIndex0>0</MBIndex0>
-      <MBIndex1>2</MBIndex1>
-    </list_lbv_syxt_mblb_index>
-  </M_SYXT>
-  <M_KLLBXX>
-    <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>
-    <index_cb_kllb_jsfs>0</index_cb_kllb_jsfs>
-    <index_cb_kllb_klfw>0</index_cb_kllb_klfw>
-    <int_tb_kllb_ylsx>1</int_tb_kllb_ylsx>
-    <str_tb_kllb_sxys>O,Al,Mg,Ca,Ti,Si,S,Mn</str_tb_kllb_sxys>
-    <list_str_tb_lllb_sxys>
-      <YS0>O</YS0>
-      <YS1>Al</YS1>
-      <YS2>Mg</YS2>
-      <YS3>Ca</YS3>
-      <YS4>Ti</YS4>
-      <YS5>Si</YS5>
-      <YS6>S</YS6>
-      <YS7>Mn</YS7>
-    </list_str_tb_lllb_sxys>
-    <b_ck_kllb_ystx>True</b_ck_kllb_ystx>
-    <b_ck_kllb_fdtx>False</b_ck_kllb_fdtx>
-    <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
-    <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
-    <index_cb_kllb_sort>2</index_cb_kllb_sort>
-    <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
-    <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
-    <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
-    <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
-    <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
-    <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
-    <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
-    <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
-    <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
-    <list_str_kllb_qcys>
-      <YS0>C</YS0>
-    </list_str_kllb_qcys>
-    <str_kllb_qcys>C</str_kllb_qcys>
-    <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
-    <list_str_kllb_DeleteClass>
-      <YS0>misc</YS0>
-    </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>20</list_int_kllb_number>
-  </M_KLLBXX>
-  <M_address>
-    <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
-  </M_address>
-  <M_JZWZB>
-    <b_ck_surface>False</b_ck_surface>
-    <b_ck_chart>False</b_ck_chart>
-  </M_JZWZB>
-</XmlConfig>

Bin/x64/Debug/Config/ConfigTemplate/IncA/OTSReportMgrParam.rpf

@@ -2,6 +2,6 @@
 <XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
-  <Member RegName="ElementsColName" strValue="Al,Si,C,S,N,O,Fe,Cr,Ni,Ca,Mg" />
+  <Member RegName="ElementsColName" strValue="C,Al,Cl,Ca,Ti,Fe,Zn,Ba,W,Mg,P,K,Cr,Sn,Pb,Si,S,Ni,Cu,Cd,Mn" />
   <Member RegName="PartSizeFile" name="lj.psf" />
 </XMLData>

Bin/x64/Debug/Config/ConfigTemplate/IncA/ReportTemplateConfig.xml

@@ -1,131 +0,0 @@
-<XmlConfig>
-  <M_SY>
-    <str_tb_ZBT>OTS Report</str_tb_ZBT>
-    <str_tb_FBT>XX有限公司</str_tb_FBT>
-    <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
-    <b_ck_ypsm>True</b_ck_ypsm>
-    <b_ck_jggk>True</b_ck_jggk>
-    <str_bz>
-    </str_bz>
-    <str_xzkl>全部颗粒</str_xzkl>
-    <int_xzkl>0</int_xzkl>
-  </M_SY>
-  <M_YMYJ>
-    <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
-    <str_tb_KHH>Copi0000123012</str_tb_KHH>
-    <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>OTS Result</str_tb_yjwb>
-  </M_YMYJ>
-  <M_KLFXJG>
-    <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
-    <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
-    <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
-    <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
-    <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
-    <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
-    <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
-    <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
-    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
-    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
-    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
-  </M_KLFXJG>
-  <M_YSFXJG>
-    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
-    <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
-    <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
-    <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
-    <list_str_tb_ysfx_xsys>
-      <YS0>Al</YS0>
-      <YS1>Si</YS1>
-      <YS2>C</YS2>
-      <YS3>S</YS3>
-      <YS4>N</YS4>
-      <YS5>O</YS5>
-      <YS6>Fe</YS6>
-      <YS7>Ti</YS7>
-      <YS8>Mn</YS8>
-      <YS9>Mg</YS9>
-      <YS10>Ca</YS10>
-      <YS11>Ce</YS11>
-      <YS12>La</YS12>
-    </list_str_tb_ysfx_xsys>
-    <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
-    <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
-    <index_cb_yscf_jsfs>0</index_cb_yscf_jsfs>
-    <index_cb_yscf_klfw>0</index_cb_yscf_klfw>
-    <str_tb_yscf_ysxx>H</str_tb_yscf_ysxx>
-    <list_str_tb_yscf_ysxx>
-      <YS0>H</YS0>
-    </list_str_tb_yscf_ysxx>
-  </M_YSFXJG>
-  <M_SYXT>
-    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
-    <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
-    <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
-    <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
-    <list_lbv_syxt_mblb>
-      <MB0>MgO.CaO.Al₂O₃</MB0>
-      <MB1>CaO.SiO₂.Al₂O₃</MB1>
-    </list_lbv_syxt_mblb>
-    <list_lbv_syxt_mblb_index>
-      <MBIndex0>0</MBIndex0>
-      <MBIndex1>2</MBIndex1>
-    </list_lbv_syxt_mblb_index>
-  </M_SYXT>
-  <M_KLLBXX>
-    <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>
-    <index_cb_kllb_jsfs>0</index_cb_kllb_jsfs>
-    <index_cb_kllb_klfw>0</index_cb_kllb_klfw>
-    <int_tb_kllb_ylsx>1</int_tb_kllb_ylsx>
-    <str_tb_kllb_sxys>O,Al,Mg,Ca,Ti,Si,S,Mn</str_tb_kllb_sxys>
-    <list_str_tb_lllb_sxys>
-      <YS0>O</YS0>
-      <YS1>Al</YS1>
-      <YS2>Mg</YS2>
-      <YS3>Ca</YS3>
-      <YS4>Ti</YS4>
-      <YS5>Si</YS5>
-      <YS6>S</YS6>
-      <YS7>Mn</YS7>
-    </list_str_tb_lllb_sxys>
-    <b_ck_kllb_ystx>True</b_ck_kllb_ystx>
-    <b_ck_kllb_fdtx>False</b_ck_kllb_fdtx>
-    <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
-    <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
-    <index_cb_kllb_sort>2</index_cb_kllb_sort>
-    <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
-    <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
-    <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
-    <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
-    <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
-    <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
-    <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
-    <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
-    <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
-    <list_str_kllb_qcys>
-      <YS0>C</YS0>
-      <YS1>Fe</YS1>
-    </list_str_kllb_qcys>
-    <str_kllb_qcys>C,Fe</str_kllb_qcys>
-    <str_kllb_DeleteClass>FeO,SiC</str_kllb_DeleteClass>
-    <list_str_kllb_DeleteClass>
-      <YS0>FeO</YS0>
-      <YS1>SiC</YS1>
-    </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>20</list_int_kllb_number>
-  </M_KLLBXX>
-  <M_address>
-    <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
-  </M_address>
-  <M_JZWZB>
-    <b_ck_surface>True</b_ck_surface>
-    <b_ck_chart>True</b_ck_chart>
-  </M_JZWZB>
-</XmlConfig>

OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -356,44 +356,51 @@ namespace OTSSysMgrApp
             DialogResult dialogResult = switchSystemValidation.ShowDialog();
             if (dialogResult == DialogResult.OK)
             {
-                if (switchSystemValidation.UpdateFile)
+                if (!switchSystemValidation.GetUpdateFile())
                 {
                     WriteSysType();
                     return true;
                 }
-                string sourceFilepath = Application.StartupPath + @"\Config\ConfigTemplate";
-                if (radioButton_IncA.Checked)
-                {
-                    sourceFilepath += "\\IncA";
-                }
-                else if (radioButton_CleannessA.Checked)
+                else
                 {
-                    if (coB_CleannessType.SelectedItem.ToString() == "CleannessA")
-                    {
-                        sourceFilepath += "\\CleannessA";
-                    }
-                    else
+                    string sourceFilepath = Application.StartupPath + @"\Config\ConfigTemplate";
+                    if (radioButton_IncA.Checked)
                     {
-                        sourceFilepath += "\\BatteryCleannessA";
+                        sourceFilepath += "\\IncA";
                     }
-                }
-                var files = Directory.GetFiles(sourceFilepath);
-                foreach (var file in files)
-                {
-                    string tagretFile = Application.StartupPath + @"\Config";
-                    var fileInfo = new FileInfo(file);
-                    if (fileInfo.Name == "ReportTemplateConfig.xml")
+                    else if (radioButton_CleannessA.Checked)
                     {
-                        tagretFile += "\\ReportTemplate";
+                        if (coB_CleannessType.SelectedItem.ToString() == "CleannessA")
+                        {
+                            sourceFilepath += "\\CleannessA";
+                        }
+                        else
+                        {
+                            sourceFilepath += "\\BatteryCleannessA";
+                        }
                     }
-                    else
+                    var files = Directory.GetFiles(sourceFilepath);
+                    foreach (var file in files)
                     {
-                        tagretFile += "\\SysData";
+                        string tagretFile = Application.StartupPath + @"\Config";
+                        var fileInfo = new FileInfo(file);
+                        if (fileInfo.Name == "ReportTemplateConfig.xml")
+                        {
+                            tagretFile += "\\ReportTemplate";
+                        }
+                        else
+                        {
+                            tagretFile += "\\SysData";
+                        }
+                        fileInfo.CopyTo(tagretFile + "\\" + fileInfo.Name, true);
                     }
-                    fileInfo.CopyTo(tagretFile + "\\" + fileInfo.Name, true);
+                    WriteSysType();
+                    MessageBox.Show("Configure successful！", "Tip");
+                    return true;
+
+
                 }
-                MessageBox.Show("Configure successful！", "Tip");
-                return true;
+                
             }
             return false;
         }

OTSSysMgrApp/SwitchSystemValidation.cs

@@ -12,11 +12,16 @@ namespace OTSSysMgrApp
 {
     public partial class SwitchSystemValidation : Form
     {
-        
-        public bool UpdateFile
+        private bool updateFile=false;
+
+        public bool GetUpdateFile()
+        {
+            return updateFile;
+        }
+
+        public void SetUpdateFile(bool value)
         {
-            get;
-            set;
+            updateFile = value;
         }
 
         public SwitchSystemValidation()
@@ -37,7 +42,7 @@ namespace OTSSysMgrApp
 
         private void cB_updatefile_CheckedChanged(object sender, EventArgs e)
         {
-            UpdateFile = cB_updatefile.Checked;
+            SetUpdateFile(cB_updatefile.Checked);
         }
 
         private void btn_CANCEL_Click(object sender, EventArgs e)