Merge branch 'ZJX' into release2.1

Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -16,7 +16,7 @@
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
     <index_cb_klcc_jsfs>0</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>1</index_cb_klcc_ljb>
+    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
     <index_cb_klcc_klfw>1</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
     <index_cb_jzwfl_xstx>4</index_cb_jzwfl_xstx>

Bin/x64/Debug/Config/ProData/lj.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,1.5,2,5,10,20,30,40" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,1.5,2,5,10,20,30" Version="1.1.1" />

OTSIncAReportApp/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -493,7 +493,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
                 DataRow dr = ls_partsize_dt.NewRow();
                 //从2开始，固定的
-                int col = 9;
+                int col = 7;
                 for (int i = 1; i < 11; i++)
                 {
                     if (ls_gv.Columns.Count > col)
@@ -527,7 +527,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr2["Hardness"] = ls_gv.Rows[i].Cells[6].Value.ToString();
                     dr2["Density"] = ls_gv.Rows[i].Cells[7].Value.ToString();
                     dr2["Conductivity"] = ls_gv.Rows[i].Cells[8].Value.ToString();
-                    int col2 = 9;
+                    int col2 = 6;
                     for (int j = 1; j < 11; j++)
                     {
                         if (ls_gv.Columns.Count > col2)
@@ -539,7 +539,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     {
                         dr2["total"] = "0"; //求合
                         double d_total = 0;
-                        int col3 = 9;
+                        int col3 = 6;
                         for (int j = 1; j < 11; j++)
                         {
                             if (ls_gv.Columns.Count > col3)