From 1096f7527e62dfd498eca7f3f83d6a1e8bb1d4a5 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: Fri, 1 Dec 2023 10:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E6=B0=B4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManualControl/ManualControlAction.cs      | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs
index 4e44dac..55cad8e 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs
@@ -137,6 +137,10 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
 
         IBaseControl keywords;
 
+
+        DB2119Helper DB2119;
+
+
         public void Run(RuntimeParameter runtime)
         {
             base.RunIni(runtime);       //必须要调用
@@ -148,6 +152,8 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
             SingleSelect();
             BottomSelect(runtime);
 
+            DB2119 = new DB2119Helper();
+
         }
 
         #region 控件获取导入
@@ -501,6 +507,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
 
             if (WaterOut1 == runtime.Sender)
             {
+
+                if (DB2119.Coolwater_A.Dis_Status)
+                {
+                    MessageBox.Show("冷水称A正在排水 请稍后");
+                    return;
+                }
+
                 if (MessageBox.Show("冷水称A确认开始排水？", "排水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
                 {
                     return;
@@ -572,6 +585,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
 
             if (WaterOut2 == runtime.Sender)
             {
+
+                if (DB2119.Hotwater_A.Dis_Status)
+                {
+                    MessageBox.Show("热水称A正在排水 请稍后");
+                    return;
+                }
+
                 if (MessageBox.Show("热水称A确认开始排水？", "排水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
                 {
                     return;
@@ -643,6 +663,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
 
             if (WaterOut3 == runtime.Sender)
             {
+                if (DB2119.Coolwater_B.Dis_Status)
+                {
+                    MessageBox.Show("冷水称B正在排水 请稍后");
+                    return;
+                }
+
+
                 if (MessageBox.Show("冷水称B确认开始排水？", "排水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
                 {
                     return;
@@ -714,6 +741,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
 
             if (WaterOut4 == runtime.Sender)
             {
+
+                if (DB2119.Hotwater_B.Dis_Status)
+                {
+                    MessageBox.Show("热水称B正在排水 请稍后");
+                    return;
+                }
+
                 if (MessageBox.Show("热水称B确认开始排水？", "排水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
                 {
                     return;
@@ -808,6 +842,8 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
                 //        return;
                 //}
 
+               
+
                 WaterStopAction("DB2119.28.5", WaterStop1, "冷", "A");
                 //MessageBox.Show("冷水称A已停止排水");
                 //ManualLogControl("冷水称A停止排水");