From c7656457e92dd5ed0cd6f538fd1c3426bb14af4f Mon Sep 17 00:00:00 2001 From: wangsr Date: Tue, 12 Dec 2023 15:11:02 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=97=A5=E5=BF=97=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=8A=BD=E7=A6=BB=20=E6=B7=BB=E5=8A=A0=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoControl/AutoControl.cs | 104 +++++- .../DayWhiteEmbryo/GelBlackPowderCount.cs | 17 +- .../ManualControl/ForceWaterControl.cs | 3 +- .../ManualControl/InitAction.cs | 126 ++----- .../ManualControl/ManualControlAction.cs | 102 +++--- .../Mesnac.Action.ChemicalWeighing.csproj | 5 +- .../Entity/LjLogEntity.cs} | 4 +- .../LjManualLog.cs => Report/LjLogControl.cs} | 62 +++- .../Report/LjLogReport.cs | 145 ++++++++ .../Report/ReportHelper.cs | 2 +- .../Report/ReportReadDb.cs | 71 +--- DataBlockHelper/DBHelpers/DB2105Helper.cs | 6 +- .../Entity/DB2104Entity/WaterView.cs | 2 - .../EventConfig/小料称量/榄菊报表.xml | 8 + Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 1 + .../nodeForm/GelBlackPowderCount.xml | 1 + .../Data/MCProject/nodeForm/LjLogForm.xml | 332 ++++++++++++++++++ .../MCProject/nodeForm/WeterTimeCount.xml | 1 + 18 files changed, 743 insertions(+), 249 deletions(-) rename Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/{ManualControl/Entity/ManualLogEntity.cs => Report/Entity/LjLogEntity.cs} (95%) rename Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/{ManualControl/LjManualLog.cs => Report/LjLogControl.cs} (65%) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs create mode 100644 Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs index d249d97..09c0878 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs @@ -13,6 +13,7 @@ using Mesnac.Core.Service; using static Mesnac.Action.ChemicalWeighing.AutoControl.AutoLogHelper; using static Mesnac.Action.ChemicalWeighing.AutoControl.PlcAutoWriteHelper; using Mesnac.Controls.Default; +using Mesnac.Action.ChemicalWeighing.Report; namespace Mesnac.Action.ChemicalWeighing.AutoControl { @@ -41,7 +42,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl { BottomSelect(runtime); } - catch(Exception e) + catch (Exception e) { MessageBox.Show("请检查输入内容格式是否正确！"); } @@ -76,14 +77,90 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl return; } - WaterDownload(TextE,ComboE); + WaterDownload(TextE, ComboE); + + if(ComboE.CALeftOrRight.MCValue.ToString() == "1") + { + LjLogControl.ManualLogControl("冷水称A向机台1设置值", Convert.ToInt32(TextE.ColdValueA.MCValue.ToString()), 1, 1, 1); + LjLogControl.ManualLogControl("冷水称A向机台2设置值", Convert.ToInt32(TextE.ColdValueA.MCValue.ToString()), 1, 2, 1); + LjLogControl.ManualLogControl("冷水称A向机台3设置值", + Convert.ToInt32(TextE.ColdValueA.MCValue.ToString()) + Convert.ToInt32(TextE.CADeviation.MCValue.ToString()), 1, 3, 1); + LjLogControl.ManualLogControl("冷水称A向机台4设置值", + Convert.ToInt32(TextE.ColdValueA.MCValue.ToString()) + Convert.ToInt32(TextE.CADeviation.MCValue.ToString()), 1, 4, 1); + } + else if(ComboE.CALeftOrRight.MCValue.ToString() == "2") + { + LjLogControl.ManualLogControl("冷水称A向机台3设置值", Convert.ToInt32(TextE.ColdValueA.MCValue.ToString()), 1, 3, 1); + LjLogControl.ManualLogControl("冷水称A向机台4设置值", Convert.ToInt32(TextE.ColdValueA.MCValue.ToString()), 1, 4, 1); + LjLogControl.ManualLogControl("冷水称A向机台1设置值", + Convert.ToInt32(TextE.ColdValueA.MCValue.ToString()) + Convert.ToInt32(TextE.CADeviation.MCValue.ToString()), 1, 1, 1); + LjLogControl.ManualLogControl("冷水称A向机台2设置值", + Convert.ToInt32(TextE.ColdValueA.MCValue.ToString()) + Convert.ToInt32(TextE.CADeviation.MCValue.ToString()), 1, 2, 1); + } + + if (ComboE.HALeftOrRight.MCValue.ToString() == "1") + { + LjLogControl.ManualLogControl("热水称A向机台1设置值", Convert.ToInt32(TextE.HotValueA.MCValue.ToString()), 1, 1, 1); + LjLogControl.ManualLogControl("热水称A向机台2设置值", Convert.ToInt32(TextE.HotValueA.MCValue.ToString()), 1, 2, 1); + LjLogControl.ManualLogControl("热水称A向机台3设置值", + Convert.ToInt32(TextE.HotValueA.MCValue.ToString()) + Convert.ToInt32(TextE.HADeviation.MCValue.ToString()), 1, 3, 1); + LjLogControl.ManualLogControl("热水称A向机台4设置值", + Convert.ToInt32(TextE.HotValueA.MCValue.ToString()) + Convert.ToInt32(TextE.HADeviation.MCValue.ToString()), 1, 4, 1); + } + else if (ComboE.HALeftOrRight.MCValue.ToString() == "2") + { + LjLogControl.ManualLogControl("热水称A向机台3设置值", Convert.ToInt32(TextE.HotValueA.MCValue.ToString()), 1, 3, 1); + LjLogControl.ManualLogControl("热水称A向机台4设置值", Convert.ToInt32(TextE.HotValueA.MCValue.ToString()), 1, 4, 1); + LjLogControl.ManualLogControl("热水称A向机台1设置值", + Convert.ToInt32(TextE.HotValueA.MCValue.ToString()) + Convert.ToInt32(TextE.HADeviation.MCValue.ToString()), 1, 1, 1); + LjLogControl.ManualLogControl("热水称A向机台2设置值", + Convert.ToInt32(TextE.HotValueA.MCValue.ToString()) + Convert.ToInt32(TextE.HADeviation.MCValue.ToString()), 1, 2, 1); + } + + if (ComboE.CBLeftOrRight.MCValue.ToString() == "1") + { + LjLogControl.ManualLogControl("冷水称B向机台5设置值", Convert.ToInt32(TextE.ColdValueB.MCValue.ToString()), 1, 5, 1); + LjLogControl.ManualLogControl("冷水称B向机台6设置值", Convert.ToInt32(TextE.ColdValueB.MCValue.ToString()), 1, 6, 1); + LjLogControl.ManualLogControl("冷水称B向机台7设置值", + Convert.ToInt32(TextE.ColdValueB.MCValue.ToString()) + Convert.ToInt32(TextE.CBDeviation.MCValue.ToString()), 1, 7, 1); + LjLogControl.ManualLogControl("冷水称B向机台8设置值", + Convert.ToInt32(TextE.ColdValueB.MCValue.ToString()) + Convert.ToInt32(TextE.CBDeviation.MCValue.ToString()), 1, 8, 1); + } + else if (ComboE.CBLeftOrRight.MCValue.ToString() == "2") + { + LjLogControl.ManualLogControl("冷水称B向机台7设置值", Convert.ToInt32(TextE.ColdValueB.MCValue.ToString()), 1, 7, 1); + LjLogControl.ManualLogControl("冷水称B向机台8设置值", Convert.ToInt32(TextE.ColdValueB.MCValue.ToString()), 1, 8, 1); + LjLogControl.ManualLogControl("冷水称B向机台5设置值", + Convert.ToInt32(TextE.ColdValueB.MCValue.ToString()) + Convert.ToInt32(TextE.CBDeviation.MCValue.ToString()), 1, 5, 1); + LjLogControl.ManualLogControl("冷水称B向机台6设置值", + Convert.ToInt32(TextE.ColdValueB.MCValue.ToString()) + Convert.ToInt32(TextE.CBDeviation.MCValue.ToString()), 1, 6, 1); + } + + if (ComboE.HBLeftOrRight.MCValue.ToString() == "1") + { + LjLogControl.ManualLogControl("热水称B向机台5设置值", Convert.ToInt32(TextE.HotValueB.MCValue.ToString()), 1, 5, 1); + LjLogControl.ManualLogControl("热水称B向机台6设置值", Convert.ToInt32(TextE.HotValueB.MCValue.ToString()), 1, 6, 1); + LjLogControl.ManualLogControl("热水称B向机台7设置值", + Convert.ToInt32(TextE.HotValueB.MCValue.ToString()) + Convert.ToInt32(TextE.HBDeviation.MCValue.ToString()), 1, 7, 1); + LjLogControl.ManualLogControl("热水称B向机台8设置值", + Convert.ToInt32(TextE.HotValueB.MCValue.ToString()) + Convert.ToInt32(TextE.HBDeviation.MCValue.ToString()), 1, 8, 1); + } + else if (ComboE.HBLeftOrRight.MCValue.ToString() == "2") + { + LjLogControl.ManualLogControl("热水称B向机台7设置值", Convert.ToInt32(TextE.HotValueB.MCValue.ToString()), 1, 7, 1); + LjLogControl.ManualLogControl("热水称B向机台8设置值", Convert.ToInt32(TextE.HotValueB.MCValue.ToString()), 1, 8, 1); + LjLogControl.ManualLogControl("热水称B向机台5设置值", + Convert.ToInt32(TextE.HotValueB.MCValue.ToString()) + Convert.ToInt32(TextE.HBDeviation.MCValue.ToString()), 1, 5, 1); + LjLogControl.ManualLogControl("热水称B向机台6设置值", + Convert.ToInt32(TextE.HotValueB.MCValue.ToString()) + Convert.ToInt32(TextE.HBDeviation.MCValue.ToString()), 1, 6, 1); + } } #endregion #region 干混机参数下传 - if(ButtonE.DryDownload == runtime.Sender) + if (ButtonE.DryDownload == runtime.Sender) { if (MessageBox.Show("确认下传干混机数据？", "下传确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { @@ -99,6 +176,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl #region 手动控制 + //手动粉料 if (ButtonE.GelManualPowder == runtime.Sender) { if (MessageBox.Show("确认手动下粉料？", "下粉确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) @@ -114,12 +192,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } else { - SingleLog("手动下粉料", RadioE); + LjLogControl.ManualLogControl("手动下粉料", ControlsHelper.SingleSelect(RadioE), 3); MessageBox.Show("信号下达成功！"); } } + //手动冷水 if (ButtonE.GelManualColdWater == runtime.Sender) { if (MessageBox.Show("确认下冷水？", "下水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) @@ -128,20 +207,21 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } bool isReady = GelColdWaterDownload(RadioE); - + if (!isReady) { MessageBox.Show("信号未准备好！"); } else { - SingleLog("手动下冷水", RadioE); + LjLogControl.ManualLogControl("手动下冷水", ControlsHelper.SingleSelect(RadioE), 1); MessageBox.Show("信号下达成功！"); } } + //手动热水 if (ButtonE.GelManualHotWater == runtime.Sender) { if (MessageBox.Show("确认下热水？", "下水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) @@ -157,12 +237,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } else { - SingleLog("手动下热水", RadioE); + LjLogControl.ManualLogControl("手动下热水", ControlsHelper.SingleSelect(RadioE), 1); MessageBox.Show("信号下达成功！"); } } + //手动加糊化料 if (ButtonE.WetManualGel == runtime.Sender) { if (MessageBox.Show("请使用手动加料", "请使用手动加料", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) @@ -171,7 +252,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } return; - + //bool isReady = WetGelatDownload(RadioE); @@ -187,6 +268,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl //} } + //湿混机手动下粉料 if (ButtonE.WetManualControl == runtime.Sender) { if (MessageBox.Show("确认下传数据？", "下传确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) @@ -196,6 +278,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl WetGelatDownload(TextE, RadioE); + LjLogControl.ManualLogControl("手动下冷水", 3, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), ControlsHelper.SingleSelect(RadioE), 2); + MessageBox.Show("数据下传成功！"); } @@ -228,7 +312,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl #region 维修模式 - if(ButtonE.RepairMode == runtime.Sender) + if (ButtonE.RepairMode == runtime.Sender) { RepairOnOff(LabelE, RadioE); } @@ -237,7 +321,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl #region 粘贴数据 - if(ButtonE.PasteWet == runtime.Sender) + if (ButtonE.PasteWet == runtime.Sender) { int index = ComboE.PasteChooseWet.SelectedIndex + 1; ControlsHelper.GWInit(index, ComboE, TextE); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs index 9a96f38..e849e11 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs @@ -6,6 +6,7 @@ using FastReport.Dialog; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.FreeDb; using Mesnac.Action.ChemicalWeighing.ManualControl; +using Mesnac.Action.ChemicalWeighing.Report.Entity; using Mesnac.Codd.Session; using Mesnac.Controls.Default; @@ -42,11 +43,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo DataTable dt; DataTable MoreDataTable; - List list; + List list; - List listMore; + List listMore; - List listSet; + List listSet; public void Run(RuntimeParameter runtime) { @@ -95,7 +96,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo { 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(); + list = FreeSqlUnit.Instance.Select().Where(x => x.createdate == time && x.valuekind == 4 && x.devicekind == 2).ToList(); DataTableSum(); } @@ -106,7 +107,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo 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(); + list = FreeSqlUnit.Instance.Select().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList(); DataTableSum(); } @@ -125,7 +126,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo } int num = int.Parse(chr.ToString()); listMore = list.Where(x => x.deviceno == num).ToList(); - listSet = FreeSqlUnit.Instance.Select().Where(x => x.valuekind == 3 && x.devicekind == 2 && x.deviceno == num).ToList(); + listSet = FreeSqlUnit.Instance.Select().Where(x => x.valuekind == 3 && x.devicekind == 2 && x.deviceno == num).ToList(); for (int i = 0; i < listMore.Count; i++) { var dr = MoreDataTable.NewRow(); @@ -165,7 +166,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo 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(); + list = FreeSqlUnit.Instance.Select().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList(); DataTableSum(); } @@ -191,7 +192,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo 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(); + list = FreeSqlUnit.Instance.Select().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList(); DataTableSum(); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs index 0c857db..35eb7a8 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs @@ -4,6 +4,7 @@ using HslCommunication.Instrument.DLT; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.FreeDb; using Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity; +using Mesnac.Action.ChemicalWeighing.Report.Entity; using Mesnac.Basic; using Mesnac.Controls.ChemicalWeighing; using Mesnac.Controls.Default; @@ -314,7 +315,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl /// 设备类型 0无 1水称 2螺旋 public void ManualLogControl(string logName, int value, int deviceno) { - var Log = new ManualLogEntity() + var Log = new LjLogEntity() { logtext = logName, logtime = DateTime.Now, diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs index 20fe3c9..10c4cfc 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs @@ -16,6 +16,7 @@ using Mesnac.Action.ChemicalWeighing.InterfaceDocking.DockingEntity; using Mesnac.Action.ChemicalWeighing.LjMaterial; using Mesnac.Action.ChemicalWeighing.LjReport.OpenDoor; using Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity; +using Mesnac.Action.ChemicalWeighing.Report; using Mesnac.Basic; using Mesnac.Controls.Base; using Mesnac.Controls.ChemicalWeighing; @@ -177,7 +178,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl #endregion - LogInsertToDatabase(""); + LogSelect(""); //读取停止按钮的状态 FillWaterStop(); @@ -194,7 +195,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl SetSpiralValue3.MCValue = table.Where(x => x.SettingName == "SpiralValue3").LastOrDefault().Value; SetSpiralValue4.MCValue = table.Where(x => x.SettingName == "SpiralValue4").LastOrDefault().Value; MesnacServiceManager.Instance.LoggingService.Info("配置已加载"); - ManualLogControl("配置已加载 "); + LjLogControl.ManualLogControl("配置已加载 "); #endregion @@ -457,7 +458,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl HttpResponse httpResponse = new HttpResponse(); // MesnacServiceManager.Instance.LoggingService.Info($"湿混机{deviceNo}下发请求"); string returnTest = httpResponse.PostResponse(tankIsDischargedSyncEntity); - // ManualLogControl($"湿混机{deviceNo}返回数据 " + returnTest); + // LjManualLog.ManualLogControl($"湿混机{deviceNo}返回数据 " + returnTest); MesnacServiceManager.Instance.LoggingService.Info($"湿混机{deviceNo}返回数据" + returnTest); }); } @@ -494,28 +495,32 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { if (PlcControl("DB2119.28.3", false)) { - ManualLogControl("冷水称A称量结束", DB2119.Coolwater_A.Value_Initial, 2, 3, 1); + LjLogControl.ManualLogControl("冷水称A称量结束", DB2119.Coolwater_A.Value_Initial, 2, 3, 1); + LogSelect(""); } } if (DB2119.Hotwater_A.Dos_End) { if (PlcControl("DB2119.8.3", false)) { - ManualLogControl("热水称A称量结束", DB2119.Hotwater_A.Value_Initial, 2, 1, 1); + LjLogControl.ManualLogControl("热水称A称量结束", DB2119.Hotwater_A.Value_Initial, 2, 1, 1); + LogSelect(""); } } if (DB2119.Coolwater_B.Dos_End) { if (PlcControl("DB2119.38.3", false)) { - ManualLogControl("冷水称B称量结束", DB2119.Coolwater_B.Value_Initial, 2, 4, 1); + LjLogControl.ManualLogControl("冷水称B称量结束", DB2119.Coolwater_B.Value_Initial, 2, 4, 1); + LogSelect(""); } } if (DB2119.Hotwater_B.Dos_End) { if (PlcControl("DB2119.18.3", false)) { - ManualLogControl("热水称B称量结束", DB2119.Hotwater_B.Value_Initial, 2, 2, 1); + LjLogControl.ManualLogControl("热水称B称量结束", DB2119.Hotwater_B.Value_Initial, 2, 2, 1); + LogSelect(""); } } if (DB2119.Spiral_A.Dos_End) @@ -524,15 +529,18 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { if (DB2119.Spiral_A.Weter_Bin == 1) { - ManualLogControl("湿混机1称量结束", DB2119.Spiral_A.Value_Weight, 4, 1, 2); + LjLogControl.ManualLogControl("湿混机1称量结束", DB2119.Spiral_A.Value_Weight, 4, 1, 2); + LogSelect(""); } else if (DB2119.Spiral_A.Weter_Bin == 2) { - ManualLogControl("湿混机2称量结束", DB2119.Spiral_A.Value_Weight, 4, 2, 2); + LjLogControl.ManualLogControl("湿混机2称量结束", DB2119.Spiral_A.Value_Weight, 4, 2, 2); + LogSelect(""); } else { - ManualLogControl("螺旋1称量结束", DB2119.Spiral_A.Value_Weight, 4, 12, 2); + LjLogControl.ManualLogControl("螺旋1称量结束", DB2119.Spiral_A.Value_Weight, 4, 12, 2); + LogSelect(""); } } } @@ -542,15 +550,18 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { if (DB2119.Spiral_B.Weter_Bin == 1) { - ManualLogControl("湿混机3称量结束", DB2119.Spiral_B.Value_Weight, 4, 3, 2); + LjLogControl.ManualLogControl("湿混机3称量结束", DB2119.Spiral_B.Value_Weight, 4, 3, 2); + LogSelect(""); } else if (DB2119.Spiral_B.Weter_Bin == 2) { - ManualLogControl("湿混机4称量结束", DB2119.Spiral_B.Value_Weight, 4, 4, 2); + LjLogControl.ManualLogControl("湿混机4称量结束", DB2119.Spiral_B.Value_Weight, 4, 4, 2); + LogSelect(""); } else { - ManualLogControl("螺旋2称量结束", DB2119.Spiral_B.Value_Weight, 4, 34, 2); + LjLogControl.ManualLogControl("螺旋2称量结束", DB2119.Spiral_B.Value_Weight, 4, 34, 2); + LogSelect(""); } } } @@ -560,15 +571,18 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { if (DB2119.Spiral_C.Weter_Bin == 1) { - ManualLogControl("湿混机5称量结束", DB2119.Spiral_C.Value_Weight, 4, 5, 2); + LjLogControl.ManualLogControl("湿混机5称量结束", DB2119.Spiral_C.Value_Weight, 4, 5, 2); + LogSelect(""); } else if (DB2119.Spiral_C.Weter_Bin == 2) { - ManualLogControl("湿混机6称量结束", DB2119.Spiral_C.Value_Weight, 4, 6, 2); + LjLogControl.ManualLogControl("湿混机6称量结束", DB2119.Spiral_C.Value_Weight, 4, 6, 2); + LogSelect(""); } else { - ManualLogControl("螺旋1称量结束", DB2119.Spiral_C.Value_Weight, 4, 56, 2); + LjLogControl.ManualLogControl("螺旋1称量结束", DB2119.Spiral_C.Value_Weight, 4, 56, 2); + LogSelect(""); } } } @@ -769,17 +783,9 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl /// 日志查询 /// /// 查询关键字 - private void LogInsertToDatabase(string txt) + private void LogSelect(string txt) { - 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); + DataTable table = LjLogControl.ManualLogSelect(txt); if (this.materialGridControl != null && this.materialGridControl.BaseControl != null) { @@ -792,72 +798,6 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } } - /// - /// 日志插入 - /// - /// 日志内容 - /// 值 - /// 值类型 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, - value = 0, - deviceno = 0, - devicekind = 0, - valuekind = 0, - createdate = DateTime.Now.ToString("yyyyMMdd") - }; - - FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); - - LogInsertToDatabase(""); - } - - #endregion private bool PlcControl(string address, bool state) @@ -865,8 +805,6 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl return PlcConnect.Instance.Write(address, state).IsSuccess; } - - private void FillHslSwitch() { //hslSwitchEntity diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs index 174f210..819185d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs @@ -28,6 +28,8 @@ using System.Threading; using DataBlockHelper.DBHelpers; using System.Diagnostics; using DevExpress.XtraRichEdit.Commands.Internal; +using Mesnac.Action.ChemicalWeighing.Report; +using Mesnac.Action.ChemicalWeighing.Report.Entity; namespace Mesnac.Action.ChemicalWeighing.ManualControl { @@ -394,7 +396,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.20.0", value); PlcControl("DB2119.28.0", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称A开始称量" + value); - LjManualLog.ManualLogControl("冷水称A开始称量", value, 1, 3, 1); + LjLogControl.ManualLogControl("冷水称A开始称量", value, 1, 3, 1); LogSelect(""); } else @@ -409,7 +411,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.28.1", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称A称量已手动停止"); - LjManualLog.ManualLogControl("冷水称A称量已手动停止", 3, 1); + LjLogControl.ManualLogControl("冷水称A称量已手动停止", 3, 1); MessageBox.Show("冷水称A称量已停止！"); LogSelect(""); } @@ -431,7 +433,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.0.0", value); PlcControl("DB2119.8.0", true); MesnacServiceManager.Instance.LoggingService.Info("热水称A开始称量" + value); - LjManualLog.ManualLogControl("热水称A开始称量", value, 1, 1, 1); + LjLogControl.ManualLogControl("热水称A开始称量", value, 1, 1, 1); PlcControl("DB2119.0.0", value); LogSelect(""); } @@ -447,7 +449,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.8.1", true); MesnacServiceManager.Instance.LoggingService.Info("热水称A称量已手动停止"); - LjManualLog.ManualLogControl("热水称A称量已手动停止", 1, 1); + LjLogControl.ManualLogControl("热水称A称量已手动停止", 1, 1); MessageBox.Show("热水称A称量已停止！"); LogSelect(""); } @@ -467,7 +469,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl return; } MesnacServiceManager.Instance.LoggingService.Info("冷水称B开始称量" + value); - LjManualLog.ManualLogControl("冷水称B开始称量", value, 1, 4, 1); + LjLogControl.ManualLogControl("冷水称B开始称量", value, 1, 4, 1); PlcControl("DB2119.30.0", value); PlcControl("DB2119.38.0", true); LogSelect(""); @@ -484,7 +486,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.38.1", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称B称量已手动停止"); - LjManualLog.ManualLogControl("冷水称B称量已手动停止", 4, 1); + LjLogControl.ManualLogControl("冷水称B称量已手动停止", 4, 1); MessageBox.Show("冷水称B称量已停止！"); LogSelect(""); } @@ -504,7 +506,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl return; } MesnacServiceManager.Instance.LoggingService.Info("热水称B开始称量" + value); - LjManualLog.ManualLogControl("热水称B开始称量", value, 1, 2, 1); + LjLogControl.ManualLogControl("热水称B开始称量", value, 1, 2, 1); PlcControl("DB2119.10.0", value); PlcControl("DB2119.18.0", true); LogSelect(""); @@ -521,7 +523,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.18.1", true); MesnacServiceManager.Instance.LoggingService.Info("热水称B称量已手动停止"); - LjManualLog.ManualLogControl("热水称B称量已手动停止", 2, 1); + LjLogControl.ManualLogControl("热水称B称量已手动停止", 2, 1); MessageBox.Show("热水称B称量已停止！"); LogSelect(""); } @@ -558,7 +560,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.28.4", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称A开始向糊化锅1排水"); AdddWaterLogControl(1, 2); - LjManualLog.ManualLogControl("冷水称A开始向糊化锅1排水"); + LjLogControl.ManualLogControl("冷水称A开始向糊化锅1排水"); LogSelect(""); break; case 2: @@ -573,7 +575,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.28.4", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称A开始向糊化锅2排水"); AdddWaterLogControl(2, 2); - LjManualLog.ManualLogControl("冷水称A开始向糊化锅2排水"); + LjLogControl.ManualLogControl("冷水称A开始向糊化锅2排水"); LogSelect(""); break; case 3: @@ -588,7 +590,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.28.4", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称A开始向糊化锅3排水"); AdddWaterLogControl(3, 2); - LjManualLog.ManualLogControl("冷水称A开始向糊化锅3排水"); + LjLogControl.ManualLogControl("冷水称A开始向糊化锅3排水"); LogSelect(""); break; case 4: @@ -603,7 +605,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.28.4", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称A开始向糊化锅4排水"); AdddWaterLogControl(4, 2); - LjManualLog.ManualLogControl("冷水称A开始向糊化锅4排水"); + LjLogControl.ManualLogControl("冷水称A开始向糊化锅4排水"); LogSelect(""); break; default: @@ -640,7 +642,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.8.4", true); MesnacServiceManager.Instance.LoggingService.Info("热水称A开始向糊化锅1排水"); AdddWaterLogControl(1, 1); - LjManualLog.ManualLogControl("热水称A开始向糊化锅1排水"); + LjLogControl.ManualLogControl("热水称A开始向糊化锅1排水"); LogSelect(""); break; case 2: @@ -655,7 +657,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.8.4", true); MesnacServiceManager.Instance.LoggingService.Info("热水称A开始向糊化锅2排水"); AdddWaterLogControl(2, 1); - LjManualLog.ManualLogControl("热水称A开始向糊化锅2排水"); + LjLogControl.ManualLogControl("热水称A开始向糊化锅2排水"); LogSelect(""); break; case 3: @@ -670,7 +672,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.8.4", true); MesnacServiceManager.Instance.LoggingService.Info("热水称A开始向糊化锅3排水"); AdddWaterLogControl(3, 1); - LjManualLog.ManualLogControl("热水称A开始向糊化锅3排水"); + LjLogControl.ManualLogControl("热水称A开始向糊化锅3排水"); LogSelect(""); break; case 4: @@ -685,7 +687,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.8.4", true); MesnacServiceManager.Instance.LoggingService.Info("热水称A开始向糊化锅4排水"); AdddWaterLogControl(4, 1); - LjManualLog.ManualLogControl("热水称A开始向糊化锅4排水"); + LjLogControl.ManualLogControl("热水称A开始向糊化锅4排水"); LogSelect(""); break; default: @@ -722,7 +724,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.38.4", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称B开始向糊化锅5排水"); AdddWaterLogControl(5, 2); - LjManualLog.ManualLogControl("冷水称B开始向糊化锅5排水"); + LjLogControl.ManualLogControl("冷水称B开始向糊化锅5排水"); LogSelect(""); break; case 6: @@ -737,7 +739,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.38.4", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称B开始向糊化锅6排水"); AdddWaterLogControl(6, 2); - LjManualLog.ManualLogControl("冷水称B开始向糊化锅6排水"); + LjLogControl.ManualLogControl("冷水称B开始向糊化锅6排水"); LogSelect(""); break; case 7: @@ -752,7 +754,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.38.4", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称B开始向糊化锅7排水"); AdddWaterLogControl(7, 2); - LjManualLog.ManualLogControl("冷水称B开始向糊化锅7排水"); + LjLogControl.ManualLogControl("冷水称B开始向糊化锅7排水"); LogSelect(""); break; case 8: @@ -767,7 +769,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.38.4", true); MesnacServiceManager.Instance.LoggingService.Info("冷水称B开始向糊化锅8排水"); AdddWaterLogControl(8, 2); - LjManualLog.ManualLogControl("冷水称B开始向糊化锅8排水"); + LjLogControl.ManualLogControl("冷水称B开始向糊化锅8排水"); LogSelect(""); break; default: @@ -804,7 +806,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.18.4", true); MesnacServiceManager.Instance.LoggingService.Info("热水称B开始向糊化锅5排水"); AdddWaterLogControl(5, 1); - LjManualLog.ManualLogControl("热水称B开始向糊化锅5排水"); + LjLogControl.ManualLogControl("热水称B开始向糊化锅5排水"); LogSelect(""); break; case 6: @@ -819,7 +821,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.18.4", true); MesnacServiceManager.Instance.LoggingService.Info("热水称B开始向糊化锅6排水"); AdddWaterLogControl(6, 1); - LjManualLog.ManualLogControl("热水称B开始向糊化锅6排水"); + LjLogControl.ManualLogControl("热水称B开始向糊化锅6排水"); LogSelect(""); break; case 7: @@ -834,7 +836,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.18.4", true); MesnacServiceManager.Instance.LoggingService.Info("热水称B开始向糊化锅7排水"); AdddWaterLogControl(7, 1); - LjManualLog.ManualLogControl("热水称B开始向糊化锅7排水"); + LjLogControl.ManualLogControl("热水称B开始向糊化锅7排水"); LogSelect(""); break; case 8: @@ -849,7 +851,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.18.4", true); MesnacServiceManager.Instance.LoggingService.Info("热水称B开始向糊化锅8排水"); AdddWaterLogControl(8, 1); - LjManualLog.ManualLogControl("热水称B开始向糊化锅8排水"); + LjLogControl.ManualLogControl("热水称B开始向糊化锅8排水"); LogSelect(""); break; default: @@ -1033,7 +1035,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl case 1: if (valueSet > 350) { - var record = FreeSqlUnit.Instance.Select() + var record = FreeSqlUnit.Instance.Select() .Where(x => x.valuekind == 3 && x.devicekind == 2 && x.deviceno == 1 && x.value > 350).ToList().LastOrDefault(); if (record == null) { goto next1; } if ((DateTime.Now - record.logtime).Value.TotalMinutes < 15) @@ -1055,13 +1057,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.58.0", 1); PlcControl("DB2119.60.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋1启动向湿混机1 " + valueSet); - LjManualLog.ManualLogControl("螺旋1启动向湿混机1", valueSet, 3, 1, 2); + LjLogControl.ManualLogControl("螺旋1启动向湿混机1", valueSet, 3, 1, 2); LogSelect(""); break; case 2: if (valueSet > 350) { - var record = FreeSqlUnit.Instance.Select() + var record = FreeSqlUnit.Instance.Select() .Where(x => x.valuekind == 3 && x.devicekind == 2 && x.deviceno == 2 && x.value > 350).ToList().LastOrDefault(); if (record == null) { goto next2; } if ((DateTime.Now - record.logtime).Value.TotalMinutes < 15) @@ -1083,7 +1085,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.58.0", 2); PlcControl("DB2119.60.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋1启动向湿混机2 " + valueSet); - LjManualLog.ManualLogControl("螺旋1启动向湿混机2", valueSet, 3, 2, 2); + LjLogControl.ManualLogControl("螺旋1启动向湿混机2", valueSet, 3, 2, 2); LogSelect(""); break; default: @@ -1135,7 +1137,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl case 3: if (valueSet > 350) { - var record = FreeSqlUnit.Instance.Select() + var record = FreeSqlUnit.Instance.Select() .Where(x => x.valuekind == 3 && x.devicekind == 2 && x.deviceno == 3 && x.value > 350).ToList().LastOrDefault(); if (record == null) { goto next3; } if ((DateTime.Now - record.logtime).Value.TotalMinutes < 15) @@ -1157,13 +1159,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.80.0", 1); PlcControl("DB2119.82.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋2启动向湿混机3 " + valueSet); - LjManualLog.ManualLogControl("螺旋2启动向湿混机3", valueSet, 3, 3, 2); + LjLogControl.ManualLogControl("螺旋2启动向湿混机3", valueSet, 3, 3, 2); LogSelect(""); break; case 4: if (valueSet > 350) { - var record = FreeSqlUnit.Instance.Select() + var record = FreeSqlUnit.Instance.Select() .Where(x => x.valuekind == 3 && x.devicekind == 2 && x.deviceno == 4 && x.value > 350).ToList().LastOrDefault(); if (record == null) { goto next4; } if ((DateTime.Now - record.logtime).Value.TotalMinutes < 15) @@ -1185,7 +1187,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.80.0", 2); PlcControl("DB2119.82.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋2启动向湿混机4 " + valueSet); - LjManualLog.ManualLogControl("螺旋2启动向湿混机4", valueSet, 3, 4, 2); + LjLogControl.ManualLogControl("螺旋2启动向湿混机4", valueSet, 3, 4, 2); LogSelect(""); break; default: @@ -1237,7 +1239,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl case 5: if (valueSet > 350) { - var record = FreeSqlUnit.Instance.Select() + var record = FreeSqlUnit.Instance.Select() .Where(x => x.valuekind == 3 && x.devicekind == 2 && x.deviceno == 5 && x.value > 350).ToList().LastOrDefault(); if (record == null) { goto next5; } if ((DateTime.Now - record.logtime).Value.TotalMinutes < 15) @@ -1259,13 +1261,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.102.0", 1); PlcControl("DB2119.104.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋3启动向湿混机5 " + valueSet); - LjManualLog.ManualLogControl("螺旋3启动向湿混机5", valueSet, 3, 5, 2); + LjLogControl.ManualLogControl("螺旋3启动向湿混机5", valueSet, 3, 5, 2); LogSelect(""); break; case 6: if (valueSet > 350) { - var record = FreeSqlUnit.Instance.Select() + var record = FreeSqlUnit.Instance.Select() .Where(x => x.valuekind == 3 && x.devicekind == 2 && x.deviceno == 6 && x.value > 350).ToList().LastOrDefault(); if (record == null) { goto next6; } if ((DateTime.Now - record.logtime).Value.TotalMinutes < 15) @@ -1287,7 +1289,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl PlcControl("DB2119.102.0", 2); PlcControl("DB2119.104.0", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋3启动向湿混机6 " + valueSet); - LjManualLog.ManualLogControl("螺旋3启动向湿混机6", valueSet, 3, 6, 2); + LjLogControl.ManualLogControl("螺旋3启动向湿混机6", valueSet, 3, 6, 2); LogSelect(""); break; default: @@ -1355,7 +1357,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.60.1", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋1已手动停止"); - LjManualLog.ManualLogControl("螺旋1已手动停止"); + LjLogControl.ManualLogControl("螺旋1已手动停止"); LogSelect(""); MessageBox.Show("螺旋1已停止！"); } @@ -1364,7 +1366,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.82.1", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋2已手动停止"); - LjManualLog.ManualLogControl("螺旋2已手动停止"); + LjLogControl.ManualLogControl("螺旋2已手动停止"); LogSelect(""); MessageBox.Show("螺旋2已停止！"); } @@ -1373,7 +1375,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { PlcControl("DB2119.104.1", true); MesnacServiceManager.Instance.LoggingService.Info("螺旋3已手动停止"); - LjManualLog.ManualLogControl("螺旋3已手动停止"); + LjLogControl.ManualLogControl("螺旋3已手动停止"); LogSelect(""); MessageBox.Show("螺旋3已停止！"); } @@ -1459,7 +1461,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl //Setting.Default.SetSpiralValue3 = value7; //Setting.Default.SetSpiralValue4 = value8; MesnacServiceManager.Instance.LoggingService.Info("配置已保存"); - LjManualLog.ManualLogControl("配置已保存 " + value1 + value2 + value3 + value4 + value5 + value6 + value7 + value8); + LjLogControl.ManualLogControl("配置已保存 " + value1 + value2 + value3 + value4 + value5 + value6 + value7 + value8); LogSelect(""); } } @@ -1482,7 +1484,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl SetSpiralValue3.MCValue = table.Where(x => x.SettingName == "SpiralValue3").LastOrDefault().Value; SetSpiralValue4.MCValue = table.Where(x => x.SettingName == "SpiralValue4").LastOrDefault().Value; MesnacServiceManager.Instance.LoggingService.Info("配置已加载"); - LjManualLog.ManualLogControl("配置已加载 "); + LjLogControl.ManualLogControl("配置已加载 "); LogSelect(""); } @@ -1578,7 +1580,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } MessageBox.Show(txt); - LjManualLog.ManualLogControl(txt); + LjLogControl.ManualLogControl(txt); LogSelect(""); MesnacServiceManager.Instance.LoggingService.Info(txt); } @@ -1600,15 +1602,15 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl Thread.Sleep(100); if (PlcConnect.Instance.Write(address, binNo).IsSuccess) { - LjManualLog.ManualLogControl("第 " + (i + 1) + " 次重发测试成功"); + LjLogControl.ManualLogControl("第 " + (i + 1) + " 次重发测试成功"); LogSelect(""); return; } - LjManualLog.ManualLogControl("第 " + (i + 1) + " 次重发测试失败"); + LjLogControl.ManualLogControl("第 " + (i + 1) + " 次重发测试失败"); LogSelect(""); } MessageBox.Show(address + "写入失败！"); - LjManualLog.ManualLogControl("PLC写入失败！"); + LjLogControl.ManualLogControl("PLC写入失败！"); LogSelect(""); } } @@ -1625,15 +1627,15 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl Thread.Sleep(100); if (PlcConnect.Instance.Write(address, state).IsSuccess) { - LjManualLog.ManualLogControl("第 " + (i + 1) + " 次重发测试成功"); + LjLogControl.ManualLogControl("第 " + (i + 1) + " 次重发测试成功"); LogSelect(""); return; } - LjManualLog.ManualLogControl("第 " + (i + 1) + " 次重发测试失败"); + LjLogControl.ManualLogControl("第 " + (i + 1) + " 次重发测试失败"); LogSelect(""); } MessageBox.Show(address + "写入失败！"); - LjManualLog.ManualLogControl("PLC写入失败！"); + LjLogControl.ManualLogControl("PLC写入失败！"); LogSelect(""); } } @@ -1661,12 +1663,10 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl /// 查询关键字 private void LogSelect(string txt) { - DataTable table = LjManualLog.ManualLogSelect(txt); - if (this.materialGridControl != null && this.materialGridControl.BaseControl != null) { this.materialGridControl.BaseControl.BindDataSource = null; - this.materialGridControl.BaseControl.BindDataSource = table; + this.materialGridControl.BaseControl.BindDataSource = LjLogControl.ManualLogSelect(txt); } else { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index e21bb17..1900e8a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -555,8 +555,8 @@ - - + + True @@ -624,6 +624,7 @@ + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/Entity/ManualLogEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/Entity/LjLogEntity.cs similarity index 95% rename from Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/Entity/ManualLogEntity.cs rename to Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/Entity/LjLogEntity.cs index 048ab27..6c67e4f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/Entity/ManualLogEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/Entity/LjLogEntity.cs @@ -15,11 +15,11 @@ using System.Reflection; using System.Threading.Tasks; using FreeSql.DataAnnotations; -namespace Mesnac.Action.ChemicalWeighing.ManualControl +namespace Mesnac.Action.ChemicalWeighing.Report.Entity { [Table(Name = "Manual_Log")] - public partial class ManualLogEntity + public partial class LjLogEntity { [Column(IsPrimary = true, IsIdentity = true)] diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/LjManualLog.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogControl.cs similarity index 65% rename from Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/LjManualLog.cs rename to Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogControl.cs index 30b30dc..03035f5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/LjManualLog.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogControl.cs @@ -1,5 +1,6 @@ using Mesnac.Action.ChemicalWeighing.FreeDb; using Mesnac.Action.ChemicalWeighing.LjMaterial; +using Mesnac.Action.ChemicalWeighing.Report.Entity; using Mesnac.Basic; using System; using System.Collections.Generic; @@ -8,27 +9,66 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Mesnac.Action.ChemicalWeighing.ManualControl +namespace Mesnac.Action.ChemicalWeighing.Report { - public class LjManualLog + /// + /// 配料日志 + /// + public class LjLogControl { /// - /// 日志查询 内容 时间 值 + /// 通过内容查询日志 /// /// 查询关键字 public static DataTable ManualLogSelect(string txt) { - string sql = "select top 500 id, logtext, logtime, value from Manual_Log "; - + string sql; if (!string.IsNullOrEmpty(txt)) { - sql += $" where logtext like '%{txt}%'"; + sql = BaseSelect($"where logtext like '%{txt}%'"); + } + else + { + sql = BaseSelect(""); + } + return DBHelp.GetTable(sql); + } + + /// + /// 通过内容和机台号查询日志 + /// + /// 查询关键字 + public static DataTable ManualLogSelect(string txt, int deviceNo) + { + string sql; + if (deviceNo == 0) + { + return ManualLogSelect(txt); + } + else + { + sql = BaseSelect($"where deviceNo = {deviceNo} and logtext like '%{txt}%'"); + return DBHelp.GetTable(sql); } - sql += " order by id desc"; + } + /// + /// 通过时间查询日志 + /// + /// 查询关键字 + public static DataTable ManualLogSelect(string startTime, string endTime) + { + string sql = BaseSelect($"where logtime BETWEEN '{startTime}' AND '{endTime}'"); return DBHelp.GetTable(sql); } + private static string BaseSelect(string sql) + { + string s = "select top 500 id, logtext, logtime, value from Manual_Log " + sql + + " order by id desc"; + return s; + } + /// /// 完整手动日志插入 /// @@ -36,10 +76,10 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl /// 值 /// 值类型 0无 1水称设定值 2水称称量值 3螺旋设定值 4螺旋称量值 /// 设备编号 - /// 设备类型 0无 1水称 2螺旋 + /// 设备类型 0无 1水称 2螺旋 3糊化 public static void ManualLogControl(string logName, int value, int valuekind, int deviceno, int devicekind) { - var Log = new ManualLogEntity() + var Log = new LjLogEntity() { logtext = logName, logtime = DateTime.Now, @@ -62,7 +102,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl /// 设备类型 public static void ManualLogControl(string logName, int deviceno, int devicekind) { - var Log = new ManualLogEntity() + var Log = new LjLogEntity() { logtext = logName, logtime = DateTime.Now, @@ -83,7 +123,7 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl /// public static void ManualLogControl(string logName) { - var Log = new ManualLogEntity() + var Log = new LjLogEntity() { logtext = logName, logtime = DateTime.Now, diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs new file mode 100644 index 0000000..e66a83e --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs @@ -0,0 +1,145 @@ +using DevExpress.XtraExport.Helpers; +using DevExpress.XtraRichEdit.Model; +using Mesnac.Action.Base; +using Mesnac.Controls.Default; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Runtime.InteropServices.ComTypes; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.Report +{ + public class LjLogReport : ChemicalWeighingAction, IAction + { + MCButton SelectButton; + MCButton WaterSet; + MCButton SpiralSet; + MCButton ManualControl; + MCButton Refresh; + MCButton SelectByText; + + MCTextBox SelectText; + + MCDateTimePicker StartDate; + MCDateTimePicker EndDate; + + MCDataGridView LogForm; + + MCCombobox Line; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); + + var control = GetAllControls(); + + SelectButton = control.FirstOrDefault(x => x != null && x.Name == "SelectButton") as MCButton; + WaterSet = control.FirstOrDefault(x => x != null && x.Name == "WaterSet") as MCButton; + SpiralSet = control.FirstOrDefault(x => x != null && x.Name == "SpiralSet") as MCButton; + 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; + StartDate = control.FirstOrDefault(x => x != null && x.Name == "StartDate") as MCDateTimePicker; + EndDate = control.FirstOrDefault(x => x != null && x.Name == "EndDate") as MCDateTimePicker; + LogForm = control.FirstOrDefault(x => x != null && x.Name == "LogForm") as MCDataGridView; + SelectText = control.FirstOrDefault(x => x != null && x.Name == "SelectText") as MCTextBox; + Line = control.FirstOrDefault(x => x != null && x.Name == "Line") as MCCombobox; + + if (LogForm != null) + { + LogForm.DataSource = null; + LogForm.DataSource = LjLogControl.ManualLogSelect(""); + } + + DataTable dataTable = new DataTable(); + dataTable.Columns.Add("CmbValue", typeof(string)); + dataTable.Columns.Add("CmbDisplay", typeof(string)); + DataRow dr = dataTable.NewRow(); + dr[0] = "0"; + dr[1] = "全部机台"; + dataTable.Rows.Add(dr); + for (int i = 1; i <= 8; i++) + { + dr = dataTable.NewRow(); + dr[0] = i.ToString(); + dr[1] = i + "号机台"; + dataTable.Rows.Add(dr); + } + Line.DataSource = dataTable; + + SetForm(""); + + SelectButton.Click += SelectByTime; + WaterSet.Click += WaterSetSelect; + SpiralSet.Click += SpiralSetSelect; + ManualControl.Click += ManualControlSelect; + Refresh.Click += RefreshAction; + SelectByText.Click += SelectByTextAction; + } + + 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()); + } + + private void SetForm(string key) + { + if (LogForm != null) + { + LogForm.DataSource = null; + LogForm.DataSource = LjLogControl.ManualLogSelect(key); + + } + } + + private void SetForm(string key, int deviceNo) + { + if (LogForm != null) + { + LogForm.DataSource = null; + LogForm.DataSource = LjLogControl.ManualLogSelect(key, deviceNo); + + } + } + + private void SetForm(string startTime, string endTime) + { + if (LogForm != null) + { + LogForm.DataSource = null; + LogForm.DataSource = LjLogControl.ManualLogSelect(startTime, endTime); + + } + } + + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportHelper.cs index c428e9d..65dc95b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportHelper.cs @@ -267,7 +267,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report /// 保存扫码记录信息 /// /// 保存扫码记录信息 - public static void InsertLR_BarcodeLog(Entity.LR_BarcodeLog lR_BarcodeLog) + public static void InsertLR_BarcodeLog(LR_BarcodeLog lR_BarcodeLog) { DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); if (dbHelper == null) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs index ffbb5ed..2277add 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs @@ -30,62 +30,33 @@ namespace Mesnac.Action.ChemicalWeighing.Report public class ReportReadDb { - /// /// 干混料插入日志 /// public static void ReadFeededDry() { - LoggingService.Debug("读取加料信息"+DateTime.Now.ToString()); + LoggingService.Debug("读取加料信息" + DateTime.Now.ToString()); DB2105Helper dB2105Helper = new DB2105Helper(); - List list=dB2105Helper.FeededDryList(); + List list = dB2105Helper.FeededDryList(); for (int i = 0; i < list.Count; i++) { if (list[i]) { - var feedValue= new DB2107Helper().Weter[i].FeedValue.ToString("0.#"); - LoggingService.Debug($"{i+1}:{feedValue}"); + var feedValue = new DB2107Helper().Weter[i].FeedValue.ToString("0.#"); + LoggingService.Debug($"{i + 1}:{feedValue}"); var deviceno = (i + 3) / 2; // 螺旋1启动向湿混机1 - string logName = $"螺旋{deviceno}启动向湿混机{i + 1}"; + string logName = $"螺旋{deviceno}向湿混机实际{i + 1}"; LoggingService.Info(logName); var value = Convert.ToInt32(Convert.ToDouble(feedValue)); - ManualLogControl(logName, value, 5, i + 1); + LjLogControl.ManualLogControl(logName, value, 4, i + 1, 2); DB2105WriteHelper.WriteFalseFeededDry(i + 1); } } } - /// - /// 日志插入 - /// - /// 日志内容 - /// 值 - /// 值类型 0无 1水称设定值 2水称称量值 3螺旋设定值 4螺旋称量值 - /// 设备编号 - /// 设备类型 0无 1水称 2螺旋 - private static void ManualLogControl(string logName, int value, int valuekind, int deviceno) - { - var Log = new ManualLogEntity() - { - logtext = logName, - logtime = DateTime.Now, - userid = string.IsNullOrWhiteSpace(UserInfo.Instance.UserName) ? "Edit" : UserInfo.Instance.UserName, - value = value, - deviceno = deviceno, - devicekind = 2, - valuekind = valuekind, - createdate = DateTime.Now.ToString("yyyyMMdd") - }; - - FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); - - - } - - - public static void Read() + public static void ReadReport() { LoggingService.InfoFormatted("开始读取报表"); DB2107Helper dB2107Helper = new DB2107Helper(); @@ -117,8 +88,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report PlcConnect.Instance.Write("DB2107.6.1", false); } - //InsertG - if (normal.RdyRpt_G1) { LoggingService.InfoFormatted("糊化机1读取报表"); @@ -153,7 +122,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report PlcConnect.Instance.Write("DB2107.6.6", false); } - if (normal.RdyRpt_G6) { LoggingService.InfoFormatted("糊化机6读取报表"); @@ -210,7 +178,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report PlcConnect.Instance.Write("DB2107.7.6", false); } - if (normal.RdyRpt_M6) { LoggingService.InfoFormatted("湿混机6读取报表"); @@ -261,7 +228,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report dry.reportId = Guid.NewGuid().ToString("N"); dry.recipeCode = 0; dry.recipeName = ""; - dry.planCode = 0; dry.planName = ""; dry.recordTime = DateTime.Now; @@ -283,7 +249,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report actToler = item.ActToler, actValue = item.ActValue, recordTime = DateTime.Now - }); } else @@ -334,8 +299,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report case 4: gel = dB2106.GelReport.Gel_D; break; - - case 5: gel = dB2106.GelReport.Gel_E; break; @@ -354,14 +317,12 @@ namespace Mesnac.Action.ChemicalWeighing.Report gelDb.reportId = Guid.NewGuid().ToString("N"); gelDb.recipeCode = 0; gelDb.recipeName = ""; - gelDb.planCode = 0; gelDb.planName = ""; gelDb.recordTime = DateTime.Now; gelDb.gelNo = no; gelDb.Batch = 0; - List lsdetail = new List(); List lsMixing = new List(); @@ -381,7 +342,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report actValue = dos.ActValue, reportId = gelDb.reportId, recordTime = DateTime.Now, - kinds = 1 }); } @@ -391,7 +351,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report } } - var mixList = gel.GelMixing; foreach (var mix in mixList) { @@ -404,20 +363,14 @@ namespace Mesnac.Action.ChemicalWeighing.Report mixStep = mix.MixStep, actCode = mix.ActCode, mixTime = mix.MixTime, - mixSpeed = mix.MixSpeed, - mixTemp = mix.MixTemp, - reportId = gelDb.reportId, recordTime = DateTime.Now, - - }); } } - var hotWater = gel.HotWater; if (hotWater != null) { @@ -432,7 +385,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report actValue = hotWater.ActValue, reportId = gelDb.reportId, recordTime = DateTime.Now, - kinds = 2 }); } @@ -451,7 +403,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report actValue = coolWater.ActValue, reportId = gelDb.reportId, recordTime = DateTime.Now, - kinds = 3 }); } @@ -482,8 +433,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report case 4: ls = dB2106.WetReport.WetMixing_D; break; - - case 5: ls = dB2106.WetReport.WetMixing_E; break; @@ -498,13 +447,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report break; } - Report_WetMixer report = new Report_WetMixer(); report.reportId = Guid.NewGuid().ToString("N"); report.recipeCode = 0; report.recipeName = ""; - report.planCode = 0; report.planName = ""; report.recordTime = DateTime.Now; @@ -529,17 +476,13 @@ namespace Mesnac.Action.ChemicalWeighing.Report mixTime = item.MixTime, actTolerence = item.ActTolerence, actWeight = item.ActWeight, - }); } else { break; } - } - - FreeSqlUnit.Instance.Insert(report).ExecuteAffrows(); FreeSqlUnit.Instance.Insert(lde).ExecuteAffrows(); } diff --git a/DataBlockHelper/DBHelpers/DB2105Helper.cs b/DataBlockHelper/DBHelpers/DB2105Helper.cs index fe21e55..2254608 100644 --- a/DataBlockHelper/DBHelpers/DB2105Helper.cs +++ b/DataBlockHelper/DBHelpers/DB2105Helper.cs @@ -158,7 +158,7 @@ namespace DataBlockHelper.DBHelpers { List ls = new List(8); - for (int i = 110; i <=124; i=i+2) + for (int i = 110; i <= 124; i = i + 2) { ls.Add(ReadReady(i, 4)); } @@ -190,7 +190,7 @@ namespace DataBlockHelper.DBHelpers - public bool ReadReady(int start,int bit) + public bool ReadReady(int start, int bit) { var first = bytes.Skip(start).Take(1).First(); return first.GetBit(bit); @@ -215,7 +215,7 @@ namespace DataBlockHelper.DBHelpers - + diff --git a/DataBlockHelper/Entity/DB2104Entity/WaterView.cs b/DataBlockHelper/Entity/DB2104Entity/WaterView.cs index bab37b4..6c1cb07 100644 --- a/DataBlockHelper/Entity/DB2104Entity/WaterView.cs +++ b/DataBlockHelper/Entity/DB2104Entity/WaterView.cs @@ -5,9 +5,7 @@ public short Bin { get; set; } public float Set { get; set; } public float Tolerance { get; set; } - public float differ { get; set; } - public short stand { get; set; } } } \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.xml index 0ab8c59..f3b6f4b 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.xml @@ -14,6 +14,10 @@ 湿混机时间统计 湿混机时间统计 + + 日志报表控制 + 日志报表控制 + @@ -28,6 +32,9 @@ + + + @@ -35,6 +42,7 @@ + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index 9e44a67..6bc5edc 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -33,6 +33,7 @@ + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml b/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml index 5304f97..d98d962 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml @@ -25,6 +25,7 @@ None True True + False False 348, 12 MoreData diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml new file mode 100644 index 0000000..7029c8b --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml @@ -0,0 +1,332 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAGoAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANBQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAAHbG9ndGV4dAYIAAAADOaXpeW/l+WGheWuuQEFAAAABAAAAAYJAAAABXZhbHVlBgoAAAAD5YC8AQYAAAAEAAAABgsAAAAHbG9ndGltZQYMAAAADOaXpeW/l+aXpeacnws= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAHAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + [DataSource1].[ManualLogGridView] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + 310, 12 + LogForm + 533, 826 + 13 + + + + + True + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL + + None + True + True + 6, 20 + Line + 110, 20 + 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 螺旋查询 + 宋体, 12pt + 6, 99 + SpiralSet + 110, 47 + 12 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 水称查询 + 宋体, 12pt + 6, 46 + WaterSet + 110, 47 + 4 + + False + 查询细分 + 25, 176 + GroupBox2147483645 + 122, 153 + 21 + + + + + + + False + + + + None + True + True + MiddleCenter + 224, 224, 224 + 25, 162 + SpecialLabelBlue1 + 244, 1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 手动操作查询 + 宋体, 12pt + 153, 180 + ManualControl + 116, 47 + 14 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + 0 + 0 + True + keywords + + False + + + + Modify + True + True + + 25, 112 + SelectText + 110, 21 + 16 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + WetRequest1 + + False + + + + Query + True + True + False + + + Red + DarkGray + 日志查询 + 宋体, 12pt + 153, 97 + SelectByText + 116, 47 + 15 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 刷新 + 宋体, 20pt + 153, 233 + Refresh + 116, 96 + 13 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Short + 25, 58 + EndDate + 110, 21 + 10 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Short + 25, 31 + StartDate + 110, 21 + 9 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 范围查询 + 宋体, 12pt + 153, 31 + SelectButton + 116, 48 + 8 + + False + 统计分类查询 + 12, 12 + + + 292, 350 + 11 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIENGNEVFMDYwRUQwNzRFNjVCQTdGOTk3QTg0QjZDNkVCBgYAAAAS5pel5b+X5oql6KGo5o6n5Yi2BgcAAAAS5pel5b+X5oql6KGo5o6n5Yi2Cw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 871, 889 + WindowsDefaultLocation + 榄菊生产日志 + Normal + + Tile + 宋体, 9pt + ControlText + LjLogForm + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/WeterTimeCount.xml b/Main/MCEdit/Data/MCProject/nodeForm/WeterTimeCount.xml index a89e443..15eb5e6 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/WeterTimeCount.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/WeterTimeCount.xml @@ -25,6 +25,7 @@ None True True + False False 348, 12 MoreData