From 038843b98ae48693ce8f4284d88947c5cff8609f 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, 9 Dec 2023 09:33:31 +0800
Subject: [PATCH] =?UTF-8?q?WetGelatDownload=20=E6=89=8B=E5=8A=A8=E4=B8=8B?=
 =?UTF-8?q?=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoControl/AutoControl.cs                | 25 +++++++++++--------
 .../AutoControl/PlcAutoWriteHelper.cs         | 23 +++++++++++------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
index 73d8bfc..6b6ea21 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
@@ -165,23 +165,26 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
             if (ButtonE.WetManualGel == runtime.Sender)
             {
-                if (MessageBox.Show("确认下糊化料？", "下糊化料确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                if (MessageBox.Show("请使用手动加料？", "请使用手动加料", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
                 {
                     return;
                 }
+                return;
 
-                bool isReady = WetGelatDownload(RadioE);
+                
 
-                if (!isReady)
-                {
-                    MessageBox.Show("信号未准备好！");
-                }
-                else
-                {
-                    SingleLog("手动下糊化料", RadioE);
+                //bool isReady = WetGelatDownload(RadioE);
 
-                    MessageBox.Show("信号下达成功！");
-                }
+                //if (!isReady)
+                //{
+                //    MessageBox.Show("信号未准备好！");
+                //}
+                //else
+                //{
+                //    SingleLog("手动下糊化料", RadioE);
+
+                //    MessageBox.Show("信号下达成功！");
+                //}
             }
 
             if (ButtonE.WetManualControl == runtime.Sender)
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs
index 8d39322..7a78bd9 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs
@@ -735,43 +735,50 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             {
                 case 1:
                     PowderDownSignel(MinAnPlc.Heir1, 1);
-                    DB2105WriteHelper.WriteManScrewH1();
                     DB2105WriteHelper.WriteSetValueH1(value);
+                    DB2105WriteHelper.WriteManScrewH1();
+                   
                     break;
                 case 2:
                     PowderDownSignel(MinAnPlc.Heir1, 1);
-                    DB2105WriteHelper.WriteManScrewH2();
                     DB2105WriteHelper.WriteSetValueH1(value);
+                    DB2105WriteHelper.WriteManScrewH2();
+                   
                     break;
                 case 3:
                     PowderDownSignel(MinAnPlc.Heir2, 2);
-                    DB2105WriteHelper.WriteManScrewH3();
                     DB2105WriteHelper.WriteSetValueH2(value);
+                    DB2105WriteHelper.WriteManScrewH3();
+                   
                     break;
                 case 4:
                     PowderDownSignel(MinAnPlc.Heir2, 2);
-                    DB2105WriteHelper.WriteManScrewH4();
                     DB2105WriteHelper.WriteSetValueH2(value);
+                    DB2105WriteHelper.WriteManScrewH4();
+                   
                     break;
                 case 5:
                     PowderDownSignel(MinAnPlc.Heir3, 3);
-                    DB2105WriteHelper.WriteManScrewH5();
                     DB2105WriteHelper.WriteSetValueH3(value);
+                    DB2105WriteHelper.WriteManScrewH5();
+                  
                     break;
                 case 6:
                     PowderDownSignel(MinAnPlc.Heir3, 3);
-                    DB2105WriteHelper.WriteManScrewH6();
                     DB2105WriteHelper.WriteSetValueH3(value);
+                    DB2105WriteHelper.WriteManScrewH6();
                     break;
                 case 7:
                     PowderDownSignel(MinAnPlc.Heir4, 4);
-                    DB2105WriteHelper.WriteManScrewH7();
                     DB2105WriteHelper.WriteSetValueH4(value);
+                    DB2105WriteHelper.WriteManScrewH7();
+                  
                     break;
                 case 8:
                     PowderDownSignel(MinAnPlc.Heir4, 4);
-                    DB2105WriteHelper.WriteManScrewH8();
                     DB2105WriteHelper.WriteSetValueH4(value);
+                    DB2105WriteHelper.WriteManScrewH8();
+                  
                     break;
                 default:
                     MessageBox.Show("当前未选择产线！");