From 01a86a92330c78e51e7f6a2cefa4ec11af65e0f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= <nodyang@qq.com>
Date: Sat, 13 Apr 2024 19:18:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?change=20-=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=9E=9A=E4=B8=BE=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProductionSystem/Forms/HomeFormInfo.cs        |  1 +
 ProductionSystem/Untils/Tool/TmTool.cs        |  2 +-
 ProductionSystem_Model/Enum/EquipmentEnum.cs  | 30 +++++++++++++++++++
 .../ProductionSystem_Model.csproj             |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 ProductionSystem_Model/Enum/EquipmentEnum.cs

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
+{
+    /// <summary>
+    /// 设备枚举
+    /// </summary>
+    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 @@
     <Compile Include="DbModel\T_Result2.cs" />
     <Compile Include="DbModel\Ux.cs" />
     <Compile Include="Enum\ColorEnum.cs" />
+    <Compile Include="Enum\EquipmentEnum.cs" />
     <Compile Include="Enum\FrameTypeEnum.cs" />
     <Compile Include="Enum\ModeTypeEnum.cs" />
     <Compile Include="Enum\MsgFormatEnum.cs" />

From 8e6ef7421292519ddb2f42367f08551f4061cc81 Mon Sep 17 00:00:00 2001
From: yangw <nodyang@#hd>
Date: Sun, 14 Apr 2024 13:12:13 +0800
Subject: [PATCH 2/2] sw

---
 ProductionSystem/Forms/HomeFormInfo.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ProductionSystem/Forms/HomeFormInfo.cs b/ProductionSystem/Forms/HomeFormInfo.cs
index 0ebfc35..d08a93c 100644
--- a/ProductionSystem/Forms/HomeFormInfo.cs
+++ b/ProductionSystem/Forms/HomeFormInfo.cs
@@ -740,18 +740,18 @@ namespace ProductionSystem.Forms
                  Step1();
                 //Step2();
                 return;
-                // Step3();
-                // Step4();
-                // Step5();
-                // Step6();
-                // Step7();
-                //
-                // return;
+                // // Step3();
+                // // Step4();
+                // // Step5();
+                // // Step6();
+                // // Step7();
+                // //
+                // // return;
                 
                 var d1004 = D1004;
                 if (d1004 == false)
                 {
-                    middleIsCanRound = false;
+                    middleIsCanRound = true;
                     return;
                 };