From 382be9e28bfeaa278045ba9f1050219b16b6c44c 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: Sun, 14 Apr 2024 10:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ProductionSystem/Forms/HomeFormInfo.cs b/ProductionSystem/Forms/HomeFormInfo.cs
index 0d16159..0ebfc35 100644
--- a/ProductionSystem/Forms/HomeFormInfo.cs
+++ b/ProductionSystem/Forms/HomeFormInfo.cs
@@ -738,8 +738,8 @@ namespace ProductionSystem.Forms
                 Thread.Sleep(Program.ReadPlcRate);
 
                  Step1();
-                 Thread.Sleep(100);
-                 Step2();
+                //Step2();
+                return;
                 // Step3();
                 // Step4();
                 // Step5();
@@ -756,9 +756,10 @@ namespace ProductionSystem.Forms
                 };
 
                 var d1300Value = GetPlcValue("D1300");
+                var d1350Value = GetPlcValue("D1350");
                // d1300Value = "1";
                 //步骤1水泵1空载
-                if (d1300Value.ToDouble().ToInt()==1 && D1004 )
+                if (d1300Value.ToDouble().ToInt()==1 && d1350Value.ToDouble().ToInt()==0 && D1004)
                 {
                     ToCache(Step1);
                 }
@@ -768,8 +769,8 @@ namespace ProductionSystem.Forms
 
                 //步骤2水泵2空载
                 var d1302Value = GetPlcValue("D1302");
-               // d1302Value = "1";
-                if (d1302Value.ToDouble().ToInt() == 1 && D1004 )
+                var d1352Value = GetPlcValue("D1352");
+                if (d1302Value.ToDouble().ToInt() == 1 && d1350Value.ToDouble().ToInt() == 0 && D1004 )
                 {
                    // 上位机将四通阀运行到模式1，停止水泵1；启动水泵2运行致设定转速，反馈PLC=1或2（可以/不可以测试）
                    
@@ -867,7 +868,7 @@ namespace ProductionSystem.Forms
             string name = GetCode() + action.Method.Name;
             if (!_cache.ContainsKey(name))
             {
-                _cache.Set(name, DateTime.Now, TimeSpan.FromMinutes(7));
+                _cache.Set(name, DateTime.Now, TimeSpan.FromMinutes(5));
                 action();
             }
         }
@@ -883,11 +884,14 @@ namespace ProductionSystem.Forms
 
         private void Step1()
         {
-                //上位机将四通阀运行到模式1，启动水泵1运行致设定转速，反馈PLC=1或2（可以/不可以测试）
+            //上位机将四通阀运行到模式1，启动水泵1运行致设定转速，反馈PLC=1或2（可以/不可以测试）
 
+                  XTrace.WriteLine("开始运行四通1");
                   TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1);
+                  XTrace.WriteLine("开始运行四通2");
                   TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2);
-                   TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1);
+                  XTrace.WriteLine("开始四通阀");
+                 TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1);
                   // TmTool.SbUx(ModeTypeEnum.BZ1_DB);