From a1c25d64b28fcba99d6df7c4143c2b17d3783de6 Mon Sep 17 00:00:00 2001 From: wangsr Date: Fri, 15 Dec 2023 13:26:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?change=20-=20=E6=9B=B4=E6=94=B9MCRun?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Main/MCRun/Data/SysConfig/MenuConfig.dat | Bin 21622 -> 20814 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Main/MCRun/Data/SysConfig/MenuConfig.dat b/Main/MCRun/Data/SysConfig/MenuConfig.dat index d5bd986206624439a3e2837586f2126bba9dac0e..d06053f78950923db23948329bd87079f2826f6e 100644 GIT binary patch literal 20814 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 AB>(^b literal 21622 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 rsAIz6QB#{`8nnI^#9!^3S8;5z;RO0dLH From 435d1ea98a388622e9705eba90cbdf8ae1f87aa9 Mon Sep 17 00:00:00 2001 From: wangsr Date: Fri, 15 Dec 2023 14:11:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?debug=20-=20=E6=97=A5=E5=BF=97=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs index baba701..8afdfbf 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs @@ -289,7 +289,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl if (b) { int i = ControlsHelper.SingleSelect(RadioE); - LjLogControl.ManualLogControl("手动下黑粉料向" + i, 3, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), i, 2); + LjLogControl.ManualLogControl("手动下黑粉料向" + i, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), 3, i, 2); MessageBox.Show("数据下传成功！"); } From 5dba184ec8cf7e9917007f17611c9231a08abaf8 Mon Sep 17 00:00:00 2001 From: wangsr Date: Fri, 15 Dec 2023 14:30:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?add=20-=20=E6=B9=BF=E6=B7=B7=E6=9C=BA?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E6=97=B6=E9=97=B4=E7=BB=9F=E8=AE=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E5=80=BC=E6=BA=A2=E5=87=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8D=95=E6=8D=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LjReport/WetWaitTime/ExportToPc.cs | 33 ++++++++++++------- .../LjReport/WetWaitTime/WetTimeCounting.cs | 32 +++++++++++------- .../MCProject/nodeForm/WeterTimeCount.xml | 3 +- 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/ExportToPc.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/ExportToPc.cs index ec15a59..0bc0ee5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/ExportToPc.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/ExportToPc.cs @@ -149,18 +149,27 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.WetWaitTime dt.Rows.Add(dr); } - var edr = dt.NewRow(); - edr[0] = "湿混等待时间总和"; - edr[1] = TimeConvert(list.Sum(x => x.MixWaitTime)); - dt.Rows.Add(edr); - var edr1 = dt.NewRow(); - edr1[0] = "RGV等待时间总和"; - edr1[1] = TimeConvert(list.Sum(x => x.RgvWaitTime)); - dt.Rows.Add(edr1); - var edr2 = dt.NewRow(); - edr2[0] = "总等待时间总和"; - edr2[1] = TimeConvert(list.Sum(x => x.MixWaitTime + x.RgvWaitTime)); - dt.Rows.Add(edr2); + + try + { + var edr = dt.NewRow(); + edr[0] = "湿混等待时间总和"; + edr[1] = TimeConvert(list.Sum(x => x.MixWaitTime)); + dt.Rows.Add(edr); + var edr1 = dt.NewRow(); + edr1[0] = "RGV等待时间总和"; + edr1[1] = TimeConvert(list.Sum(x => x.RgvWaitTime)); + dt.Rows.Add(edr1); + var edr2 = dt.NewRow(); + edr2[0] = "总等待时间总和"; + edr2[1] = TimeConvert(list.Sum(x => x.MixWaitTime + x.RgvWaitTime)); + dt.Rows.Add(edr2); + } + catch (OverflowException ex) + { + MessageBox.Show("算术值溢出！请检查数据是否有误"); + } + } /// diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/WetTimeCounting.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/WetTimeCounting.cs index cc33ec4..21ac4a0 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/WetTimeCounting.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/WetTimeCounting.cs @@ -10,6 +10,7 @@ using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Forms; namespace Mesnac.Action.ChemicalWeighing.LjReport.WetWaitTime { @@ -225,18 +226,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.WetWaitTime dt.Rows.Add(dr); } - var edr = dt.NewRow(); - edr[0] = "湿混等待时间总和"; - edr[1] = TimeConvert(list.Sum(x => x.MixWaitTime)); - dt.Rows.Add(edr); - var edr1 = dt.NewRow(); - edr1[0] = "RGV等待时间总和"; - edr1[1] = TimeConvert(list.Sum(x => x.RgvWaitTime)); - dt.Rows.Add(edr1); - var edr2 = dt.NewRow(); - edr2[0] = "总等待时间总和"; - edr2[1] = TimeConvert(list.Sum(x => x.MixWaitTime + x.RgvWaitTime)); - dt.Rows.Add(edr2); + try + { + var edr = dt.NewRow(); + edr[0] = "湿混等待时间总和"; + edr[1] = TimeConvert(list.Sum(x => x.MixWaitTime)); + dt.Rows.Add(edr); + var edr1 = dt.NewRow(); + edr1[0] = "RGV等待时间总和"; + edr1[1] = TimeConvert(list.Sum(x => x.RgvWaitTime)); + dt.Rows.Add(edr1); + var edr2 = dt.NewRow(); + edr2[0] = "总等待时间总和"; + edr2[1] = TimeConvert(list.Sum(x => x.MixWaitTime + x.RgvWaitTime)); + dt.Rows.Add(edr2); + } + catch (OverflowException ex) + { + MessageBox.Show("算术值溢出！请检查数据是否有误"); + } } private string TimeConvert(int t) diff --git a/Main/MCEdit/Data/MCProject/nodeForm/WeterTimeCount.xml b/Main/MCEdit/Data/MCProject/nodeForm/WeterTimeCount.xml index 15eb5e6..402bf55 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/WeterTimeCount.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/WeterTimeCount.xml @@ -25,12 +25,11 @@ None True True - False False 348, 12 MoreData 530, 622 - 7 + 9 From ad2b494b103f61238d4dd16019189d7d137eca10 Mon Sep 17 00:00:00 2001 From: wangsr Date: Fri, 15 Dec 2023 15:54:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?add=20-=20=E6=B7=BB=E5=8A=A0=E5=88=87?= =?UTF-8?q?=E5=89=B2=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD=20=E6=8C=89?= =?UTF-8?q?=E5=B9=B4=E5=88=86=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LjMaterial/DBHelp.cs | 15 +++-- .../Report/LjLogControl.cs | 15 +++++ .../Report/LjLogReport.cs | 63 +++--------------- .../Data/MCProject/nodeForm/LjLogForm.xml | 65 +++++++++++++++++++ 4 files changed, 98 insertions(+), 60 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/DBHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/DBHelp.cs index 5450c51..1342e8a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/DBHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/DBHelp.cs @@ -13,7 +13,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial { return new Dictionary(); } - + public static DataTable GetTable(string sql) { DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); @@ -59,7 +59,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial dbHelper.CommandText = insertUserSql; foreach (var keyValuePair in dic) { - dbHelper.AddParameter(keyValuePair.Key,keyValuePair.Value); + dbHelper.AddParameter(keyValuePair.Key, keyValuePair.Value); } DataTable table = dbHelper.ToDataTable(); return table; @@ -67,8 +67,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial public static void ExecuteNonQuery(string sql) { - ExecuteNonQuery(sql,new Dictionary()); + ExecuteNonQuery(sql, new Dictionary()); } + public static void ExecuteNonQuery(string sql, IDictionary dic) { DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); @@ -83,11 +84,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial dbHelper.CommandText = insertUserSql; foreach (var keyValuePair in dic) { - dbHelper.AddParameter(keyValuePair.Key,keyValuePair.Value); + dbHelper.AddParameter(keyValuePair.Key, keyValuePair.Value); } - + dbHelper.ExecuteNonQuery(); - } - + } + } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogControl.cs index 2bf4839..db56437 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogControl.cs @@ -62,6 +62,21 @@ namespace Mesnac.Action.ChemicalWeighing.Report return DBHelp.GetTable(sql); } + /// + /// 去年数据的转移 + /// + public static void LastYearDataCut() + { + int nowYear = DateTime.Now.Year; + string sql = $"insert into Manual_Log_{nowYear - 1} " + + $"select logtext, logtime, userid, value, valuekind, deviceno, devicekind, createdate " + + $"from Manual_Log where logtime < '{nowYear}-01-01 00:00:00'"; + DBHelp.ExecuteNonQuery(sql); + sql = $"delete from Manual_Log where logtime < '{nowYear}-01-01 00:00:00'"; + DBHelp.ExecuteNonQuery(sql); + + } + private static string BaseSelect(string sql) { string s = "select top 500 id, logtext, logtime, value, deviceno from Manual_Log " + sql + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs index da9f1a0..27169b9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs @@ -32,6 +32,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report MCButton ManualControl; MCButton Refresh; MCButton SelectByText; + MCButton LastYearDataMove; //HslSwitch HslSwitch1; //HslSwitch HslSwitch2; @@ -63,6 +64,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report ManualControl = control.FirstOrDefault(x => x != null && x.Name == "ManualControl") as MCButton; Refresh = control.FirstOrDefault(x => x != null && x.Name == "Refresh") as MCButton; SelectByText = control.FirstOrDefault(x => x != null && x.Name == "SelectByText") as MCButton; + LastYearDataMove = control.FirstOrDefault(x => x != null && x.Name == "LastYearDataMove") as MCButton; StartDate = control.FirstOrDefault(x => x != null && x.Name == "StartDate") as MCDateTimePicker; EndDate = control.FirstOrDefault(x => x != null && x.Name == "EndDate") as MCDateTimePicker; LogForm = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ManualLogGridView1").FirstOrDefault(); @@ -109,66 +111,21 @@ namespace Mesnac.Action.ChemicalWeighing.Report ManualControl.Click += ManualControlSelect; Refresh.Click += RefreshAction; SelectByText.Click += SelectByTextAction; + LastYearDataMove.Click += DataMoveAction; } /// - /// 下发送料请求按钮点击 + /// 转移去年的数据 /// /// /// - private void RequestDownloadClick(object sender, EventArgs e) + private void DataMoveAction(object sender, EventArgs e) { - bool mixok1 = PlcConnect.Instance.ReadBool("DB3000.0.0").Content; - Time(1, mixok1 ? 1 : 0); - bool mixok2 = PlcConnect.Instance.ReadBool("DB3000.0.1").Content; - Time(2, mixok2 ? 1 : 0); - bool mixok3 = PlcConnect.Instance.ReadBool("DB3000.0.2").Content; - Time(3, mixok3 ? 1 : 0); - bool mixok4 = PlcConnect.Instance.ReadBool("DB3000.0.3").Content; - Time(4, mixok4 ? 1 : 0); - bool mixok5 = PlcConnect.Instance.ReadBool("DB3000.0.4").Content; - Time(5, mixok5 ? 1 : 0); - bool mixok6 = PlcConnect.Instance.ReadBool("DB3000.0.5").Content; - Time(6, mixok6 ? 1 : 0); - bool mixok7 = PlcConnect.Instance.ReadBool("DB3000.0.6").Content; - Trace.WriteLine("7号信号:" + mixok7); - Time(7, mixok7 ? 1 : 0); - bool mixok8 = PlcConnect.Instance.ReadBool("DB3000.0.7").Content; - Trace.WriteLine("8号信号:" + mixok8); - Time(8, mixok8 ? 1 : 0); - } - - /// - /// 下发接料请求 - /// - /// - /// - private void Time(int deviceNo, int statu) - { - TankIsDischargedSyncEntity tankIsDischargedSyncEntity = new TankIsDischargedSyncEntity() - { - reqCode = System.Guid.NewGuid().ToString(), - reqTime = DateTime.Now, - deviceNo = deviceNo.ToString(), - state = statu.ToString(), - }; - //即使网络不同 也不会影响上位机的使用 - ThreadPool.QueueUserWorkItem(delegate - { - HttpResponse httpResponse = new HttpResponse(); - string returnTest = httpResponse.PostResponse(tankIsDischargedSyncEntity); - MesnacServiceManager.Instance.LoggingService.Info($"湿混机{deviceNo}返回数据" + returnTest); - }); - } - - /// - /// 消除报警按钮点击 - /// - /// - /// - private void EliAlarmsClick(object sender, EventArgs e) - { - + if (MessageBox.Show("确认要切割数据？", "三次提醒 3/1", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { return; } + if (MessageBox.Show("确认要切割数据？", "三次提醒 3/2", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { return; } + if (MessageBox.Show("确认要切割数据？", "三次提醒 3/3", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { return; } + LjLogControl.LastYearDataCut(); + MessageBox.Show("数据切割成功"); } /// diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml index adf0591..bf27a87 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml @@ -1,5 +1,70 @@ + + + + + Red + DarkGray + + + False + + + + None + True + True + 每年年初点击 + 121, 816 + MCLabel2 + 77, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 切割今年以前的日志数据,防止日志数据库过大 + 12, 792 + MCLabel1 + 251, 12 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + + Red + DarkGray + 日志数据切割 + 12, 807 + LastYearDataMove + 103, 31 + 14 + False