Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2

Bin/x64/Debug/Config/ReportTemplate/TCleannessA_Template/ReportTemplateConfig.xml

@@ -12,7 +12,7 @@
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
     <LOGName>ReportIdentification.bmp</LOGName>
-    <StandardLibraryName>STD.db</StandardLibraryName>
+    <StandardLibraryName>Cleanness_F.db</StandardLibraryName>
     <str_tb_SampleName>
     </str_tb_SampleName>
     <str_tb_djsb>
@@ -37,9 +37,9 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>DMAX</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>
+    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
+    <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
     <str_cb_klcc_ljb>j4.psf</str_cb_klcc_ljb>
     <ParticleSizeGraphicSelection>0</ParticleSizeGraphicSelection>
     <INCAGraphicSelection>0</INCAGraphicSelection>
@@ -90,7 +90,7 @@
     </str_cb_syxt_ljb>
   </M_SYXT>
   <M_KLLBXX>
-    <b_ck_kllb_xsmk>False</b_ck_kllb_xsmk>
+    <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>
@@ -142,11 +142,11 @@
     <b_ck_chart>False</b_ck_chart>
   </M_JZWZB>
   <whole>
-    <list_str_MainPriority>System.Collections.Generic.List`1[System.String]<YS0>Cu</YS0><YS1>Zn</YS1><YS2>Fe</YS2><YS3>Other Non-Magnetic</YS3></list_str_MainPriority>
+    <list_str_MainPriority>System.Collections.Generic.List`1[System.String]<YS0>Cu alloy</YS0><YS1>Cu(Zn)</YS1><YS2>Zn alloy</YS2><YS3>Fe-Cr-Ni</YS3><YS4>Fe-Cr</YS4><YS5>Fe-Ni</YS5><YS6>Fe-O</YS6><YS7>Cu-O</YS7><YS8>Zn-O</YS8><YS9>Nialloy</YS9><YS10>Ni-Cr</YS10><YS11>Fe-NCM </YS11><YS12>Fe-P</YS12><YS13>Fe-alloy</YS13><YS14>Cr-alloy</YS14><YS15>NCM</YS15><YS16>W-alloy</YS16><YS17>Zr alloy</YS17><YS18>Ti alloy</YS18><YS19>Al alloy</YS19><YS20>Al-0</YS20><YS21>Ca-Mg-Na-K-Si</YS21><YS22>NoFerous Mental</YS22></list_str_MainPriority>
     <list_str_SecondaryPriority>System.Collections.Generic.List`1[System.String]<YS0>Nialloy</YS0><YS1>Fe-O</YS1><YS2>Fe-Cr</YS2><YS3>Fe-alloy</YS3></list_str_SecondaryPriority>
-    <str_MainPriority>Cu , Zn , Fe , Other Non-Magnetic</str_MainPriority>
+    <str_MainPriority>Cu alloy , Cu(Zn) , Zn alloy , Fe-Cr-Ni , Fe-Cr , Fe-Ni , Fe-O , Cu-O , Zn-O , Nialloy , Ni-Cr , Fe-NCM  , Fe-P , Fe-alloy , Cr-alloy , NCM , W-alloy , Zr alloy , Ti alloy , Al alloy , Al-0 , Ca-Mg-Na-K-Si , NoFerous Mental</str_MainPriority>
     <str_SecondaryPriority>Nialloy,Fe-O,Fe-Cr,Fe-alloy</str_SecondaryPriority>
-    <list_str_MainPriority_Serial>System.Collections.Generic.List`1[System.String]<YS0>40004</YS0><YS1>40007</YS1><YS2>40005</YS2><YS3>40006</YS3></list_str_MainPriority_Serial>
+    <list_str_MainPriority_Serial>System.Collections.Generic.List`1[System.String]<YS0>40003</YS0><YS1>40004</YS1><YS2>40005</YS2><YS3>40006</YS3><YS4>40007</YS4><YS5>40008</YS5><YS6>40001</YS6><YS7>40002</YS7><YS8>40009</YS8><YS9>40010</YS9><YS10>40011</YS10><YS11>40012</YS11><YS12>40013</YS12><YS13>40014</YS13><YS14>40015</YS14><YS15>40016</YS15><YS16>40017</YS16><YS17>40018</YS17><YS18>40019</YS18><YS19>40020</YS19><YS20>40021</YS20><YS21>40022</YS21><YS22>40024</YS22></list_str_MainPriority_Serial>
   </whole>
   <M_DZ>
     <Notes>

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1672,6 +1672,7 @@
     <EmbeddedResource Include="Help.resx">
       <DependentUpon>Help.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>