diff --git a/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs b/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs index 00eb88a..bf04417 100644 --- a/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs +++ b/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs @@ -31,68 +31,328 @@ namespace HighWayIot.Winform.UserControlPages /// private void InitializeComponent() { - this.RoleDataGridView = new System.Windows.Forms.DataGridView(); - this.AddRole = new System.Windows.Forms.Button(); + this.ReportDataGridView = new System.Windows.Forms.DataGridView(); this.ButtonPanel = new System.Windows.Forms.Panel(); - ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit(); + this.label2 = new System.Windows.Forms.Label(); + this.RgvNoComboBox = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.OperatorTextBox = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.SelectEndTime = new System.Windows.Forms.DateTimePicker(); + this.SelectBeginTime = new System.Windows.Forms.DateTimePicker(); + this.IsCheckByTime = new System.Windows.Forms.CheckBox(); + this.label3 = new System.Windows.Forms.Label(); + this.RecipeCodeTextBox = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.SelectReport = new System.Windows.Forms.Button(); + this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DeviceNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.BeginTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RecipeNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SpecName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SpecCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RGVNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.BaseRubFinishTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MidRubTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RowTireFinishTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Operator = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.ReportDataGridView)).BeginInit(); this.ButtonPanel.SuspendLayout(); this.SuspendLayout(); // - // RoleDataGridView + // ReportDataGridView // - this.RoleDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.ReportDataGridView.AllowUserToAddRows = false; + this.ReportDataGridView.AllowUserToDeleteRows = false; + this.ReportDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.RoleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.RoleDataGridView.Location = new System.Drawing.Point(0, 65); - this.RoleDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.RoleDataGridView.Name = "RoleDataGridView"; - this.RoleDataGridView.RowTemplate.Height = 25; - this.RoleDataGridView.Size = new System.Drawing.Size(883, 497); - this.RoleDataGridView.TabIndex = 0; - this.RoleDataGridView.Tag = ""; - // - // AddRole - // - this.AddRole.Location = new System.Drawing.Point(11, 11); - this.AddRole.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.AddRole.Name = "AddRole"; - this.AddRole.Size = new System.Drawing.Size(103, 39); - this.AddRole.TabIndex = 1; - this.AddRole.Text = "查询操作信息"; - this.AddRole.UseVisualStyleBackColor = true; + this.ReportDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.ReportDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Id, + this.DeviceNo, + this.BeginTime, + this.RecipeNo, + this.SpecName, + this.SpecCode, + this.RGVNo, + this.Weight, + this.BaseRubFinishTime, + this.MidRubTime, + this.RowTireFinishTime, + this.Operator}); + this.ReportDataGridView.Location = new System.Drawing.Point(-3, 65); + this.ReportDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ReportDataGridView.Name = "ReportDataGridView"; + this.ReportDataGridView.ReadOnly = true; + this.ReportDataGridView.RowHeadersVisible = false; + this.ReportDataGridView.RowTemplate.Height = 25; + this.ReportDataGridView.Size = new System.Drawing.Size(1639, 868); + this.ReportDataGridView.TabIndex = 7; // // ButtonPanel // this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.ButtonPanel.Controls.Add(this.AddRole); + this.ButtonPanel.Controls.Add(this.label2); + this.ButtonPanel.Controls.Add(this.RgvNoComboBox); + this.ButtonPanel.Controls.Add(this.label5); + this.ButtonPanel.Controls.Add(this.OperatorTextBox); + this.ButtonPanel.Controls.Add(this.label4); + this.ButtonPanel.Controls.Add(this.SelectEndTime); + this.ButtonPanel.Controls.Add(this.SelectBeginTime); + this.ButtonPanel.Controls.Add(this.IsCheckByTime); + this.ButtonPanel.Controls.Add(this.label3); + this.ButtonPanel.Controls.Add(this.RecipeCodeTextBox); + this.ButtonPanel.Controls.Add(this.label1); + this.ButtonPanel.Controls.Add(this.SelectReport); this.ButtonPanel.Location = new System.Drawing.Point(0, 0); this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ButtonPanel.Name = "ButtonPanel"; - this.ButtonPanel.Size = new System.Drawing.Size(883, 61); - this.ButtonPanel.TabIndex = 4; + this.ButtonPanel.Size = new System.Drawing.Size(1636, 61); + this.ButtonPanel.TabIndex = 6; // - // OperateConfigPage + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(702, 39); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.TabIndex = 23; + this.label2.Text = "小车编号"; + // + // RgvNoComboBox + // + this.RgvNoComboBox.FormattingEnabled = true; + this.RgvNoComboBox.Location = new System.Drawing.Point(761, 35); + this.RgvNoComboBox.Name = "RgvNoComboBox"; + this.RgvNoComboBox.Size = new System.Drawing.Size(88, 20); + this.RgvNoComboBox.TabIndex = 22; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(525, 38); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(65, 12); + this.label5.TabIndex = 21; + this.label5.Text = "操作员名称"; + // + // OperatorTextBox + // + this.OperatorTextBox.Location = new System.Drawing.Point(596, 34); + this.OperatorTextBox.Name = "OperatorTextBox"; + this.OperatorTextBox.Size = new System.Drawing.Size(100, 21); + this.OperatorTextBox.TabIndex = 20; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(311, 32); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(17, 12); + this.label4.TabIndex = 18; + this.label4.Text = "到"; + // + // SelectEndTime + // + this.SelectEndTime.CustomFormat = "yyyy年MM月dd日 HH:mm:ss"; + this.SelectEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.SelectEndTime.Location = new System.Drawing.Point(334, 29); + this.SelectEndTime.Name = "SelectEndTime"; + this.SelectEndTime.Size = new System.Drawing.Size(185, 21); + this.SelectEndTime.TabIndex = 17; + // + // SelectBeginTime + // + this.SelectBeginTime.CustomFormat = "yyyy年MM月dd日 HH:mm:ss"; + this.SelectBeginTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.SelectBeginTime.Location = new System.Drawing.Point(120, 29); + this.SelectBeginTime.Name = "SelectBeginTime"; + this.SelectBeginTime.Size = new System.Drawing.Size(185, 21); + this.SelectBeginTime.TabIndex = 16; + this.SelectBeginTime.Value = new System.DateTime(2024, 11, 26, 13, 36, 9, 0); + // + // IsCheckByTime + // + this.IsCheckByTime.AutoSize = true; + this.IsCheckByTime.Location = new System.Drawing.Point(189, 11); + this.IsCheckByTime.Name = "IsCheckByTime"; + this.IsCheckByTime.Size = new System.Drawing.Size(120, 16); + this.IsCheckByTime.TabIndex = 15; + this.IsCheckByTime.Text = "是否根据时间判断"; + this.IsCheckByTime.UseVisualStyleBackColor = true; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(118, 13); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(65, 12); + this.label3.TabIndex = 14; + this.label3.Text = "登陆时间："; + // + // RecipeCodeTextBox + // + this.RecipeCodeTextBox.Location = new System.Drawing.Point(596, 7); + this.RecipeCodeTextBox.Name = "RecipeCodeTextBox"; + this.RecipeCodeTextBox.Size = new System.Drawing.Size(100, 21); + this.RecipeCodeTextBox.TabIndex = 3; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(537, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(53, 12); + this.label1.TabIndex = 2; + this.label1.Text = "成品代号"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // SelectReport + // + this.SelectReport.Location = new System.Drawing.Point(11, 11); + this.SelectReport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.SelectReport.Name = "SelectReport"; + this.SelectReport.Size = new System.Drawing.Size(103, 39); + this.SelectReport.TabIndex = 1; + this.SelectReport.Text = "查询操作信息"; + this.SelectReport.UseVisualStyleBackColor = true; + this.SelectReport.Click += new System.EventHandler(this.SelectReport_Click); + // + // Id + // + this.Id.DataPropertyName = "Id"; + this.Id.HeaderText = "ID"; + this.Id.Name = "Id"; + this.Id.ReadOnly = true; + this.Id.Width = 50; + // + // DeviceNo + // + this.DeviceNo.HeaderText = "机位"; + this.DeviceNo.Name = "DeviceNo"; + this.DeviceNo.ReadOnly = true; + this.DeviceNo.Width = 70; + // + // BeginTime + // + this.BeginTime.HeaderText = "开始时间"; + this.BeginTime.Name = "BeginTime"; + this.BeginTime.ReadOnly = true; + this.BeginTime.Width = 150; + // + // RecipeNo + // + this.RecipeNo.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.RecipeNo.FillWeight = 30F; + this.RecipeNo.HeaderText = "成品代号"; + this.RecipeNo.Name = "RecipeNo"; + this.RecipeNo.ReadOnly = true; + // + // SpecName + // + this.SpecName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.SpecName.FillWeight = 70F; + this.SpecName.HeaderText = "标称尺度"; + this.SpecName.Name = "SpecName"; + this.SpecName.ReadOnly = true; + // + // SpecCode + // + this.SpecCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.SpecCode.FillWeight = 30F; + this.SpecCode.HeaderText = "Spec编号"; + this.SpecCode.Name = "SpecCode"; + this.SpecCode.ReadOnly = true; + // + // RGVNo + // + this.RGVNo.HeaderText = "小车编号"; + this.RGVNo.Name = "RGVNo"; + this.RGVNo.ReadOnly = true; + this.RGVNo.Width = 80; + // + // Weight + // + this.Weight.HeaderText = "生胎重量"; + this.Weight.Name = "Weight"; + this.Weight.ReadOnly = true; + this.Weight.Width = 80; + // + // BaseRubFinishTime + // + this.BaseRubFinishTime.HeaderText = "基部胶完成时间"; + this.BaseRubFinishTime.Name = "BaseRubFinishTime"; + this.BaseRubFinishTime.ReadOnly = true; + this.BaseRubFinishTime.Width = 140; + // + // MidRubTime + // + this.MidRubTime.HeaderText = "中层胶完成时间（分）"; + this.MidRubTime.Name = "MidRubTime"; + this.MidRubTime.ReadOnly = true; + this.MidRubTime.Width = 150; + // + // RowTireFinishTime + // + this.RowTireFinishTime.HeaderText = "生胎完成时间（分）"; + this.RowTireFinishTime.Name = "RowTireFinishTime"; + this.RowTireFinishTime.ReadOnly = true; + this.RowTireFinishTime.Width = 140; + // + // Operator + // + this.Operator.DataPropertyName = "Operator"; + this.Operator.HeaderText = "操作者用户名"; + this.Operator.Name = "Operator"; + this.Operator.ReadOnly = true; + // + // DailyReportPage // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ReportDataGridView); this.Controls.Add(this.ButtonPanel); - this.Controls.Add(this.RoleDataGridView); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.Name = "OperateConfigPage"; - this.Size = new System.Drawing.Size(883, 562); - ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); + this.Name = "DailyReportPage"; + this.Size = new System.Drawing.Size(1636, 933); + ((System.ComponentModel.ISupportInitialize)(this.ReportDataGridView)).EndInit(); this.ButtonPanel.ResumeLayout(false); + this.ButtonPanel.PerformLayout(); this.ResumeLayout(false); } #endregion - private DataGridView RoleDataGridView; - private Button AddRole; + private DataGridView ReportDataGridView; private Panel ButtonPanel; + private Label label4; + private DateTimePicker SelectEndTime; + private DateTimePicker SelectBeginTime; + private CheckBox IsCheckByTime; + private Label label3; + private Label label1; + private Button SelectReport; + private Label label5; + private TextBox OperatorTextBox; + private TextBox RecipeCodeTextBox; + private Label label2; + private ComboBox RgvNoComboBox; + private DataGridViewTextBoxColumn Id; + private DataGridViewTextBoxColumn DeviceNo; + private DataGridViewTextBoxColumn BeginTime; + private DataGridViewTextBoxColumn RecipeNo; + private DataGridViewTextBoxColumn SpecName; + private DataGridViewTextBoxColumn SpecCode; + private DataGridViewTextBoxColumn RGVNo; + private DataGridViewTextBoxColumn Weight; + private DataGridViewTextBoxColumn BaseRubFinishTime; + private DataGridViewTextBoxColumn MidRubTime; + private DataGridViewTextBoxColumn RowTireFinishTime; + private DataGridViewTextBoxColumn Operator; } } diff --git a/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.cs b/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.cs index 6bf5911..0b6c86d 100644 --- a/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.cs +++ b/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.cs @@ -1,12 +1,18 @@ -using System; +using HighWayIot.Repository.domain; +using HighWayIot.Repository.service; +using HighWayIot.Winform.Business; +using System; +using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; +using System.Net.Http; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace HighWayIot.Winform.UserControlPages { @@ -15,11 +21,17 @@ namespace HighWayIot.Winform.UserControlPages public DailyReportPage() { InitializeComponent(); + Init(); } - private void UpdateRole_Click(object sender, EventArgs e) + private void Init() { + + } + private void SelectReport_Click(object sender, EventArgs e) + { + } } } diff --git a/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.resx b/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.resx index 1af7de1..0877622 100644 --- a/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.resx +++ b/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.resx @@ -117,4 +117,40 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/HighWayIot.Winform/UserControlPages/TestPage.cs b/HighWayIot.Winform/UserControlPages/TestPage.cs index ab3fafd..4d518bb 100644 --- a/HighWayIot.Winform/UserControlPages/TestPage.cs +++ b/HighWayIot.Winform/UserControlPages/TestPage.cs @@ -34,7 +34,7 @@ namespace HighWayIot.Winform.UserControlPages private void button2_Click(object sender, EventArgs e) { - SqlLogHelper.AddLog("wdas", 7, 8, 9); + SqlLogHelper.AddLog("wdas", 7, 1231535246, 9); SqlLogHelper.AddErrorLog("wocasda", 4, 5, 6); } }