diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 5e14363..2438540 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -565,6 +565,7 @@
+
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs
new file mode 100644
index 0000000..1b1ee80
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs
@@ -0,0 +1,257 @@
+using Mesnac.Action.Base;
+using Mesnac.Controls.Default;
+using System.Windows.Forms;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DataBlockHelper.DBHelpers;
+
+namespace Mesnac.Action.ChemicalWeighing.Qu
+{
+ internal class InitAction : ChemicalWeighingAction, IAction
+ {
+
+ MCLabel MCLabelA;
+ MCLabel MCLabelB;
+
+ MCButton BtnA;
+ MCButton BtnB;
+ Timer timer;
+
+ MCTextBox vibSilo_On;
+ MCTextBox vibSilo_Off;
+
+
+ MCTextBox vibDaybin_On;
+ MCTextBox vibDaybin_Off;
+
+ MCTextBox vibHopper_On;
+ MCTextBox vibHopper_Off;
+
+ MCTextBox plsSilo_On;
+ MCTextBox plsSilo_Off;
+
+ MCTextBox plsDaybin_On;
+ MCTextBox plsDaybin_Off;
+
+
+ MCTextBox plsHopper_On;
+ MCTextBox plsHopper_Off;
+
+ MCButton btnUpdate;
+
+ MCButton MCButton2147483646;
+
+ public void Run(RuntimeParameter runtime)
+ {
+
+ base.RunIni(runtime); //必须调用
+ var controls = GetAllControls();
+
+ MCLabelA = controls.FirstOrDefault(x => x.Name == "MCLabelA") as MCLabel;
+ MCLabelA.MCValue = "";
+
+ MCLabelB = controls.FirstOrDefault(x => x.Name == "MCLabelB") as MCLabel;
+ MCLabelB.MCValue = "";
+
+ BtnA = controls.FirstOrDefault(x => x.Name == "BtnA") as MCButton;
+ BtnB = controls.FirstOrDefault(x => x.Name == "BtnB") as MCButton;
+
+
+ vibSilo_On= controls.FirstOrDefault(x => x.Name== "vibSilo_On") as MCTextBox;
+ vibSilo_Off= controls.FirstOrDefault(x => x.Name== "vibSilo_Off") as MCTextBox;
+
+ vibDaybin_On = controls.FirstOrDefault(x => x.Name == "vibDaybin_On") as MCTextBox;
+ vibDaybin_Off = controls.FirstOrDefault(x => x.Name == "vibDaybin_Off") as MCTextBox;
+
+ vibHopper_On = controls.FirstOrDefault(x => x.Name == "vibHopper_On") as MCTextBox;
+ vibHopper_Off = controls.FirstOrDefault(x => x.Name == "vibHopper_Off") as MCTextBox;
+
+
+ plsSilo_On = controls.FirstOrDefault(x => x.Name == "plsSilo_On") as MCTextBox;
+ plsSilo_Off = controls.FirstOrDefault(x => x.Name == "plsSilo_Off") as MCTextBox;
+
+
+
+ plsDaybin_On = controls.FirstOrDefault(x => x.Name == "plsDaybin_On") as MCTextBox;
+ plsDaybin_Off = controls.FirstOrDefault(x => x.Name == "plsDaybin_Off") as MCTextBox;
+
+
+ plsHopper_On = controls.FirstOrDefault(x => x.Name == "plsHopper_On") as MCTextBox;
+ plsHopper_Off = controls.FirstOrDefault(x => x.Name == "plsHopper_Off") as MCTextBox;
+
+ //BtnUpdate
+
+ btnUpdate= controls.FirstOrDefault(x => x.Name == "BtnUpdate") as MCButton;
+
+
+ MCButton2147483646 = controls.FirstOrDefault(x => x.Name == "MCButton2147483646") as MCButton;
+
+ MCButton2147483646.Click += MCButton2147483646_Click;
+
+ MCButton2147483646_Click(new object(),new EventArgs());
+
+ BtnA.Click += BtnA_Click;
+ BtnB.Click += BtnB_Click;
+ btnUpdate.Click += BtnBc_Click;
+
+
+ timer = new Timer();
+ timer.Interval = 1000;
+ timer.Enabled = true;
+ timer.Tick += new EventHandler(StateRefresh);//添加事件
+
+ }
+
+ private void MCButton2147483646_Click(object sender, EventArgs e)
+ {
+ DB2108HelperNew dB2108 = new DB2108HelperNew();
+
+ Time2108 time = dB2108.Time;
+ if (time != null)
+ {
+ vibSilo_On.MCValue = time.VibSiloOn;
+ vibSilo_Off.MCValue = time.VibSiloOff;
+
+ vibDaybin_On.MCValue = time.VibDaybinOn;
+ vibDaybin_Off.MCValue = time.VibDaybinOff;
+
+ vibHopper_On.MCValue = time.VibHopperOn;
+ vibHopper_Off.MCValue = time.VibHopperOff;
+
+
+ plsSilo_On.MCValue = time.PlsSiloOn;
+ plsSilo_Off.MCValue = time.PlsSiloOff;
+
+
+
+ plsDaybin_On.MCValue = time.PlsDaybinOn;
+ plsDaybin_Off.MCValue = time.PlsDaybinOff;
+
+
+ plsHopper_On.MCValue = time.PlsHopperOn;
+ plsHopper_Off.MCValue = time.PlsHopperOff;
+ }
+ }
+
+ private void BtnA_Click(object sender, EventArgs e)
+ {
+
+ DB2110WriteHelper.WriteA();
+ MessageBox.Show("清理成功");
+ }
+
+ private void BtnB_Click(object sender, EventArgs e)
+ {
+ DB2110WriteHelper.WriteB();
+ MessageBox.Show("清理成功");
+ }
+
+ private void BtnBc_Click(object sender, EventArgs e)
+ {
+
+ var b= Check(vibSilo_On);
+ if (b == false) return;
+ b = Check(vibSilo_Off);
+ if (b == false) return;
+ b = Check(vibDaybin_On);
+ if (b == false) return;
+ b = Check(vibDaybin_Off);
+ if (b == false) return;
+ b = Check(vibHopper_On);
+ if (b == false) return;
+ b = Check(vibHopper_Off);
+ if (b == false) return;
+ b = Check(plsSilo_On);
+ if (b == false) return;
+ b = Check(plsSilo_Off);
+ if (b == false) return;
+
+
+ b = Check(plsDaybin_On);
+ if (b == false) return;
+ b = Check(plsDaybin_Off);
+ if (b == false) return;
+
+ b = Check(plsHopper_On);
+ if (b == false) return;
+ b = Check(plsHopper_Off);
+ if (b == false) return;
+
+ Time2108 time=new Time2108();
+ time.VibSiloOn = ushort.Parse(vibSilo_On.MCValue.ToString());
+ time.VibSiloOff = ushort.Parse(vibSilo_Off.MCValue.ToString());
+ time.VibDaybinOn = ushort.Parse(vibDaybin_On.MCValue.ToString());
+ time.VibDaybinOff = ushort.Parse(vibDaybin_Off.MCValue.ToString());
+ time.VibHopperOn=ushort.Parse(vibHopper_On.MCValue.ToString());
+ time.VibHopperOff=ushort.Parse(vibHopper_Off.MCValue.ToString());
+
+ time.PlsSiloOn=ushort.Parse(plsSilo_On.MCValue.ToString()) ;
+ time.PlsSiloOff=ushort.Parse(plsSilo_Off.MCValue.ToString() ) ;
+
+ time.PlsDaybinOn=ushort.Parse(plsDaybin_On.MCValue.ToString()) ;
+ time.PlsDaybinOff=ushort.Parse(plsDaybin_Off.MCValue.ToString()) ;
+
+ time.PlsHopperOn = ushort.Parse(plsHopper_On.MCValue.ToString());
+ time.PlsHopperOff = ushort.Parse(plsHopper_Off.MCValue.ToString());
+
+
+ DB2108HelperWriteNew.Inser(time);
+ MessageBox.Show("更新成功");
+
+ }
+
+ private bool Check(MCTextBox cTextBox)
+ {
+ try
+ {
+ int mc = Convert.ToInt32(cTextBox.MCValue.ToString());
+ if(mc <=0 || mc > 60)
+ {
+ MessageBox.Show("范围错误 [1-60]");
+ return false;
+ }
+ }
+ catch (Exception)
+ {
+ MessageBox.Show("格式错误");
+ return false;
+
+ }
+
+ return true;
+
+ }
+
+ private void StateRefresh(object sender, EventArgs e)
+ {
+ Db2110Help db2110 = new Db2110Help();
+ string a = db2110.GetA();
+ if (a.Length == 0)
+ {
+ MCLabelA.MCValue = "无";
+ }
+ else
+ {
+ MCLabelA.MCValue = a;
+ }
+
+ string b=db2110.GetB();
+ if (b.Length == 0)
+ {
+ MCLabelB.MCValue = "无";
+ }
+ else
+ {
+ MCLabelB.MCValue = b;
+
+ }
+
+
+
+
+ }
+ }
+}
diff --git a/DataBlockHelper/DBHelpers/DB2108HelperNew.cs b/DataBlockHelper/DBHelpers/DB2108HelperNew.cs
index a97c4b0..b03976e 100644
--- a/DataBlockHelper/DBHelpers/DB2108HelperNew.cs
+++ b/DataBlockHelper/DBHelpers/DB2108HelperNew.cs
@@ -16,7 +16,7 @@ namespace DataBlockHelper.DBHelpers
public DB2108HelperNew()
{
- OperateResult db = PlcConnect.Instance.Read("DB2108.0.0", 72);
+ OperateResult db = PlcConnect.Instance.Read("DB2108.0.0", 80);
bytes = db.Content;
}
@@ -49,6 +49,12 @@ namespace DataBlockHelper.DBHelpers
public MainFan Daybin12 => new MainFan(70, bytes);
+ public MainFan DryA => new MainFan(72, bytes);
+ public MainFan DryB => new MainFan(74, bytes);
+ public MainFan DryC => new MainFan(76, bytes);
+ public MainFan DryD => new MainFan(78, bytes);
+
+
public Time2108 Time=>new Time2108(26,bytes);
public Pressure_HMI PR2PCP04=>new Pressure_HMI(50,bytes);
diff --git a/DataBlockHelper/DBHelpers/DB2110WriteHelper.cs b/DataBlockHelper/DBHelpers/DB2110WriteHelper.cs
index 9e6b274..ebd1a26 100644
--- a/DataBlockHelper/DBHelpers/DB2110WriteHelper.cs
+++ b/DataBlockHelper/DBHelpers/DB2110WriteHelper.cs
@@ -10,49 +10,59 @@ namespace DataBlockHelper.DBHelpers
{
private static readonly string DbName = "DB2110";
- public static void Write(Db2110Help help)
+ public static void WriteA()
{
var siemensS7Net = PlcConnect.Instance;
int start = 3384;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queA0);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queA1);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queA2);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queA3);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queA4);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
- start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB0);
+
+ }
+
+
+
+ public static void WriteB()
+ {
+ var siemensS7Net = PlcConnect.Instance;
+ int start = 3394;
+
+
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB1);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB2);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB3);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB4);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB5);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB6);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB7);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
start += 2;
- siemensS7Net.Write($"{DbName}.{start}.0", help.queB8);
+ siemensS7Net.Write($"{DbName}.{start}.0", 0);
}
}
}
diff --git a/Main/MCEdit/Data/EventConfig/小料称量/主要设备细节.xml b/Main/MCEdit/Data/EventConfig/小料称量/主要设备细节.xml
index d0ce126..bfce282 100644
--- a/Main/MCEdit/Data/EventConfig/小料称量/主要设备细节.xml
+++ b/Main/MCEdit/Data/EventConfig/小料称量/主要设备细节.xml
@@ -6,6 +6,11 @@
界面初始化
界面初始化
+
+
+ test
+ test
+
@@ -13,11 +18,17 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Main/MCEdit/Data/EventConfig/小料称量/缓存队列取消.xml b/Main/MCEdit/Data/EventConfig/小料称量/缓存队列取消.xml
new file mode 100644
index 0000000..1918e31
--- /dev/null
+++ b/Main/MCEdit/Data/EventConfig/小料称量/缓存队列取消.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+ 自动控制按钮事件
+ 自动控制按钮事件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
index f2a3c58..eaab218 100644
--- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
+++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
@@ -28,6 +28,7 @@
+
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml
new file mode 100644
index 0000000..b8df96f
--- /dev/null
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml
@@ -0,0 +1,682 @@
+
+
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
index 6eefed3..d3afe05 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
@@ -1,6 +1,363 @@
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D12
+ ButtonHighlight
+ 1434, 136
+ MCLabel265
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D11
+ ButtonHighlight
+ 1448, 82
+ MCLabel264
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D14
+ ButtonHighlight
+ 1663, 182
+ MCLabel263
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D13
+ ButtonHighlight
+ 1538, 182
+ MCLabel262
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D10
+ ButtonHighlight
+ 1349, 184
+ MCLabel261
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D09
+ ButtonHighlight
+ 1113, 212
+ MCLabel260
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D08
+ ButtonHighlight
+ 988, 212
+ MCLabel259
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D17
+ ButtonHighlight
+ 1419, 9
+ MCLabel258
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D16
+ ButtonHighlight
+ 872, 37
+ MCLabel257
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D15
+ ButtonHighlight
+ 842, 13
+ MCLabel256
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D07
+ ButtonHighlight
+ 882, 161
+ MCLabel255
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D06
+ ButtonHighlight
+ 822, 134
+ MCLabel254
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D05
+ ButtonHighlight
+ 896, 109
+ MCLabel253
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D04
+ ButtonHighlight
+ 842, 80
+ MCLabel252
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D03
+ ButtonHighlight
+ 795, 215
+ MCLabel251
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D02
+ ButtonHighlight
+ 766, 181
+ MCLabel250
+ 23, 12
+
+
+
+
+
+ Red
+ DarkGray
+
+
+ False
+
+
+
+ None
+ True
+ True
+ D01
+ ButtonHighlight
+ 663, 331
+ D01
+ 23, 12
+
1745, 289
Daybin12
diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj
index ff164a0..d14e733 100644
--- a/Main/MCEdit/MCEdit.csproj
+++ b/Main/MCEdit/MCEdit.csproj
@@ -229,6 +229,9 @@
Designer
Always
+
+ Always
+
Always