diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs index 1b6f6abe..8d975206 100644 --- a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs +++ b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs @@ -2298,7 +2298,7 @@ namespace MaiMuAOI.SysCtrl Log("运行", "网版编码为空!", WarningEnum.Low); return false; } - Log("运行", $"料号:{code},网版编码:{sn}"); + Log("运行", $"料号:{code},网版编码:{sn},测试工单:{detectOrder} "); //记忆sn //Remind(sn); @@ -2350,6 +2350,7 @@ namespace MaiMuAOI.SysCtrl { Log("运行", $"当前工单:{detectOrder} 未测试,清空所有工单数据!"); CurrOrderPrintInfos.Clear(); + CurrOrderPrintInfos = null; CurrOrderPrintInfos = new List(); CurrDefectIndex = 0; } @@ -4405,7 +4406,8 @@ namespace MaiMuAOI.SysCtrl tempDataList = new List(); for (int i = 0; i < DataCnt; i++) { - Thread.Sleep(DelayTime); + //Thread.Sleep(DelayTime); + Thread.Sleep(100); tensionValue = TensionGetValueNewStep(); if (tensionValue < 0) { @@ -4484,6 +4486,7 @@ namespace MaiMuAOI.SysCtrl isAverage = false }); ioCardDev.WriteBitState(GetIOPortIndex((int)DOName.触发张力按钮灯), GetIOBitIndex((int)DOName.触发张力按钮灯), false); + //显示数据 if ((TestCnt - 1) == this.CurrPoinntCount) //显示最终结果 { @@ -4512,7 +4515,8 @@ namespace MaiMuAOI.SysCtrl Math.Round(lstTension.Max(), 2), Math.Round(lstTension.Min(), 2), 1, false)); break; } - Thread.Sleep(100); + //Thread.Sleep(100); + Thread.Sleep(DelayTime); } #endregion @@ -6752,7 +6756,7 @@ namespace MaiMuAOI.SysCtrl ret = PrintFileOrderData(confMgr.SysConfigParams.ExcelPrinterName, model.OrderTempPath, CurrOrderPrintInfos, model); if (ret) - Log("工单打印", $"打印成功!"); + Log("工单打印", $"打印成功! 打印数据={Newtonsoft.Json.JsonConvert.SerializeObject(CurrOrderPrintInfos)}"); else Log("工单打印", $"打印失败:打印机={confMgr.SysConfigParams.ExcelPrinterName}, 模板路径={model.OrderTempPath}, 打印数据={Newtonsoft.Json.JsonConvert.SerializeObject(CurrOrderPrintInfos)}", WarningEnum.Low); CurrOrderPrintInfos.Clear(); diff --git a/halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/TensionProp.cs b/halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/TensionProp.cs index 40b6a91e..e13079df 100644 --- a/halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/TensionProp.cs +++ b/halftoneproject-master/BanBoShi/SysUI/ProcessStep/Prop/TensionProp.cs @@ -14,7 +14,7 @@ namespace MaiMuAOI.SysUI.ProcessStep.Prop { [PropertyOrder(1), Browsable(true), Category("1 测试"), DisplayName("1.1 测试次数"), Description("需要进行的张力测试次数")] public int TestCnt { get; set; } - [PropertyOrder(2), Browsable(true), Category("2 参数"), DisplayName("2.1 读取延时(ms)"), Description("测试读取数据之前延时ms")] + [PropertyOrder(2), Browsable(true), Category("2 参数"), DisplayName("2.1 读取延时(ms)"), Description("测试读取数据之后延时ms")] public int DelayTime { get; set; } [PropertyOrder(3), Browsable(true), Category("2 参数"), DisplayName("2.2 读取N个数据"), Description("测试读取多少数据")] public int DataCnt { get; set; }