V2.0.6A 打印log错误修复

halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs

@@ -28,6 +28,7 @@ using MaiMuControl.SysStatusMgr.MqttMgr;
 using MaiMuControl.SysStatusMgr.StatusMgr;
 using MaiMuControl.SysStatusMgr.UserMgr;
 using MaiMuControl.Utils;
+using Microsoft.Office.Interop.Excel;
 using Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -2347,15 +2348,16 @@ namespace MaiMuAOI.SysCtrl
                         CurrDefectOrders = OrderService.GetListNav(detectOrder);
                         if (CurrDefectOrders == null || CurrDefectOrders.Count == 0)
                         {
-                            Log("运行", "当前工单未测试，清空所有工单数据！");
+                            Log("运行", $"当前工单:{detectOrder} 未测试，清空所有工单数据！");
                             CurrOrderPrintInfos.Clear();
+                            CurrOrderPrintInfos = new List<PrintInfo>();
                             CurrDefectIndex = 0;
                         }
                         else
                         {
                             CurrDefectIndex = CurrDefectOrders.Count; 
                         }
-                        Log("运行", $"当前工单第{CurrDefectIndex + 1}块，开始测试！");
+                        Log("运行", $"当前工单:{detectOrder},第{CurrDefectIndex + 1}块，开始测试！");
                     }
                     
 
@@ -6752,7 +6754,8 @@ namespace MaiMuAOI.SysCtrl
                                 if (ret)
                                     Log("工单打印", $"打印成功！");
                                 else
-                                    Log("工单打印", $"打印失败:打印机={confMgr.SysConfigParams.ExcelPrinterName}, 模板路径={model.OrderTempPath}, 打印数据={CurrOrderPrintInfos}", WarningEnum.Low);
+                                    Log("工单打印", $"打印失败:打印机={confMgr.SysConfigParams.ExcelPrinterName}, 模板路径={model.OrderTempPath}, 打印数据={Newtonsoft.Json.JsonConvert.SerializeObject(CurrOrderPrintInfos)}", WarningEnum.Low);
+                                CurrOrderPrintInfos.Clear();
                             }
                         }
                         #endregion
@@ -8946,7 +8949,7 @@ namespace MaiMuAOI.SysCtrl
         #region 界面显示
         public static void showRowNum_onDataGrid_RowPostPaint(DataGridView dgv, object sender, DataGridViewRowPostPaintEventArgs e)
         {
-            Rectangle rectangle = new Rectangle(e.RowBounds.Location.X, e.RowBounds.Location.Y, dgv.RowHeadersWidth - 4, e.RowBounds.Height);
+            System.Drawing.Rectangle rectangle = new System.Drawing.Rectangle(e.RowBounds.Location.X, e.RowBounds.Location.Y, dgv.RowHeadersWidth - 4, e.RowBounds.Height);
             TextRenderer.DrawText(e.Graphics, (e.RowIndex + 1).ToString(), dgv.RowHeadersDefaultCellStyle.Font, rectangle, dgv.RowHeadersDefaultCellStyle.ForeColor, TextFormatFlags.VerticalCenter | TextFormatFlags.Right);
         }
         /// <summary>
@@ -9785,7 +9788,10 @@ namespace MaiMuAOI.SysCtrl
             try
             {
                 if (!printControl.ExcelOpenFile(printerTemp))
+                {
+                    Log("打印", $"打印失败: 模板打开失败", WarningEnum.Low);
                     ret = false;
+                }
                 
                 Dictionary<string, string> printData = new Dictionary<string, string>();
                 if (ret)
@@ -9800,6 +9806,11 @@ namespace MaiMuAOI.SysCtrl
                             {
                                 if(!printData.ContainsKey(item.PrintKey))
                                     printData.Add(item.PrintKey, item.PrintCode);
+                                else
+                                {
+                                    printData.Remove(item.PrintKey);
+                                    printData.Add(item.PrintKey, item.PrintCode);
+                                }
                             }
                             else if ( item.Type == 3 && !item.IsValue) //excel Code
                             {
@@ -9933,9 +9944,19 @@ namespace MaiMuAOI.SysCtrl
                 }
                 //只是要sheet1
                 printControl.ExcelSelectSheet(1);
-                if (data != null)
+                if ((data != null) && (printData.Count > 0))
+                {
                     if (!printControl.ExcelSetDataValue(printData))
+                    {
+                        Log("打印", $"打印失败: 参数设置错误", WarningEnum.Low);
                         ret = false;
+                    }
+                }
+                else
+                {
+                    Log("打印", $"打印失败: 打印数据为空或错误", WarningEnum.Low);
+                    ret = false;
+                }
 
                 if (!printControl.ExcelPrintData(printerName))
                     ret = false;

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

@@ -1072,9 +1072,9 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             dt.Columns.Add(new DataColumn("网版编码", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("批次", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("合格", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("修复", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("异常情况", typeof(string)));//在表中添加string类型的列
-            dt.Columns.Add(new DataColumn("修复人员", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("修复", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("异常情况", typeof(string)));//在表中添加string类型的列
+            //dt.Columns.Add(new DataColumn("修复人员", typeof(string)));//在表中添加string类型的列
             dt.Columns.Add(new DataColumn("比对", typeof(string)));//在表中添加string类型的列
 
             foreach (var item in QueryAllOrders)
@@ -1301,8 +1301,8 @@ namespace MaiMuAOI.SysUI.DefectPicShow
             dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("栅线数量", typeof(int)));//在表中添加int类型的列
             dt.Columns.Add(new DataColumn("断栅数量", typeof(int)));//在表中添加int类型的列
-                                                                //dt.Columns.Add(new DataColumn("钢丝断裂数量", typeof(int)));//在表中添加int类型的列
-                                                                //dt.Columns.Add(new DataColumn("残胶堵孔数量", typeof(int)));//在表中添加int类型的列 
+            dt.Columns.Add(new DataColumn("钢丝断裂数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("残胶堵孔数量", typeof(int)));//在表中添加int类型的列 
 
             int row_index = 0;
             foreach (var item in QueryAllOrders)
@@ -1318,9 +1318,9 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                 dr["网版编码"] = item.SN;
                 dr["批次"] = item.BatchId;
                 dr["合格"] = item.Qualified ? "合格" : "不合格";
-                dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
-                dr["异常情况"] = item.Abnormalities;
-                dr["修复人员"] = item.RepairCode;
+                //dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
+                //dr["异常情况"] = item.Abnormalities;
+                //dr["修复人员"] = item.RepairCode;
                 dr["比对"] = item.CompareResult == 2 ? "不通过" : item.CompareResult == 1 ? "通过" : "未比对";
 
                 List<SizeDefectInfo> tempd = new List<SizeDefectInfo>();
@@ -1365,8 +1365,8 @@ namespace MaiMuAOI.SysUI.DefectPicShow
                 dr["斜边数量"] = item.XBCount;
                 dr["栅线数量"] = item.SXCount;
                 dr["断栅数量"] = item.DSCount;
-                //dr["钢丝断裂数量"] = item.GSDLCount;
-                //dr["残胶堵孔数量"] = item.CJDKCount;
+                dr["钢丝断裂数量"] = item.GSDLCount;
+                dr["残胶堵孔数量"] = item.CJDKCount;
 
                 dt.Rows.Add(dr);//在表的对象的行里添加此行
                 row_index++;