From 9c89674060df4d1a1b1ca20838375714db33c286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= Date: Fri, 21 Jun 2024 22:41:17 +0800 Subject: [PATCH] dep --- .../LjPlanning/LjPlanningPlcHelp.cs | 63 +++-- .../Mesnac.Action.ChemicalWeighing.csproj | 2 +- .../Report/DryMixer/SelectRowAction.cs | Bin 11298 -> 80 bytes .../Report/Sb.cs | 240 ++++++++++++++++++ .../榄菊报表.干混机报表.xml | 2 +- 5 files changed, 287 insertions(+), 20 deletions(-) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/Sb.cs diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs index ac913aa..a9e52ba 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs @@ -158,7 +158,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -166,7 +166,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -183,7 +183,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -195,7 +195,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -210,7 +210,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -221,7 +221,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -236,7 +236,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -245,7 +245,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -263,7 +263,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -274,7 +274,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -289,7 +289,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -301,7 +301,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -316,7 +316,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -327,7 +327,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -343,7 +343,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -351,7 +351,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -639,7 +639,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; - Dowd(begin, view); + Dowd2(begin, view); begin += 10; } @@ -647,7 +647,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; - DowSteps(begin, view); + DowSteps2(begin, view); begin += 12; } @@ -671,6 +671,33 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning } + private static void Dowd2(int start, RecipePlcView view) + { + int bin = start; + PlcConnect.Instance.Write($"DB2104.{bin}.0", view.Bin); + int set = start + 2; + PlcConnect.Instance.Write($"DB2104.{set}.0", view.Set); + int tolerance = start + 6; + PlcConnect.Instance.Write($"DB2104.{tolerance}.0", view.Tolerance); + + } + + private static void DowSteps2(int start, Step step) + { + int mixCode = start; + var info = PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode); + int mixTime = start + 2; + PlcConnect.Instance.Write($"DB2104.{mixTime}.0", step.MixTime); + + int mixTemp = start + 4; + PlcConnect.Instance.Write($"DB2104.{mixTemp}.0", step.MixTemp); + int mixSpeed = start + 8; + + PlcConnect.Instance.Write($"DB2104.{mixSpeed}.0", step.MixSpeed); + } + + + private static void Dowd(int start, RecipePlcView view) { int bin = start; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 36cc135..7ca50c1 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -635,7 +635,6 @@ - @@ -644,6 +643,7 @@ + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs index 4448fb84b7eb92c4f4fe03c48878775aa436ee34..0da77481209dc48bb847dbfb9c0166bb2696dc7b 100644 GIT binary patch literal 80 zcmeZGEzV0!)^kiQ$;{8wbIwT3%}h?r2~W*T&&bS6*9%H5$S*3<3r>Qn;Ns$Xxpv>x ajVm_3)!lJ&_nY0nz)TQv`1|=CTwDM)r6wx? literal 11298 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 x.Name == "MCCombobox1") as MCCombobox; + ICSharpCode.Core.LoggingService.Debug("干混机报表-明细查询..."); + + //获取报表数据 + DbMCControl _dgvDryMixer = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Report_DryMixer").FirstOrDefault(); + if (_dgvDryMixer == null || !(_dgvDryMixer.BaseControl is DataGridView)) + { + ICSharpCode.Core.LoggingService.Warn("{生产报表} 缺少干混机报表DataGridView控件..."); + runtime.IsReturn = false; + return; + } + + DataGridView _DryMixerGridView = _dgvDryMixer.BaseControl as DataGridView; + + this._clientGridControl = GetAllControls().Where(x => x.Name.Contains("MultiColHeaderDgv1")).FirstOrDefault(); + + + + Mesnac.Controls.Default.MultiColHeaderDgv clientGrid = (this._clientGridControl as Mesnac.Controls.Default.MultiColHeaderDgv); + + + Mesnac.Controls.Default.MultiColHeaderDgv clientGrid2 = (GetAllControls().Where(x => x.Name.Contains("MultiColHeaderDgv2")).FirstOrDefault() as Mesnac.Controls.Default.MultiColHeaderDgv); + + #region 明细控件格式化 + + clientGrid.myColHeaderTreeView = null; + clientGrid.DataSource = null; + clientGrid.iNodeLevels = 0; + clientGrid.ColLists.Clear(); + clientGrid.ColumnHeadersHeight = 23; + clientGrid.ScrollBars = ScrollBars.Both; + clientGrid.AllowUserToAddRows = false; + clientGrid.RowsDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + clientGrid.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + clientGrid.ColumnHeadersDefaultCellStyle.Font = new System.Drawing.Font("宋体", 12); + clientGrid.DefaultCellStyle.Font = new System.Drawing.Font("宋体", 10); + clientGrid.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + + + clientGrid2.myColHeaderTreeView = null; + clientGrid2.DataSource = null; + clientGrid2.iNodeLevels = 0; + clientGrid2.ColLists.Clear(); + clientGrid2.ColumnHeadersHeight = 23; + clientGrid2.ScrollBars = ScrollBars.Both; + clientGrid2.AllowUserToAddRows = false; + clientGrid2.RowsDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + clientGrid2.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + clientGrid2.ColumnHeadersDefaultCellStyle.Font = new System.Drawing.Font("宋体", 12); + clientGrid2.DefaultCellStyle.Font = new System.Drawing.Font("宋体", 10); + clientGrid2.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + #endregion + + //获取选中行的ReportId，关联获取明细数据并赋值给明细控件 + if (_DryMixerGridView.SelectedRows.Count == 1) + { + string lR_planID = _DryMixerGridView.SelectedRows[0].Cells["reportId"].Value as string; + + //获取数据链接 + var dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); + + dbHelper.ClearParameter(); + + //获取明细数据 + StringBuilder sqlStr = new StringBuilder(@"select t1.batch as 批次号,t2.MName as 物料, + t1.actValue as 实际重量,t1.actToler as 实际公差 + from Report_DryDos_Detail t1 + left join lj_stock_material t2 on t1.matCode = t2.Code + where t2.MTypeId=1 and t1.reportId = @reportId"); + dbHelper.CommandText = sqlStr.ToString(); + dbHelper.CommandType = System.Data.CommandType.Text; + dbHelper.AddParameter("@reportId", lR_planID); + DataTable table = dbHelper.ToDataTable(); + + string bathNo = "0"; + + foreach (DataRow row in table.Rows) + { + string a = row["批次号"].ToString().Trim(); + if (a != "0") + { + bathNo = a; break; + } + } + + + float zt = 0; + + foreach (DataRow row in table.Rows) + { + string a = row["批次号"].ToString().Trim(); + if (a == "0") + { + row["批次号"] = bathNo; + } + + var aaa= Convert.ToSingle(row["实际重量"]); + + zt+= aaa; + + row["实际重量"] = Convert.ToSingle(row["实际重量"]).ToString("#0.00"); + row["实际公差"] = Convert.ToSingle(row["实际公差"]).ToString("#0.00"); + } + + + var dts=table.NewRow(); + dts[1] = "总计"; + dts["实际重量"] = zt.ToString("#0.00"); + + table.Rows.Add(dts); + + clientGrid.DataSource = null; + + clientGrid.DataSource = table; + + dbHelper.ClearParameter(); + + string sql = $"select t1.actCode, t1.mixBatch as 批次,t1.mixStep as 步号,t1.actCode as 动作,\r\n " + + $" t1.mixTime as 时间,t1.mixTemp as 温度,t1.mixSpeed as 速度, t1.recordTime as 记录时间 from" + + $" Report_DryMixer_Detail t1\r\n\r\nwhere t1.reportId='{lR_planID}' order by actCode"; + + dbHelper.CommandText = sql.ToString(); + dbHelper.CommandType = System.Data.CommandType.Text; + + DataTable tableB = dbHelper.ToDataTable(); + DataTable newTable = GetDefault(); + + var dateNow = DateTime.Now; + Dictionary dic = new Dictionary(); + Dictionary Newdic = new Dictionary(); + + + foreach (DataRow row in tableB.Rows) + { + var dr = newTable.NewRow(); + dr["批次"] = row["批次"]; + dr["步号"] = row["步号"]; + dr["动作"] = DryStepConvert(Convert.ToInt32(row["actCode"])); + dr["时间"] = ConverToTime(Convert.ToInt32(row["时间"])); + dr["速度"] = row["速度"]; + dr["记录时间"] = row["记录时间"]; + dr["速度"] = Convert.ToSingle(row["速度"]).ToString("#0.00"); + + dateNow = Convert.ToDateTime(row["记录时间"].ToString()); + dic.Add(Convert.ToInt32(dr["步号"]), Convert.ToInt32(row["时间"])); + newTable.Rows.Add(dr); + } + + for (int i = 1; i < 11; i++) + { + var miao = dic.Where(x => x.Key >= i).Select(x => x.Value).Sum(); + Newdic.Add(i, dateNow.AddSeconds(-miao)); + } + + foreach (System.Data.DataRow row in newTable.Rows) + { + var bu = Convert.ToInt32(row["步号"]); + if (Newdic.ContainsKey(bu)) + { + var dt = Newdic[bu]; + row["记录时间"] = dt.ToString("yyyy-MM-dd HH:mm:ss"); + } + + } + + clientGrid2.DataSource = newTable; + + } + } + + string ConverToTime(int duration) + { + TimeSpan ts = new TimeSpan(0, 0, Convert.ToInt32(duration)); + string str = ""; + if (ts.Hours > 0) + { + str = ts.Hours.ToString() + "小时 " + ts.Minutes.ToString() + "分钟 " + ts.Seconds + "秒"; + } + if (ts.Hours == 0 && ts.Minutes > 0) + { + str = ts.Minutes.ToString() + "分钟 " + ts.Seconds + "秒"; + } + if (ts.Hours == 0 && ts.Minutes == 0) + { + str = ts.Seconds + "秒"; + } + return str; + } + + + private DataTable GetDefault() + { + var tableNewB = new DataTable(); + tableNewB.Columns.Add("批次", typeof(string)); + tableNewB.Columns.Add("步号", typeof(string)); + tableNewB.Columns.Add("动作", typeof(string)); + tableNewB.Columns.Add("时间", typeof(string)); + //tableNewB.Columns.Add("温度", typeof(string)); + tableNewB.Columns.Add("速度", typeof(string)); + tableNewB.Columns.Add("记录时间", typeof(string)); + + return tableNewB; + } + + private string DryStepConvert(int code) + { + switch (code) + { + case 1: return "加粉料"; + case 4: return "搅拌"; + case 6: return "等待排料"; + default: return "无"; + } + } + + } +} + diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.干混机报表.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.干混机报表.xml index 77cc748..f22b3d8 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.干混机报表.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.干混机报表.xml @@ -44,7 +44,7 @@ - +