diff --git a/ProductionSystem/Untils/MFSerialInfo.cs b/ProductionSystem/Untils/MFSerialInfo.cs index bee3673..c24f57b 100644 --- a/ProductionSystem/Untils/MFSerialInfo.cs +++ b/ProductionSystem/Untils/MFSerialInfo.cs @@ -89,7 +89,7 @@ namespace ProductionSystem.Untils } - public void SendMsg2(string data, int num = 3, int mill = 500) + public void SendMsg2(string data, int num = 3, int mill = 300) { @@ -106,8 +106,6 @@ namespace ProductionSystem.Untils { break; } - - Thread.Sleep(mill); _mfser.SendLinMasterSend(Export); diff --git a/ProductionSystem/Untils/Tool/ExvTool.cs b/ProductionSystem/Untils/Tool/ExvTool.cs index 3b8cdb6..ec91d69 100644 --- a/ProductionSystem/Untils/Tool/ExvTool.cs +++ b/ProductionSystem/Untils/Tool/ExvTool.cs @@ -88,14 +88,9 @@ namespace ProductionSystem.Untils.Tool mfSerialInfo.MsgFunc = null; mfSerialInfo.Exit = true; b = true; - } - - } - - - + }; mfSerialInfo.SendMsg2(sendMes, 200, 300); diff --git a/ProductionSystem/Untils/Tool/TmTool.cs b/ProductionSystem/Untils/Tool/TmTool.cs index c9bc788..62c53f7 100644 --- a/ProductionSystem/Untils/Tool/TmTool.cs +++ b/ProductionSystem/Untils/Tool/TmTool.cs @@ -169,8 +169,6 @@ namespace ProductionSystem.Untils.Tool } SitongTool sitongTool = new SitongTool(stf1.Com, val); - - var b = sitongTool.ToAction(); sitongTool.Dispose(); stopwatch.Stop(); @@ -180,7 +178,6 @@ namespace ProductionSystem.Untils.Tool step.CreateTime = DateTime.Now; step.EquipmentName = eqName; step.Ms = stopwatch.Elapsed.TotalSeconds.ToString(CultureInfo.InvariantCulture); - stepService.AddProductStep(step); return b; diff --git a/ProductionSystem/Untils/Tool/UxTool.cs b/ProductionSystem/Untils/Tool/UxTool.cs index 50c20d6..539d19a 100644 --- a/ProductionSystem/Untils/Tool/UxTool.cs +++ b/ProductionSystem/Untils/Tool/UxTool.cs @@ -145,7 +145,7 @@ namespace ProductionSystem.Untils.Tool mfSerialInfo.SendMessage(sendMes); } - Exit = true; + Dispose(); } }