修改BUG颗粒列表导出“去除颗粒元素”功能未生效

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/ParticleList.cs

@@ -91,30 +91,13 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 #endregion
                 #region 安装选择的类型大小排序
                 DataTable table = datas[i].Copy();
-                //if (!table.Columns.Contains("Area"))
-                //            {
-                //                table.Columns.Add("Area");
-                //	DataColumn newColumn = new DataColumn("Area", typeof(double));
-                //	table.Columns.Add(1, newColumn);
-                //	for (int a = 0; a < table.Rows.Count; a++)
-                //                {
-                //                    table.Rows[a]["Area"] = Convert.ToDouble(table.Rows[a]["ar"]);
-                //	}
-                //	table.Columns.Remove("ar");
-                //}
-
-
+      
 
                 DataView dvs = table.DefaultView;
 
-                //if (m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() == "Area")
-                //{
-                //    dvs.Sort =  "ar DESC";
-                //}
-                //else
-                //{
-					dvs.Sort = m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() + " DESC";
-				//}
+
+                dvs.Sort = m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() + " DESC";
+				
 
 
                     DataTable p1Data_b = dvs.ToTable();
@@ -168,7 +151,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 				#endregion
 
 
-				DataTable p1Data = fielddata.AddElementColumn(p1Data_b);
+				DataTable p1Data = fielddata.AddElementColumn(p1Data_b, m_mbszclass);
 
 
 				#region 插入颗粒部份

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -11,6 +11,7 @@ using System.IO;
 using System.Linq;
 using static DevExpress.XtraEditors.Mask.Design.MaskSettingsForm.DesignInfo.MaskManagerInfo;
 using static OTSDataType.otsdataconst;
+using static OTSIncAReportApp.OTSReport_Export;
 
 namespace OTSIncAReportApp.DataOperation.DataAccess
 {
@@ -597,7 +598,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             return particlesAll;
         }
 
-        public DataTable AddElementColumn(DataTable particlesAll)
+        public DataTable AddElementColumn(DataTable particlesAll, c_TemplateClass m_mbszclass)
         {
             if (!particlesAll.Columns.Contains("Element"))
             {
@@ -614,7 +615,19 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
                 string ConcatenatedString = "";
                 for (int j = 0; j < drs.Length; j++)
                 {
-                    ConcatenatedString += drs[j]["name"] + "-" + ChangeDataToD(drs[j]["Percentage"].ToString()) + ';';
+                    //判断是否在处理元素表中
+                    bool bl = false;
+                    for (int a = 0; a < m_mbszclass.M_KLLBXX.list_str_kllb_qcys.Count; a++)
+                    {
+                        if (drs[j]["name"].ToString() == m_mbszclass.M_KLLBXX.list_str_kllb_qcys[a].ToString())
+                        {
+                            bl = true;
+						}
+                    }
+                    if (!bl)
+                    {
+						ConcatenatedString += drs[j]["name"] + "-" + ChangeDataToD(drs[j]["Percentage"].ToString()) + ';';
+					}
                 }
                 particlesAll.Rows[i]["Element"] = ConcatenatedString;
             }

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1690,6 +1690,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>