v2.0.7 通威更新表格导出显示

halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs

@@ -31,6 +31,7 @@ using Point = System.Drawing.Point;
 using Excel = Microsoft.Office.Interop.Excel;
 using Microsoft.Office.Interop.Excel;
 using Service;
+using CCWin.Win32.Const;
 
 namespace MaiMuAOI.SysUI.DefectPicShow
 {
@@ -1119,19 +1120,19 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             //通威排序所有检测数据
             OrdersItem = new int[5] { 0,0,0,0,0};
             List<Order> orders = new List<Order>();
-            var addr = QueryAllOrders.Where(x => x.OrderCode.IndexOf("SP1") > 0);
+            var addr = QueryAllOrders.Where(x => x.OrderCode.IndexOf("SP1") >= 0 || x.OrderCode.IndexOf("DUP1") >= 0);
             if (addr != null)
             {
                 OrdersItem[0] = addr.Count();
                 orders.AddRange(addr);
             }
-            addr = QueryAllOrders.Where(x => x.OrderCode.IndexOf("DUP2") > 0);
+            addr = QueryAllOrders.Where(x => x.OrderCode.IndexOf("DUP2") >= 0 || x.OrderCode.IndexOf("SP2") >= 0 );
             if (addr != null)
             {
                 OrdersItem[1] = addr.Count();
                 orders.AddRange(addr);
             }
-            addr = QueryAllOrders.Where(x => x.OrderCode.IndexOf("SP3") > 0);
+            addr = QueryAllOrders.Where(x => x.OrderCode.IndexOf("DUP3") > 0);
             if (addr != null)
             {
                 OrdersItem[2] = addr.Count();
@@ -1144,8 +1145,9 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                 orders.AddRange(addr);
             }
             //其他
-            addr = QueryAllOrders.Where(x => x.OrderCode.IndexOf("SP1") < 0 && x.OrderCode.IndexOf("DUP2") < 0 && 
-            x.OrderCode.IndexOf("SP3") < 0 && x.OrderCode.IndexOf("DUP4") < 0);
+            addr = QueryAllOrders.Where(x => x.OrderCode.IndexOf("SP1") < 0 && x.OrderCode.IndexOf("DUP1") < 0 &&
+            x.OrderCode.IndexOf("SP2") < 0 && x.OrderCode.IndexOf("DUP2") < 0 && 
+            x.OrderCode.IndexOf("DUP3") < 0 && x.OrderCode.IndexOf("DUP4") < 0);
             if (addr != null)
             {
                 OrdersItem[4] = addr.Count();
@@ -1792,7 +1794,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             //    filePath = s.FileName;
             //else
             //    return;
-            string[] worksheetsName = new string[5] { "SP1", "DUP2", "SP3", "DUP4", "其他" };
+            string[] worksheetsName = new string[5] { "SP1&DUP1", "SP2&DUP2", "DUP3", "DUP4", "其他" };
 
             Excel.Application m_xlApp = new Excel.Application();
             Excel.Workbooks workbooks = m_xlApp.Workbooks;
@@ -1908,12 +1910,43 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                             Errrange.Font.ColorIndex = 3;//3红色  
                         }
 
-
                         //range.Interior.ColorIndex = 15;//15代表灰色  
                         range.Font.Size = 9;
                         range.RowHeight = 14.25;
                         range.Borders.LineStyle = 1;
                         range.HorizontalAlignment = 1;
+
+                        //获取工作表中的列数
+                        int columns = worksheet.UsedRange.Columns.Count;
+                        int ct = 11;
+                        while ( ct < columnNum + 1)
+                        {
+                            bool isKong = true;
+                            //提取对应行列的数据并将其存入数组中
+                            for (int rt = 2; rt < rowNum + 1; rt++)
+                            {
+                                string a = ((Range)worksheet.Cells[rt, ct]).Text.ToString();
+                                if (!string.IsNullOrEmpty(a)) 
+                                {
+                                    isKong = false;
+                                    break;
+                                }
+                            }
+                            if (isKong)
+                            {
+                                // 从工作表中删除列
+                                Excel.Range delRange = m_xlApp.Range[worksheet.Cells[1, ct], worksheet.Cells[rowNum + 1, ct]];
+                                //delRange.Select();
+                                delRange.Columns.Delete(Excel.XlDeleteShiftDirection.xlShiftToLeft);
+                                //worksheet.Columns[ct]
+                                //var rtd = worksheet.get_Range(worksheet.Cells[1, ct], worksheet.Cells[rowNum + 1, ct]);
+                                ct--;
+                                columnNum--;
+                            }
+                            else
+                                ct++;
+                        }
+
                         workbook.Saved = true;
                         workbook.SaveCopyAs(filePath);
                     }
@@ -1927,13 +1960,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                     }
 
                 }
-            }
-            
-            
-           
-
-            
-
+            }           
            
             m_xlApp.Workbooks.Close();
             m_xlApp.Workbooks.Application.Quit();