Merge branch 'dep_yangw' of http://175.27.215.92:3000/yangw/ProductionSystem into dep_yangw

ProductionSystem/Forms/HomeFormInfo.cs

@@ -740,18 +740,18 @@ namespace ProductionSystem.Forms
                  Step1();
                 //Step2();
                 return;
-                // Step3();
+                // // Step3();
-                // Step4();
+                // // Step4();
-                // Step5();
+                // // Step5();
-                // Step6();
+                // // Step6();
-                // Step7();
+                // // Step7();
-                //
+                // //
-                // return;
+                // // return;
                 
                 var d1004 = D1004;
                 if (d1004 == false)
                 {
-                    middleIsCanRound = false;
+                    middleIsCanRound = true;
                     return;
                 };
 

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,
+    }
+}

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" />