From 99433a38552f71002f1e49a2c23fabaee1452a6a Mon Sep 17 00:00:00 2001 From: wangsr Date: Thu, 14 Dec 2023 18:18:17 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E8=AE=BE=E5=A4=87=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=97=A5=E7=BD=90=E5=8E=8B?= =?UTF-8?q?=E5=8A=9B=E6=98=BE=E7=A4=BA,=E8=AE=BE=E5=A4=87=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=B7=BB=E5=8A=A0=E5=85=A8=E9=83=A8=E4=B8=8B=E4=BC=A0?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0,=E4=B8=8B=E4=BC=A0=E9=80=81=E6=96=99?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=92=8C=E6=B8=85=E6=8A=A5=E8=AD=A6=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LjElectrical/DownAction.cs | 28 +- .../LjElectrical/UpAction.cs | 2 +- .../LjMetage/DownAction.cs | 2 +- .../LjMetage/UpAction.cs | 2 +- .../LjPressure/DownAction.cs | 2 +- .../LjPressure/UpAction.cs | 2 +- .../LjProportional/DownAction.cs | 2 +- .../LjProportional/UpAction.cs | 2 +- .../LjWeight/DownAction.cs | 2 +- .../LjWeight/UpAction.cs | 2 +- .../Entity/DeviceDetailEntity.cs | 12 + .../Entity/PlcReadTempEntity.cs | 13 + .../MainDetailControlAction.cs | 34 +- .../Mesnac.Action.ChemicalWeighing.csproj | 2 + .../OliveEQSetting/DownloadAction.cs | 28 ++ .../OliveEQSetting/UploadAction.cs | 28 ++ .../Report/LjLogReport.cs | 139 +++++++- .../榄菊设备参数设定总览.xml | 64 ++-- .../MCProject/nodeForm/FormOliveEQSetting.xml | 50 +++ .../Data/MCProject/nodeForm/LjLogForm.xml | 114 ++++++- .../Data/MCProject/nodeForm/MainDetail.xml | 302 ++++++++++++++++-- .../MCProject/nodeForm/ManualWaterControl.xml | 4 +- Main/MCRun/Data/SysConfig/MenuConfig.dat | Bin 19979 -> 21622 bytes 23 files changed, 739 insertions(+), 97 deletions(-) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/DownloadAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/UploadAction.cs diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs index a528e34..f744640 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs @@ -8,12 +8,12 @@ using Mesnac.Action.ChemicalWeighing.LjMetage; namespace Mesnac.Action.ChemicalWeighing.LjElectrical { - public class DownAction:ChemicalWeighingAction, IAction + public class DownAction : ChemicalWeighingAction, IAction { - - + + public static event EventHandler OnHandler; - + private DbMCControl _materialGridControl = null; //物料列表控件 private RuntimeParameter _runtime; public void Run(RuntimeParameter runtime) @@ -24,32 +24,32 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ElectricalSetting") .FirstOrDefault(); //获取物料数据控件 this._materialGridControl = materialGridControl; - - - if (MessageBox.Show("确定下发到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + + + if (MessageBox.Show("确定下发变频参数到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) { DoWord(); }; - + } - + private void DoWord() { - DataGridView gridView=_materialGridControl.BaseControl as DataGridView; + DataGridView gridView = _materialGridControl.BaseControl as DataGridView; var gridViewDataSource = gridView.DataSource as DataTable; - + List lsView = new List(); var dataRowCollection = gridViewDataSource.Rows; foreach (DataRow o in dataRowCollection) { - ElectricalView view =new ElectricalView(); + ElectricalView view = new ElectricalView(); view.Id = (int)o["Id"]; view.Name = o["Name"].ToString(); - view.Speed =Convert.ToSingle(o["Speed"]);; + view.Speed = Convert.ToSingle(o["Speed"]); ; lsView.Add(view); } - + ElectricalPlc.DownToPlc(lsView); } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs index dd4c4a0..85d6708 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs @@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical .FirstOrDefault(); //获取物料数据控件 - if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + if (MessageBox.Show("确定上传变频参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { DoWord(); }; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs index 62255c9..1bd83e2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs @@ -27,7 +27,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage this._materialGridControl = materialGridControl; - if (MessageBox.Show("确定下发到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + if (MessageBox.Show("确定下发称量频参数到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { LoadingHelper.ShowLoadingScreen(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs index 0df2f42..726f73a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs @@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage .FirstOrDefault(); //获取物料数据控件 - if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + if (MessageBox.Show("确定上传称量频参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { LoadingHelper.ShowLoadingScreen(); var watchDog = LjHelp.WatchDog; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/DownAction.cs index 6ed7435..7c08dd5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/DownAction.cs @@ -27,7 +27,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure this._materialGridControl = materialGridControl; - if (MessageBox.Show("确定下发到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + if (MessageBox.Show("确定下发压力参数到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { DoWord(); }; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs index 96dd6e5..c34b9ba 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs @@ -21,7 +21,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure .FirstOrDefault(); //获取物料数据控件 - if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + if (MessageBox.Show("确定上传压力参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { DoWord(); }; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs index db3f5a5..e836607 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs @@ -25,7 +25,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional this._materialGridControl = materialGridControl; - if (MessageBox.Show("确定下发到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == + if (MessageBox.Show("确定下发比例阀参数到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) { LoadingHelper.ShowLoadingScreen(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs index 5c65c16..d7679e2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs @@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional .FirstOrDefault(); //获取物料数据控件 - if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + if (MessageBox.Show("确定上传比例阀参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { LoadingHelper.ShowLoadingScreen(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs index 6bb6af8..afcf2bf 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs @@ -25,7 +25,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight this._materialGridControl = materialGridControl; - if (MessageBox.Show("确定下发到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == + if (MessageBox.Show("确定下发重量参数到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK) { DoWord(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs index c207ddd..4603795 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs @@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight .FirstOrDefault(); //获取物料数据控件 - if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + if (MessageBox.Show("确定上传重量参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { LoadingHelper.ShowLoadingScreen(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index 292bf0b..c58ac29 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -220,6 +220,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public MCLabel LineKind6 { get; set; } public MCLabel LineKind7 { get; set; } public MCLabel LineKind8 { get; set; } + public MCLabel PresDaybin1 { get; set; } + public MCLabel PresDaybin2 { get; set; } + public MCLabel PresDaybin3 { get; set; } + public MCLabel PresDaybin4 { get; set; } + public MCLabel PresDaybin5 { get; set; } + public MCLabel PresDaybin6 { get; set; } + public MCLabel PresDaybin7 { get; set; } + public MCLabel PresDaybin8 { get; set; } + public MCLabel PresDaybin9 { get; set; } + public MCLabel PresDaybin10 { get; set; } + public MCLabel PresDaybin11 { get; set; } + public MCLabel PresDaybin12 { get; set; } } public class SwitchLightEntity diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs index e40a240..172a646 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs @@ -123,6 +123,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public float DM2CSF01_Set { get; set; } public float DM2DSF01_Set { get; set; } + public float PresDaybin1_Set { get; set; } + public float PresDaybin2_Set { get; set; } + public float PresDaybin3_Set { get; set; } + public float PresDaybin4_Set { get; set; } + public float PresDaybin5_Set { get; set; } + public float PresDaybin6_Set { get; set; } + public float PresDaybin7_Set { get; set; } + public float PresDaybin8_Set { get; set; } + public float PresDaybin9_Set { get; set; } + public float PresDaybin10_Set { get; set; } + public float PresDaybin11_Set { get; set; } + public float PresDaybin12_Set { get; set; } + public bool DM1ASF01_Set { get; set; } public bool DM1BSF01_Set { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 466eb8f..fe8f7e9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -296,11 +296,11 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetMCLabel(LabelE.LineKind8, dict[8]); } ReadFlag += 1; - if(ReadFlag >= 30) + if (ReadFlag >= 30) { ReadFlag = 0; ReportReadDb.ReadFeededDry(); - + } var reachSingle = RgvPlcUtil.GetRGVAllError(); @@ -1109,7 +1109,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl - + if (DB2103.DM2DSF01.Running) { @@ -1462,7 +1462,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.ValueWeight2 = DB2107.Weter[3].FeedValue.ToString("0.#"); } - + if (PlcReadTemp.DM2CSF01L_Set) { @@ -1485,7 +1485,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.ValueWeight4 = DB2107.Weter[7].FeedValue.ToString("0.#"); } - + PlcReadTemp.PresDaybin1_Set = DB2107.Pressure.PressDaybin_B1.ActualValue; + PlcReadTemp.PresDaybin2_Set = DB2107.Pressure.PressDaybin_B2.ActualValue; + PlcReadTemp.PresDaybin3_Set = DB2107.Pressure.PressDaybin_B3.ActualValue; + PlcReadTemp.PresDaybin4_Set = DB2107.Pressure.PressDaybin_B4.ActualValue; + PlcReadTemp.PresDaybin5_Set = DB2107.Pressure.PressDaybin_B5.ActualValue; + PlcReadTemp.PresDaybin6_Set = DB2107.Pressure.PressDaybin_B6.ActualValue; + PlcReadTemp.PresDaybin7_Set = DB2107.Pressure.PressDaybin_B7.ActualValue; + PlcReadTemp.PresDaybin8_Set = DB2107.Pressure.PressDaybin_B8.ActualValue; + PlcReadTemp.PresDaybin9_Set = DB2107.Pressure.PressDaybin_B9.ActualValue; + PlcReadTemp.PresDaybin10_Set = DB2107.Pressure.PressDaybin_B10.ActualValue; + PlcReadTemp.PresDaybin11_Set = DB2107.Pressure.PressDaybin_B11.ActualValue; + PlcReadTemp.PresDaybin12_Set = DB2107.Pressure.PressDaybin_B12.ActualValue; ControlsHelper.SetMCLabel(LabelE.ValueWeight1, PlcReadTemp.ValueWeight1); ControlsHelper.SetMCLabel(LabelE.ValueWeight2, PlcReadTemp.ValueWeight2); @@ -1572,6 +1583,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetMCLabel(LabelE.Hopper_3_ActWeight, (float)Math.Round(PlcReadTemp.Hopper_3_ActWeight_Set, 2)); ControlsHelper.SetMCLabel(LabelE.Hopper_4_ActWeight, (float)Math.Round(PlcReadTemp.Hopper_4_ActWeight_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin1, (float)Math.Round(PlcReadTemp.PresDaybin1_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin2, (float)Math.Round(PlcReadTemp.PresDaybin2_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin3, (float)Math.Round(PlcReadTemp.PresDaybin3_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin4, (float)Math.Round(PlcReadTemp.PresDaybin4_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin5, (float)Math.Round(PlcReadTemp.PresDaybin5_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin6, (float)Math.Round(PlcReadTemp.PresDaybin6_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin7, (float)Math.Round(PlcReadTemp.PresDaybin7_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin8, (float)Math.Round(PlcReadTemp.PresDaybin8_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin9, (float)Math.Round(PlcReadTemp.PresDaybin9_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin10, (float)Math.Round(PlcReadTemp.PresDaybin10_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin11, (float)Math.Round(PlcReadTemp.PresDaybin11_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PresDaybin12, (float)Math.Round(PlcReadTemp.PresDaybin12_Set, 2)); + ControlsHelper.SetJzf(JzfE.AS1BLT01, PlcReadTemp.AS1BLT01_Set); ControlsHelper.SetJzf(JzfE.AS1BLT02, PlcReadTemp.AS1BLT02_Set); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 1900e8a..80bde48 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -555,6 +555,8 @@ + + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/DownloadAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/DownloadAction.cs new file mode 100644 index 0000000..2b5c206 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/DownloadAction.cs @@ -0,0 +1,28 @@ +using Mesnac.Action.Base; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting +{ + public class DownloadAction : ChemicalWeighingAction, IAction + { + LjElectrical.DownAction DownActionElectrical = new LjElectrical.DownAction(); + LjMetage.DownAction DownActionMetage = new LjMetage.DownAction(); + LjPressure.DownAction DownActionPressure = new LjPressure.DownAction(); + LjProportional.DownAction DownActionProportional = new LjProportional.DownAction(); + LjWeight.DownAction DownActionWeight = new LjWeight.DownAction(); + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); + DownActionElectrical.Run(runtime); + DownActionMetage.Run(runtime); + DownActionPressure.Run(runtime); + DownActionProportional.Run(runtime); + DownActionWeight.Run(runtime); + } + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/UploadAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/UploadAction.cs new file mode 100644 index 0000000..e4581a1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/UploadAction.cs @@ -0,0 +1,28 @@ +using Mesnac.Action.Base; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting +{ + public class UploadAction : ChemicalWeighingAction, IAction + { + LjElectrical.UpAction UpActionElectrical = new LjElectrical.UpAction(); + LjMetage.UpAction UpActionMetage = new LjMetage.UpAction(); + LjPressure.UpAction UpActionPressure = new LjPressure.UpAction(); + LjProportional.UpAction UpActionProportional = new LjProportional.UpAction(); + LjWeight.UpAction UpActionWeight = new LjWeight.UpAction(); + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); + UpActionElectrical.Run(runtime); + UpActionMetage.Run(runtime); + UpActionPressure.Run(runtime); + UpActionProportional.Run(runtime); + UpActionWeight.Run(runtime); + } + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs index ea21771..7cebcd6 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs @@ -1,13 +1,21 @@ -using DevExpress.XtraExport.Helpers; +using DataBlockHelper; +using DevExpress.XtraExport.Helpers; using DevExpress.XtraRichEdit.Model; +using ICSharpCode.Core; using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.InterfaceDocking; +using Mesnac.Action.ChemicalWeighing.InterfaceDocking.DockingEntity; +using Mesnac.Controls.ChemicalWeighing; using Mesnac.Controls.Default; +using Mesnac.Core.Service; using System; using System.Collections.Generic; using System.Data; +using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices.ComTypes; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; @@ -21,6 +29,17 @@ namespace Mesnac.Action.ChemicalWeighing.Report MCButton ManualControl; MCButton Refresh; MCButton SelectByText; + MCButton EliAlarms; + MCButton DownloadRequest; + + //HslSwitch HslSwitch1; + //HslSwitch HslSwitch2; + //HslSwitch HslSwitch3; + //HslSwitch HslSwitch4; + //HslSwitch HslSwitch5; + //HslSwitch HslSwitch6; + //HslSwitch HslSwitch7; + //HslSwitch HslSwitch8; MCTextBox SelectText; @@ -43,11 +62,21 @@ namespace Mesnac.Action.ChemicalWeighing.Report ManualControl = control.FirstOrDefault(x => x != null && x.Name == "ManualControl") as MCButton; Refresh = control.FirstOrDefault(x => x != null && x.Name == "Refresh") as MCButton; SelectByText = control.FirstOrDefault(x => x != null && x.Name == "SelectByText") as MCButton; + EliAlarms = control.FirstOrDefault(x => x != null && x.Name == "EliAlarms") as MCButton; + DownloadRequest = control.FirstOrDefault(x => x != null && x.Name == "DownloadRequest") as MCButton; StartDate = control.FirstOrDefault(x => x != null && x.Name == "StartDate") as MCDateTimePicker; EndDate = control.FirstOrDefault(x => x != null && x.Name == "EndDate") as MCDateTimePicker; LogForm = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ManualLogGridView1").FirstOrDefault(); SelectText = control.FirstOrDefault(x => x != null && x.Name == "SelectText") as MCTextBox; Line = control.FirstOrDefault(x => x != null && x.Name == "Line") as MCCombobox; + //HslSwitch1 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch1") as HslSwitch; + //HslSwitch2 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch2") as HslSwitch; + //HslSwitch3 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch3") as HslSwitch; + //HslSwitch4 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch4") as HslSwitch; + //HslSwitch5 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch5") as HslSwitch; + //HslSwitch6 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch6") as HslSwitch; + //HslSwitch7 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch7") as HslSwitch; + //HslSwitch8 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch8") as HslSwitch; if (LogForm != null) { @@ -81,38 +110,136 @@ namespace Mesnac.Action.ChemicalWeighing.Report ManualControl.Click += ManualControlSelect; Refresh.Click += RefreshAction; SelectByText.Click += SelectByTextAction; + EliAlarms.Click += EliAlarmsClick; + DownloadRequest.Click += RequestDownloadClick; + } + + /// + /// 下发送料请求按钮点击 + /// + /// + /// + private void RequestDownloadClick(object sender, EventArgs e) + { + bool mixok1 = PlcConnect.Instance.ReadBool("DB3000.0.0").Content; + Time(1, mixok1 ? 1 : 0); + bool mixok2 = PlcConnect.Instance.ReadBool("DB3000.0.1").Content; + Time(2, mixok2 ? 1 : 0); + bool mixok3 = PlcConnect.Instance.ReadBool("DB3000.0.2").Content; + Time(3, mixok3 ? 1 : 0); + bool mixok4 = PlcConnect.Instance.ReadBool("DB3000.0.3").Content; + Time(4, mixok4 ? 1 : 0); + bool mixok5 = PlcConnect.Instance.ReadBool("DB3000.0.4").Content; + Time(5, mixok5 ? 1 : 0); + bool mixok6 = PlcConnect.Instance.ReadBool("DB3000.0.5").Content; + Time(6, mixok6 ? 1 : 0); + bool mixok7 = PlcConnect.Instance.ReadBool("DB3000.0.6").Content; + Trace.WriteLine("7号信号:" + mixok7); + Time(7, mixok7 ? 1 : 0); + bool mixok8 = PlcConnect.Instance.ReadBool("DB3000.0.7").Content; + Trace.WriteLine("8号信号:" + mixok8); + Time(8, mixok8 ? 1 : 0); + } + + /// + /// 下发接料请求 + /// + /// + /// + private void Time(int deviceNo, int statu) + { + TankIsDischargedSyncEntity tankIsDischargedSyncEntity = new TankIsDischargedSyncEntity() + { + reqCode = System.Guid.NewGuid().ToString(), + reqTime = DateTime.Now, + deviceNo = deviceNo.ToString(), + state = statu.ToString(), + }; + //即使网络不同 也不会影响上位机的使用 + ThreadPool.QueueUserWorkItem(delegate + { + HttpResponse httpResponse = new HttpResponse(); + string returnTest = httpResponse.PostResponse(tankIsDischargedSyncEntity); + MesnacServiceManager.Instance.LoggingService.Info($"湿混机{deviceNo}返回数据" + returnTest); + }); + } + + /// + /// 消除报警按钮点击 + /// + /// + /// + private void EliAlarmsClick(object sender, EventArgs e) + { + PlcConnect.Instance.Write("DB2107.10.7", true); + Thread.Sleep(2000); + PlcConnect.Instance.Write("DB2107.10.7", false); } + /// + /// 按时间查询日志 + /// + /// + /// private void SelectByTime(object sender, EventArgs e) { SetForm(StartDate.Value.Date.ToString("yyyy-MM-dd"), EndDate.Value.Date.ToString("yyyy-MM-dd")); } + /// + /// 水称日志查询 + /// + /// + /// private void WaterSetSelect(object sender, EventArgs e) { SetForm("水", Convert.ToInt32(Line.MCValue.ToString())); } + /// + /// 螺旋日志查询 + /// + /// + /// private void SpiralSetSelect(object sender, EventArgs e) { SetForm("螺旋", Convert.ToInt32(Line.MCValue.ToString())); } + /// + /// 手动操作查询 + /// + /// + /// private void ManualControlSelect(object sender, EventArgs e) { SetForm("手动"); } + /// + /// 刷新日志按钮 + /// + /// + /// private void RefreshAction(object sender, EventArgs e) { SetForm(""); } + /// + /// 根据文本模糊查询 + /// + /// + /// private void SelectByTextAction(object sender, EventArgs e) { SetForm(SelectText.MCValue.ToString()); } + /// + /// 根据文本查询绑定控件2 + /// + /// 文本 private void SetForm(string key) { if (LogForm != null) @@ -123,6 +250,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report } } + /// + /// 根据文本和设备编号查询绑定控件 + /// + /// 文本 + /// 设备编号 private void SetForm(string key, int deviceNo) { if (LogForm != null) @@ -133,6 +265,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report } } + /// + /// 根据起始时间查询绑定控件 + /// + /// 开始时间 + /// 结束时间 private void SetForm(string startTime, string endTime) { if (LogForm != null) diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊设备参数设定总览.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊设备参数设定总览.xml index 64cccea..f5a6280 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/榄菊设备参数设定总览.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊设备参数设定总览.xml @@ -1,30 +1,48 @@ - - - - - - 初始榄菊设备参数 - 初始榄菊设备参数 - - - + + + + + + 初始榄菊设备参数 + 初始榄菊设备参数 + + + 数据全部上传 + 数据全部上传 + + + 数据全部下达 + 数据全部下达 + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormOliveEQSetting.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormOliveEQSetting.xml index 0735d18..5236752 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormOliveEQSetting.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormOliveEQSetting.xml @@ -498,6 +498,56 @@ 25 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhFRTJFRTlEQTE3RTQwOENCM0M5RDIxQ0FDNzA2MkU2BgYAAAAS5pWw5o2u5YWo6YOo5LiL6L6+BgcAAAAS5pWw5o2u5YWo6YOo5LiL6L6+Cw== + + + + False + + + + None + True + True + False + + + Red + DarkGray + 一键下发 + 宋体, 12pt, style=Bold + 509, 7 + AllDownload + 110, 52 + 13 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEI5NDcyMzM1QTlGQjQ2MEZBNkRFMDM3NzJDQ0UzNjE2BgYAAAAS5pWw5o2u5YWo6YOo5LiK5LygBgcAAAAS5pWw5o2u5YWo6YOo5LiK5LygCw== + + + + False + + + + None + True + True + False + + + Red + DarkGray + 一键上传 + 宋体, 12pt, style=Bold + 384, 7 + AllUpload + 110, 52 + 12 + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAVAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCRjBEM0RDRTU2M0I0RTY4OUI4MTVFMzNEMDlGOUFFBgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml index 278d85d..7292eb0 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml @@ -1,5 +1,95 @@ + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== + + DownloadRequest + + False + + + + Query + True + True + False + + + Red + DarkGray + 下发送料请求 + 宋体, 12pt + 63, 409 + DownloadRequest + 148, 44 + 49 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== + + EliAlarms + + False + + + + Query + True + True + False + + + Red + DarkGray + 消除报警 + 宋体, 12pt + 63, 350 + EliAlarms + 148, 44 + 48 + + + 142, 476 + HslSwitch2 + 73, 79 + + + 142, 731 + HslSwitch8 + 73, 79 + + + 51, 731 + HslSwitch7 + 73, 79 + + + 141, 646 + HslSwitch6 + 73, 79 + + + 51, 646 + HslSwitch5 + 73, 79 + + + 141, 561 + HslSwitch4 + 73, 79 + + + 51, 561 + HslSwitch3 + 73, 79 + + + 51, 476 + HslSwitch1 + 73, 79 + False @@ -27,7 +117,7 @@ True False False - 310, 12 + 273, 12 LogForm 533, 826 13 @@ -113,7 +203,7 @@ False 查询细分 - 25, 176 + 6, 165 GroupBox2147483645 122, 153 21 @@ -132,7 +222,7 @@ True MiddleCenter 224, 224, 224 - 25, 162 + 6, 151 SpecialLabelBlue1 244, 1 @@ -156,7 +246,7 @@ DarkGray 手动操作查询 宋体, 12pt - 153, 180 + 134, 169 ManualControl 116, 47 14 @@ -179,7 +269,7 @@ True True - 25, 112 + 12, 101 SelectText 110, 21 16 @@ -204,7 +294,7 @@ DarkGray 日志查询 宋体, 12pt - 153, 97 + 134, 86 SelectByText 116, 47 15 @@ -229,7 +319,7 @@ DarkGray 刷新 宋体, 20pt - 153, 233 + 134, 222 Refresh 116, 96 13 @@ -248,7 +338,7 @@ True True Short - 25, 58 + 12, 47 EndDate 110, 21 10 @@ -267,7 +357,7 @@ True True Short - 25, 31 + 12, 20 StartDate 110, 21 9 @@ -292,7 +382,7 @@ DarkGray 范围查询 宋体, 12pt - 153, 31 + 134, 20 SelectButton 116, 48 8 @@ -302,7 +392,7 @@ 12, 12 - 292, 350 + 255, 323 11 @@ -321,7 +411,7 @@ False False Control - 871, 889 + 834, 889 WindowsDefaultLocation 榄菊生产日志 Normal diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 9114e7f..8f16198 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -1,6 +1,246 @@ + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1840, 177 + PresDaybin12 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1651, 177 + PresDaybin10 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1735, 177 + PresDaybin11 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1527, 177 + PresDaybin9 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1337, 177 + PresDaybin7 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1421, 177 + PresDaybin8 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1283, 177 + PresDaybin6 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1093, 177 + PresDaybin4 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 1177, 177 + PresDaybin5 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 972, 176 + PresDaybin3 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 782, 176 + PresDaybin1 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0.00 + ButtonHighlight + 866, 176 + PresDaybin2 + 29, 12 + @@ -7928,7 +8168,7 @@ - 1657, 117 + 1668, 117 ThreeWayValve14 22, 12 @@ -8275,7 +8515,7 @@ TurnOn - 1661, 191 + 1672, 191 PControl19 10, 15 @@ -8297,14 +8537,14 @@ TurnOn - 1851, 189 + 1858, 189 PControl20 10, 15 TurnOn - 1765, 190 + 1767, 190 PControl21 10, 15 @@ -8319,7 +8559,7 @@ zsTurnOff - 1778, 175 + 1781, 175 DM1KDF01 17, 15 @@ -8380,9 +8620,9 @@ True MiddleCenter MintCream - 1758, 71 + 1764, 71 SpecialLabelBlue361 - 3, 129 + 3, 133 @@ -8398,7 +8638,7 @@ True MiddleCenter MintCream - 1862, 120 + 1869, 120 SpecialLabelBlue360 3, 83 @@ -8416,7 +8656,7 @@ True MiddleCenter MintCream - 1671, 121 + 1682, 121 SpecialLabelBlue359 3, 82 @@ -9548,14 +9788,14 @@ TurnOn - 1297, 192 + 1304, 192 PControl13 10, 15 TurnOn - 1347, 192 + 1357, 192 PControl12 10, 15 @@ -9577,7 +9817,7 @@ TurnOn - 1538, 190 + 1545, 190 PControl11 10, 15 @@ -9599,7 +9839,7 @@ zsTurnOff - 1465, 175 + 1468, 175 DM1HDF01 17, 15 @@ -9658,7 +9898,7 @@ TurnOn - 1106, 191 + 1115, 191 PControl8 10, 15 @@ -9688,7 +9928,7 @@ zsTurnOff - 912, 177 + 916, 177 DM1BDF01 17, 15 @@ -9717,7 +9957,7 @@ TurnOn - 992, 190 + 993, 190 PControl7 10, 15 @@ -9731,7 +9971,7 @@ TurnOn - 800, 190 + 801, 190 PControl5 10, 15 @@ -10477,7 +10717,7 @@ MintCream 1452, 78 SpecialLabelBlue495 - 3, 122 + 3, 126 @@ -10502,7 +10742,7 @@ True MiddleCenter MintCream - 1549, 125 + 1556, 125 SpecialLabelBlue496 3, 78 @@ -10511,7 +10751,7 @@ - 1537, 116 + 1544, 116 DV2PCP13 22, 12 @@ -10529,16 +10769,16 @@ True MiddleCenter MintCream - 1358, 125 + 1368, 125 SpecialLabelBlue497 - 3, 78 + 3, 81 - 1344, 118 + 1354, 118 DV2PCP10 22, 12 @@ -11030,7 +11270,7 @@ True MiddleCenter MintCream - 1308, 152 + 1315, 152 SpecialLabelBlue517 3, 53 @@ -11048,7 +11288,7 @@ True MiddleCenter MintCream - 1117, 156 + 1126, 156 SpecialLabelBlue518 3, 53 @@ -11057,7 +11297,7 @@ - 1104, 148 + 1113, 148 DV2PCP09 22, 12 @@ -11082,7 +11322,7 @@ True MiddleCenter MintCream - 1003, 156 + 1004, 156 SpecialLabelBlue519 3, 53 @@ -11091,7 +11331,7 @@ - 990, 148 + 991, 148 DV2PCP08 22, 12 @@ -11111,7 +11351,7 @@ MintCream 802, 150 SpecialLabelBlue520 - 508, 3 + 516, 3 @@ -11698,7 +11938,7 @@ MintCream 736, 120 SpecialLabelBlue541 - 1129, 3 + 1136, 3 @@ -11734,7 +11974,7 @@ MintCream 758, 71 SpecialLabelBlue543 - 1003, 3 + 1009, 3 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml index 195663e..6ce05c1 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml @@ -19,7 +19,7 @@ Red DarkGray 下发送料请求 - 702, 356 + 702, 381 DownloadRequest 148, 44 39 @@ -43,7 +43,7 @@ Red DarkGray 消除报警 - 702, 276 + 702, 331 EliAlarms 148, 44 30 diff --git a/Main/MCRun/Data/SysConfig/MenuConfig.dat b/Main/MCRun/Data/SysConfig/MenuConfig.dat index bf7818f1873a27fd7448c95ded724c53e4456e61..d5bd986206624439a3e2837586f2126bba9dac0e 100644 GIT binary patch literal 21622 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 rsAIz6QB#{`8nnI^#9!^3S8;5z;RO0dLH literal 19979 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