From 5ca78fc6ef32012a701f0108aab0663e44a07013 Mon Sep 17 00:00:00 2001 From: wangsr Date: Wed, 18 Oct 2023 04:20:42 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=9B=B4=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=AE=B0=E5=BD=95=E6=96=B9=E5=BC=8F=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DayWhiteEmbryo/GelBlackPowderCount.cs | 209 +++++++++++ .../ManualControl/InitAction.cs | 156 +++++++- .../ManualControl/ManualControlAction.cs | 160 ++++---- .../ManualControl/ManualLogEntity.cs | 62 +++- .../Mesnac.Action.ChemicalWeighing.csproj | 1 + .../EventConfig/小料称量/榄菊报表.xml | 21 +- Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 4 +- .../nodeForm/GelBlackPowderCount.xml | 347 ++++++++++++++++++ .../MCProject/nodeForm/ManualWaterControl.xml | 8 +- 9 files changed, 854 insertions(+), 114 deletions(-) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs create mode 100644 Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs new file mode 100644 index 0000000..bdec540 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs @@ -0,0 +1,209 @@ +using DevExpress.Xpo.Helpers; +using DevExpress.XtraRichEdit.Model; + +using FastReport.Dialog; + +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.FreeDb; +using Mesnac.Action.ChemicalWeighing.ManualControl; +using Mesnac.Codd.Session; +using Mesnac.Controls.Default; + +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Xml.Serialization; + +namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo +{ + public class GelBlackPowderCount : ChemicalWeighingAction, IAction + { + + //BtnOk MCDateTimePicker1 MCDataGridView1 + private RuntimeParameter _runtime; + MCButton btnOk; + MCButton selectButton; + MCButton WhiteWork; + MCButton NightWork; + + MCDateTimePicker mCDateTimePicker; + MCDateTimePicker startDate; + MCDateTimePicker startTime; + MCDateTimePicker endDate; + MCDateTimePicker endTime; + + MCDataGridView dataGridView; + MCDataGridView moreData; + + DataTable dt; + DataTable MoreDataTable; + + List list; + + List listMore; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + var control = GetAllControls(); + + mCDateTimePicker = control.FirstOrDefault(x => x.Name == "MCDateTimePicker1") as MCDateTimePicker; + btnOk = control.FirstOrDefault(x => x.Name == "MCButton1") as MCButton; + dataGridView = control.FirstOrDefault(x => x.Name == "MCDataGridView1") as MCDataGridView; + selectButton = control.FirstOrDefault(x => x.Name == "SelectButton") as MCButton; + WhiteWork = control.FirstOrDefault(x => x.Name == "WhiteWork") as MCButton; + NightWork = control.FirstOrDefault(x => x.Name == "NightWork") as MCButton; + moreData = control.FirstOrDefault(x => x.Name == "MoreData") as MCDataGridView; + startDate = control.FirstOrDefault(x => x.Name == "startDate") as MCDateTimePicker; + startTime = control.FirstOrDefault(x => x.Name == "startTime") as MCDateTimePicker; + endDate = control.FirstOrDefault(x => x.Name == "endDate") as MCDateTimePicker; + endTime = control.FirstOrDefault(x => x.Name == "endTime") as MCDateTimePicker; + dataGridView.AutoGenerateColumns = true; + mCDateTimePicker.Value = DateTime.Now.AddDays(0); + startDate.Value = DateTime.Now.AddDays(-1); + + //startTime.Value = Convert.ToDateTime(DateTime.Now.ToString("08:00:00")); + + //endTime.Value = Convert.ToDateTime(DateTime.Now.ToString("20:00:00")); + + dt = new DataTable(); + dt.Columns.Add("机台", typeof(string)); + dt.Columns.Add("总量", typeof(string)); + + MoreDataTable = new DataTable(); + MoreDataTable.Columns.Add("重量", typeof(string)); + MoreDataTable.Columns.Add("时间", typeof(string)); + + btnOk.Click += BtnOk_Click; + selectButton.Click += SelectButton_Click; + dataGridView.CellClick += MoreData_Click; + dataGridView.CellValueChanged += MoreData_Click; + WhiteWork.Click += WhiteWork_Click; + NightWork.Click += NightWork_Click; + } + + private void BtnOk_Click(object sender, EventArgs e) + { + dt.Rows.Clear(); + string time = mCDateTimePicker.Value.ToString("yyyyMMdd"); + list = FreeSqlUnit.Instance.Select().Where(x => x.createdate == time && x.valuekind == 4 && x.devicekind == 2).ToList(); + + DataTableSum(); + } + + private void SelectButton_Click(object sender, EventArgs e) + { + dt.Rows.Clear(); + DateTime starttime = startDate.Value.Date.AddHours(startTime.Value.Hour).AddMinutes(startTime.Value.Minute).AddSeconds(startTime.Value.Second); + DateTime endtime = endDate.Value.Date.AddHours(endTime.Value.Hour).AddMinutes(endTime.Value.Minute).AddSeconds(endTime.Value.Second); + + list = FreeSqlUnit.Instance.Select().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList(); + + DataTableSum(); + } + + private void MoreData_Click(object sender, EventArgs e) + { + MoreDataTable.Rows.Clear(); + + string dID = dataGridView.SelectedRows[0].Cells["机台"].Value as string; + + char[] a = dID.ToCharArray(); + char chr = a[3]; + if (chr == '和') + { + return; + } + int num = int.Parse(chr.ToString()); + listMore = list.Where(x => x.deviceno == num).ToList(); + + for (int i = 0; i < listMore.Count; i++) + { + var dr = MoreDataTable.NewRow(); + dr[0] = listMore[i].value; + dr[1] = listMore[i].logtime; + MoreDataTable.Rows.Add(dr); + } + + moreData.DataSource = null; + moreData.DataSource = MoreDataTable; + + } + + private void WhiteWork_Click(object sender, EventArgs e) + { + dt.Rows.Clear(); + + DateTime nowTime = DateTime.Now; + + DateTime starttime; + DateTime endtime; + + //如果大于当天8点 就展示当天的白班 否则展示上一个白班 + if (nowTime >= DateTime.Now.Date.AddHours(8)) + { + starttime = DateTime.Now.Date.AddHours(7).AddMinutes(30); + endtime = DateTime.Now.Date.AddHours(19).AddMinutes(30); + } + else + { + starttime = DateTime.Now.Date.AddHours(-17).AddMinutes(30); + endtime = DateTime.Now.Date.AddHours(-5).AddMinutes(30); + } + + list = FreeSqlUnit.Instance.Select().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList(); + + DataTableSum(); + } + + private void NightWork_Click(Object sender, EventArgs e) + { + dt.Rows.Clear(); + + DateTime nowTime = DateTime.Now; + + DateTime starttime; + DateTime endtime; + + //如果小于当天20点 就展示当天的前一个晚班 + if (nowTime <= DateTime.Now.Date.AddHours(20)) + { + starttime = DateTime.Now.Date.AddHours(-5).AddMinutes(30); + endtime = DateTime.Now.Date.AddHours(7).AddMinutes(30); + } + else + { + starttime = DateTime.Now.Date.AddHours(19).AddMinutes(30); + endtime = DateTime.Now.Date.AddHours(31).AddMinutes(30); + } + + list = FreeSqlUnit.Instance.Select().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList(); + + DataTableSum(); + } + + private void DataTableSum() + { + for (int i = 1; i <= 8; i++) + { + var dr = dt.NewRow(); + dr[0] = "湿混机" + i; + var totalWeight = list.Where(x => x.deviceno == i).Sum(x => x.value); + dr[1] = totalWeight.ToString(); + + dt.Rows.Add(dr); + } + var edr = dt.NewRow(); + edr[0] = "生产总和"; + edr[1] = list.Sum(x => x.value).ToString(); + dt.Rows.Add(edr); + + dataGridView.DataSource = null; + dataGridView.DataSource = dt; + } + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs index 65b2630..ba84f65 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs @@ -162,7 +162,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl #endregion - LogInsertToDatabase(); + LogInsertToDatabase(""); #region 配置文件加载 @@ -381,6 +381,79 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl timer.Dispose(); } + #region 称量结束日志 + + if (DB2119.Coolwater_A.Dos_End) + { + ManualLogControl("冷水称A称量结束", DB2119.Coolwater_A.Value_Initial, 2, 3, 1); + PlcControl("DB2119.28.3", false); + } + if (DB2119.Hotwater_A.Dos_End) + { + ManualLogControl("热水称A称量结束", DB2119.Hotwater_A.Value_Initial, 2, 1, 1); + PlcControl("DB2119.08.3", false); + } + if (DB2119.Coolwater_B.Dos_End) + { + ManualLogControl("冷水称B称量结束", DB2119.Coolwater_B.Value_Initial, 2, 4, 1); + PlcControl("DB2119.38.3", false); + } + if (DB2119.Hotwater_B.Dos_End) + { + ManualLogControl("热水称B称量结束", DB2119.Hotwater_B.Value_Initial, 2, 2, 1); + PlcControl("DB2119.18.3", false); + } + if (DB2119.Spiral_A.Dos_End) + { + if(DB2119.Spiral_A.Weter_Bin == 1) + { + ManualLogControl("糊化锅1称量结束", DB2119.Spiral_A.Value_Weight, 4, 1, 2); + } + else if(DB2119.Spiral_A.Weter_Bin == 2) + { + ManualLogControl("糊化锅2称量结束", DB2119.Spiral_A.Value_Weight, 4, 2, 2); + } + else + { + ManualLogControl("螺旋1称量结束", DB2119.Spiral_A.Value_Weight, 4, 12, 2); + } + PlcControl("DB2119.60.3", false); + } + if (DB2119.Spiral_B.Dos_End) + { + if (DB2119.Spiral_B.Weter_Bin == 1) + { + ManualLogControl("糊化锅3称量结束", DB2119.Spiral_B.Value_Weight, 4, 3, 2); + } + else if (DB2119.Spiral_B.Weter_Bin == 2) + { + ManualLogControl("糊化锅4称量结束", DB2119.Spiral_B.Value_Weight, 4, 4, 2); + } + else + { + ManualLogControl("螺旋2称量结束", DB2119.Spiral_B.Value_Weight, 4, 34, 2); + } + PlcControl("DB2119.82.3", false); + } + if (DB2119.Spiral_C.Dos_End) + { + if (DB2119.Spiral_C.Weter_Bin == 1) + { + ManualLogControl("糊化锅5称量结束", DB2119.Spiral_C.Value_Weight, 4, 5, 2); + } + else if (DB2119.Spiral_C.Weter_Bin == 2) + { + ManualLogControl("糊化锅6称量结束", DB2119.Spiral_C.Value_Weight, 4, 6, 2); + } + else + { + ManualLogControl("螺旋1称量结束", DB2119.Spiral_C.Value_Weight, 4, 56, 2); + } + PlcControl("DB2119.104.3", false); + } + + #endregion + #region 实际值 称量值指示 WaterActualValue1.MCValue = DB2107.Weight.WScale_3.ActWeight; @@ -569,9 +642,21 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl #region 日志控制 - private void LogInsertToDatabase() + /// + /// 日志查询 + /// + /// 查询关键字 + private void LogInsertToDatabase(string txt) { - DataTable table = DBHelp.GetTable(@"select top 200 id, logtext, logtime from Manual_Log order by id desc"); + string sql = "select top 500 id, logtext, logtime, value from Manual_Log "; + + if (!string.IsNullOrEmpty(txt)) + { + sql += $" where logtext like '%{txt}%'"; + } + + sql += " order by id desc"; + DataTable table = DBHelp.GetTable(sql); if (this.materialGridControl != null && this.materialGridControl.BaseControl != null) { @@ -580,23 +665,82 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } else { - ICSharpCode.Core.LoggingService.Warn("操作日志信息控件为Null..."); + ICSharpCode.Core.LoggingService.Warn("ManualContrlolAction 手动操作日志信息控件为Null..."); } } + /// + /// 日志插入 + /// + /// 日志内容 + /// 值 + /// 值类型 0无 1水称设定值 2水称称量值 3螺旋设定值 4螺旋称量值 + /// 设备编号 + /// 设备类型 0无 1水称 2糊化锅 + private void ManualLogControl(string logName, int value, int valuekind, int deviceno, int devicekind) + { + var Log = new ManualLogEntity() + { + logtext = logName, + logtime = DateTime.Now, + userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName, + value = value, + deviceno = deviceno, + devicekind = devicekind, + valuekind = valuekind, + createdate = DateTime.Now.ToString("yyyyMMdd") + }; + + FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); + + LogInsertToDatabase(""); + } + + private void ManualLogControl(string logName, int deviceno, int devicekind) + { + var Log = new ManualLogEntity() + { + logtext = logName, + logtime = DateTime.Now, + userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName, + value = 0, + deviceno = deviceno, + devicekind = devicekind, + valuekind = 0, + createdate = DateTime.Now.ToString("yyyyMMdd") + }; + + FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); + + LogInsertToDatabase(""); + } + private void ManualLogControl(string logName) { var Log = new ManualLogEntity() { logtext = logName, logtime = DateTime.Now, - userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName + userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName, + value = 0, + deviceno = 0, + devicekind = 0, + valuekind = 0, + createdate = DateTime.Now.ToString("yyyyMMdd") }; - FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); + FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); + + LogInsertToDatabase(""); } + #endregion + private void PlcControl(string address, bool state) + { + PlcConnect.Instance.Write(address, state); + } + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs index 70d278a..ad79a28 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs @@ -361,7 +361,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.20.0", value); PlcControl("DB2119.28.0", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称A开始称量" + value); - ManualLogControl("冷水称A开始称量 " + value); + ManualLogControl("冷水称A开始称量", value, 1, 3, 1); } else { @@ -375,8 +375,8 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.28.1", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称A称量已手动停止"); - ManualLogControl("冷水称A称量已手动停止"); - MessageBox.Show("称量已停止！"); + ManualLogControl("冷水称A称量已手动停止", 3, 1); + MessageBox.Show("冷水称A称量已停止！"); } if (StartMetage2 == runtime.Sender) @@ -391,7 +391,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.0.0", value); PlcControl("DB2119.8.0", true); MesnacServiceManager.Instance.LoggingService.Info("热水称A开始称量" + value); - ManualLogControl("热水称A开始称量 " + value); + ManualLogControl("热水称A开始称量", value, 1, 1, 1); PlcControl("DB2119.0.0", value); } else @@ -406,8 +406,8 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.8.1", true); MesnacServiceManager.Instance.LoggingService.Info("热水称A称量已手动停止"); - ManualLogControl("热水称A称量已手动停止"); - MessageBox.Show("称量已停止！"); + ManualLogControl("热水称A称量已手动停止", 1, 1); + MessageBox.Show("热水称A称量已停止！"); } if (StartMetage3 == runtime.Sender) @@ -420,7 +420,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl return; } MesnacServiceManager.Instance.LoggingService.Info("冷水称B开始称量" + value); - ManualLogControl("冷水称B开始称量 " + value); + ManualLogControl("冷水称B开始称量", value, 1, 4, 1); PlcControl("DB2119.30.0", value); PlcControl("DB2119.38.0", true); } @@ -436,8 +436,8 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.38.1", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称B称量已手动停止"); - ManualLogControl("冷水称B称量已手动停止"); - MessageBox.Show("称量已停止！"); + ManualLogControl("冷水称B称量已手动停止", 4, 1); + MessageBox.Show("冷水称B称量已停止！"); } if (StartMetage4 == runtime.Sender) @@ -450,7 +450,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl return; } MesnacServiceManager.Instance.LoggingService.Info("热水称B开始称量" + value); - ManualLogControl("热水称B开始称量 " + value); + ManualLogControl("热水称B开始称量", value, 1, 2, 1); PlcControl("DB2119.10.0", value); PlcControl("DB2119.18.0", true); } @@ -466,8 +466,8 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.18.1", true); MesnacServiceManager.Instance.LoggingService.Info("热水称B称量已手动停止"); - ManualLogControl("热水称B称量已手动停止"); - MessageBox.Show("称量已停止！"); + ManualLogControl("热水称B称量已手动停止", 2, 1); + MessageBox.Show("热水称B称量已停止！"); } #endregion @@ -808,20 +808,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.58.0", 1); PlcControl("DB2119.60.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋1启动向湿混机1 " + valueSet); - - //DayWhiteEmbryoEntity - - - FreeSqlUnit.Instance.Insert(new DayWhiteEmbryoEntity() - { - CreateDate=DateTime.Now.ToString("yyyyMMdd"), - CreateTime=DateTime.Now, - DeviceId=1, - Weight=valueSet - - }).ExecuteAffrows(); - - ManualLogControl("螺旋1启动向湿混机1" + valueSet); + ManualLogControl("螺旋1启动向湿混机1", valueSet, 3, 1, 2); break; case 2: PlcControl("DB2119.40.0", valueSet); @@ -833,18 +820,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.58.0", 2); PlcControl("DB2119.60.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋1启动向湿混机2 " + valueSet); - - - FreeSqlUnit.Instance.Insert(new DayWhiteEmbryoEntity() - { - CreateDate = DateTime.Now.ToString("yyyyMMdd"), - CreateTime = DateTime.Now, - DeviceId = 2, - Weight = valueSet - - }).ExecuteAffrows(); - - ManualLogControl("螺旋1启动向湿混机2 " + valueSet); + ManualLogControl("螺旋1启动向湿混机2", valueSet, 3, 2, 2); break; default: MessageBox.Show("请选择一个湿混机！"); @@ -902,17 +878,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.80.0", 1); PlcControl("DB2119.82.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋2启动向湿混机3 " + valueSet); - ManualLogControl("螺旋2启动向湿混机3 " + valueSet); - - FreeSqlUnit.Instance.Insert(new DayWhiteEmbryoEntity() - { - CreateDate = DateTime.Now.ToString("yyyyMMdd"), - CreateTime = DateTime.Now, - DeviceId = 3, - Weight = valueSet - - }).ExecuteAffrows(); - + ManualLogControl("螺旋2启动向湿混机3", valueSet, 3, 3, 2); break; case 4: PlcControl("DB2119.62.0", valueSet); @@ -924,16 +890,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.80.0", 2); PlcControl("DB2119.82.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋2启动向湿混机4 " + valueSet); - ManualLogControl("螺旋2启动向湿混机4 " + valueSet); - - FreeSqlUnit.Instance.Insert(new DayWhiteEmbryoEntity() - { - CreateDate = DateTime.Now.ToString("yyyyMMdd"), - CreateTime = DateTime.Now, - DeviceId = 4, - Weight = valueSet - - }).ExecuteAffrows(); + ManualLogControl("螺旋2启动向湿混机4", valueSet, 3, 4, 2); break; default: MessageBox.Show("请选择一个湿混机！"); @@ -991,16 +948,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.102.0", 1); PlcControl("DB2119.104.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋3启动向湿混机5 " + valueSet); - ManualLogControl("螺旋3启动向湿混机5 " + valueSet); - - FreeSqlUnit.Instance.Insert(new DayWhiteEmbryoEntity() - { - CreateDate = DateTime.Now.ToString("yyyyMMdd"), - CreateTime = DateTime.Now, - DeviceId = 5, - Weight = valueSet - - }).ExecuteAffrows(); + ManualLogControl("螺旋3启动向湿混机5", valueSet, 3, 5, 2); break; case 6: PlcControl("DB2119.84.0", valueSet); @@ -1012,16 +960,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.102.0", 2); PlcControl("DB2119.104.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋3启动向湿混机6 " + valueSet); - ManualLogControl("螺旋3启动向湿混机6 " + valueSet); - - FreeSqlUnit.Instance.Insert(new DayWhiteEmbryoEntity() - { - CreateDate = DateTime.Now.ToString("yyyyMMdd"), - CreateTime = DateTime.Now, - DeviceId = 6, - Weight = valueSet - - }).ExecuteAffrows(); + ManualLogControl("螺旋3启动向湿混机6", valueSet, 3, 6, 2); break; default: MessageBox.Show("请选择一个湿混机！"); @@ -1217,9 +1156,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl #region 日志控制 + /// + /// 日志查询 + /// + /// 查询关键字 private void LogInsertToDatabase(string txt) { - string sql = "select top 500 id, logtext, logtime from Manual_Log "; + string sql = "select top 500 id, logtext, logtime, value from Manual_Log "; if (!string.IsNullOrEmpty(txt)) { @@ -1240,20 +1183,71 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } } - private void ManualLogControl(string logName) + /// + /// 日志插入 + /// + /// 日志内容 + /// 值 + /// 值类型 0无 1水称设定值 2水称称量值 3螺旋设定值 4螺旋称量值 + /// 设备编号 + /// 设备类型 0无 1水称 2螺旋 + private void ManualLogControl(string logName, int value, int valuekind, int deviceno, int devicekind) { var Log = new ManualLogEntity() { logtext = logName, logtime = DateTime.Now, - userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName - }; + userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName, + value = value, + deviceno = deviceno, + devicekind = devicekind, + valuekind = valuekind, + createdate = DateTime.Now.ToString("yyyyMMdd") + }; FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); LogInsertToDatabase(""); } + private void ManualLogControl(string logName, int deviceno, int devicekind) + { + var Log = new ManualLogEntity() + { + logtext = logName, + logtime = DateTime.Now, + userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName, + value = 0, + deviceno = deviceno, + devicekind = devicekind, + valuekind = 0, + createdate = DateTime.Now.ToString("yyyyMMdd") + }; + + FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); + + LogInsertToDatabase(""); + } + + private void ManualLogControl(string logName) + { + var Log = new ManualLogEntity() + { + logtext = logName, + logtime = DateTime.Now, + userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName, + value = 0, + deviceno = 0, + devicekind = 0, + valuekind = 0, + createdate = DateTime.Now.ToString("yyyyMMdd") + }; + + FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); + + LogInsertToDatabase(""); + } + #endregion } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualLogEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualLogEntity.cs index f5191e7..048ab27 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualLogEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualLogEntity.cs @@ -15,27 +15,63 @@ using System.Reflection; using System.Threading.Tasks; using FreeSql.DataAnnotations; - - namespace Mesnac.Action.ChemicalWeighing.ManualControl { - [Table(Name = "Manual_Log")] - public partial class ManualLogEntity - { + [Table(Name = "Manual_Log")] + public partial class ManualLogEntity + { + + [Column(IsPrimary = true, IsIdentity = true)] + public int id { get; set; } + + /// + /// 0无 1水称 2螺旋 + /// + + public int? devicekind { get; set; } + + /// + /// 设备编号 + /// + + public int? deviceno { get; set; } + + /// + /// 日志内容 + /// + [Column(DbType = "nvarchar(500)")] + public string logtext { get; set; } = string.Empty; + + /// + /// 记录时间 + /// + + public DateTime? logtime { get; set; } + + /// + /// 操作用户名 + /// + [Column(DbType = "nvarchar(50)")] + public string userid { get; set; } = string.Empty; - [Column(IsPrimary = true, IsIdentity = true)] - public int id { get; set; } + /// + /// 日志值 + /// - [Column(DbType = "nvarchar(500)")] - public string logtext { get; set; } = string.Empty; + public int? value { get; set; } + /// + /// 0无 1水称设定值 2水称称量值 3螺旋设定值 4螺旋称量值 + /// - public DateTime? logtime { get; set; } + public int? valuekind { get; set; } - [Column(DbType = "nvarchar(50)")] - public string userid { get; set; } = string.Empty; + /// + /// 当前日期 + /// + public string createdate { get; set; } - } + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 0a99900..61c0948 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -471,6 +471,7 @@ + Form diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.xml index 16c0acc..af7c2a4 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.xml @@ -6,9 +6,13 @@ 糊化机日投报表 糊化机日投报表 - - - + + 糊化机黑粉统计 + 糊化机黑粉统计 + + + + @@ -16,14 +20,17 @@ - + + + - - - + + + + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index 0e7ff1e..3387d21 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -25,9 +25,11 @@ - + + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml b/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml new file mode 100644 index 0000000..29b63cf --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml @@ -0,0 +1,347 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + False + 348, 12 + MoreData + 330, 622 + 8 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 夜班统计 + 188, 171 + NightWork + 120, 31 + 12 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 白班统计 + 22, 171 + WhiteWork + 120, 31 + 11 + + + + + Red + DarkGray + + + False + + + + None + True + True + 当前或最近一次班次统计 + 22, 146 + MCLabel1 + 137, 12 + + + + + + + False + + + + None + True + True + MiddleCenter + 224, 224, 224 + 22, 139 + SpecialLabelBlue2 + 287, 1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Time + True + 110, 104 + endTime + 77, 21 + 7 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Time + True + 110, 77 + startTime + 77, 21 + 6 + + + + + + + False + + + + None + True + True + MiddleCenter + 224, 224, 224 + 21, 61 + SpecialLabelBlue1 + 287, 1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Short + 21, 104 + endDate + 84, 21 + 4 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Short + 21, 77 + startDate + 84, 21 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 范围查询 + 206, 77 + SelectButton + 103, 48 + 2 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 统计单日 + 206, 26 + MCButton1 + 103, 21 + 1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + 21, 26 + MCDateTimePicker1 + 166, 21 + 0 + + False + 统计查询 + 12, 12 + GroupBox1 + 330, 221 + 6 + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + False + 12, 239 + MCDataGridView1 + 330, 395 + 5 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDI1REE3RDdCMzFBMzQyMTg5Q0Q5ODY4RjFDQTQ0Rjc4BgYAAAAV57OK5YyW5py66buR57KJ57uf6K6hBgcAAAAV57OK5YyW5py66buR57KJ57uf6K6hCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 706, 683 + WindowsDefaultLocation + 湿混机锅黑粉下料统计 + Normal + + Tile + 宋体, 9pt + ControlText + GelBlackPowderCount + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml index ebeb9e7..d9a769e 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml @@ -107,7 +107,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAgAAAF4AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAADQYFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYGAAAAB2xvZ3RleHQGBwAAAAzml6Xlv5flhoXlrrkBBQAAAAQAAAAGCAAAAAdsb2d0aW1lBgkAAAAM5pel5b+X5pel5pyfCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAGoAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANBQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAAHbG9ndGV4dAYIAAAADOaXpeW/l+WGheWuuQEFAAAABAAAAAYJAAAABXZhbHVlBgoAAAAD5YC8AQYAAAAEAAAABgsAAAAHbG9ndGltZQYMAAAADOaXpeW/l+aXpeacnws= AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -133,14 +133,14 @@ False 3, 17 MCDataGridView3 - 357, 775 + 470, 775 2 False 操作日志 862, 12 GroupBox9 - 366, 800 + 476, 800 27 @@ -3537,7 +3537,7 @@ False False Control - 1256, 861 + 1366, 861 WindowsDefaultLocation 手动控制 Normal