diff --git a/ProductionSystem/Forms/HomeFormInfo.cs b/ProductionSystem/Forms/HomeFormInfo.cs index 43276c5..0d16159 100644 --- a/ProductionSystem/Forms/HomeFormInfo.cs +++ b/ProductionSystem/Forms/HomeFormInfo.cs @@ -738,6 +738,7 @@ namespace ProductionSystem.Forms Thread.Sleep(Program.ReadPlcRate); Step1(); + Thread.Sleep(100); Step2(); // Step3(); // Step4(); diff --git a/ProductionSystem/Untils/Tool/TmTool.cs b/ProductionSystem/Untils/Tool/TmTool.cs index f92c711..ac8062d 100644 --- a/ProductionSystem/Untils/Tool/TmTool.cs +++ b/ProductionSystem/Untils/Tool/TmTool.cs @@ -114,7 +114,7 @@ namespace ProductionSystem.Untils.Tool } ExvTool exv = new ExvTool(pzf1.Com,val); var exv1 = exv.ToAction(); - exv1.TryDispose(); + exv.Dispose(); stopwatch.Stop(); step.Id = Guid.NewGuid().ToString("N"); step.ReturnValue = exv.Val; diff --git a/ProductionSystem_Model/Enum/EquipmentEnum.cs b/ProductionSystem_Model/Enum/EquipmentEnum.cs new file mode 100644 index 0000000..530a62a --- /dev/null +++ b/ProductionSystem_Model/Enum/EquipmentEnum.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProductionSystem_Model.Enum +{ + /// + /// 设备枚举 + /// + public enum EquipmentEnum + { + [Description("水泵1转速")] + SB1ZS_DB = 1, + [Description("水泵2转速")] + SB2ZS_DB = 2, + [Description("水泵3转速")] + SB3ZS_DB = 3, + [Description("反馈四通阀1状态")] + FKSTF1ZT_DB = 4, + [Description("反馈四通阀2状态")] + FKSTF2ZT_DB = 5, + [Description("电子膨胀阀1")] + DZPZF1_DB = 6, + [Description("电子膨胀阀2")] + DZPZF2_DB = 7, + } +} diff --git a/ProductionSystem_Model/ProductionSystem_Model.csproj b/ProductionSystem_Model/ProductionSystem_Model.csproj index 450131f..fbf542e 100644 --- a/ProductionSystem_Model/ProductionSystem_Model.csproj +++ b/ProductionSystem_Model/ProductionSystem_Model.csproj @@ -118,6 +118,7 @@ +