diff --git a/HighWayIot.Winform/HighWayIot.Winform.csproj b/HighWayIot.Winform/HighWayIot.Winform.csproj
index b552dba..0fb63f6 100644
--- a/HighWayIot.Winform/HighWayIot.Winform.csproj
+++ b/HighWayIot.Winform/HighWayIot.Winform.csproj
@@ -101,10 +101,10 @@
MonitorMainPage.cs
-
+
UserControl
-
+
RecipeConfigPage.cs
@@ -213,7 +213,7 @@
MonitorMainPage.cs
-
+
RecipeConfigPage.cs
diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.Designer.cs b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.Designer.cs
deleted file mode 100644
index cd2293f..0000000
--- a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.Designer.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace HighWayIot.Winform.UserControlPages
-{
- partial class RecipeConfigPage
- {
- ///
- /// 必需的设计器变量。
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// 清理所有正在使用的资源。
- ///
- /// 如果应释放托管资源,为 true;否则为 false。
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region 组件设计器生成的代码
-
- ///
- /// 设计器支持所需的方法 - 不要修改
- /// 使用代码编辑器修改此方法的内容。
- ///
- private void InitializeComponent()
- {
- this.RoleDataGridView = new System.Windows.Forms.DataGridView();
- this.AddRole = new System.Windows.Forms.Button();
- this.ButtonPanel = new System.Windows.Forms.Panel();
- ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit();
- this.ButtonPanel.SuspendLayout();
- this.SuspendLayout();
- //
- // RoleDataGridView
- //
- this.RoleDataGridView.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;
- //
- // 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.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;
- //
- // OperateConfigPage
- //
- 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.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.ButtonPanel.ResumeLayout(false);
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private DataGridView RoleDataGridView;
- private Button AddRole;
- private Panel ButtonPanel;
- }
-}
diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.cs b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.cs
deleted file mode 100644
index 1b09ba9..0000000
--- a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace HighWayIot.Winform.UserControlPages
-{
- public partial class RecipeConfigPage : UserControl
- {
- public RecipeConfigPage()
- {
- InitializeComponent();
- }
-
- private void UpdateRole_Click(object sender, EventArgs e)
- {
-
- }
- }
-}
diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.resx b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs
new file mode 100644
index 0000000..5ac6d58
--- /dev/null
+++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs
@@ -0,0 +1,504 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace HighWayIot.Winform.UserControlPages
+{
+ partial class RecipeConfigPage
+ {
+ ///
+ /// 必需的设计器变量。
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// 清理所有正在使用的资源。
+ ///
+ /// 如果应释放托管资源,为 true;否则为 false。
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region 组件设计器生成的代码
+
+ ///
+ /// 设计器支持所需的方法 - 不要修改
+ /// 使用代码编辑器修改此方法的内容。
+ ///
+ private void InitializeComponent()
+ {
+ this.WeightDataGridView = new System.Windows.Forms.DataGridView();
+ this.AddRecipeButton = new System.Windows.Forms.Button();
+ this.ButtonPanel = new System.Windows.Forms.Panel();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.RecipeDataGridView = new System.Windows.Forms.DataGridView();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.RecipeCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.RecipeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.RecipeSpecCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.RecipeSpecName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.SizeKind = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.FixedWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.WeightError = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.IsUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+ this.DeleteRecipeButton = new System.Windows.Forms.Button();
+ this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.AddWeightButton = new System.Windows.Forms.Button();
+ this.DeleteWeightButton = new System.Windows.Forms.Button();
+ this.UpdateRecipeButton = new System.Windows.Forms.Button();
+ this.UpdateWeightButton = new System.Windows.Forms.Button();
+ this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.MaterialCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.MaterialName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.MaterialType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.MaterialChildType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.SetThickness = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.SetWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.SetLayer = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.SetWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.SetError = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.WeightIsUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+ this.RefreshRecipeButton = new System.Windows.Forms.Button();
+ this.RefreshWeightButton = new System.Windows.Forms.Button();
+ ((System.ComponentModel.ISupportInitialize)(this.WeightDataGridView)).BeginInit();
+ this.ButtonPanel.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.RecipeDataGridView)).BeginInit();
+ this.tableLayoutPanel1.SuspendLayout();
+ this.tableLayoutPanel2.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // WeightDataGridView
+ //
+ this.WeightDataGridView.AllowUserToAddRows = false;
+ this.WeightDataGridView.AllowUserToDeleteRows = false;
+ this.WeightDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.WeightDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.Id,
+ this.MaterialCode,
+ this.MaterialName,
+ this.MaterialType,
+ this.MaterialChildType,
+ this.SetThickness,
+ this.SetWidth,
+ this.SetLayer,
+ this.SetWeight,
+ this.SetError,
+ this.WeightIsUse});
+ this.WeightDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.WeightDataGridView.Location = new System.Drawing.Point(3, 17);
+ this.WeightDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.WeightDataGridView.Name = "WeightDataGridView";
+ this.WeightDataGridView.RowHeadersVisible = false;
+ this.WeightDataGridView.RowTemplate.Height = 25;
+ this.WeightDataGridView.Size = new System.Drawing.Size(881, 763);
+ this.WeightDataGridView.TabIndex = 0;
+ this.WeightDataGridView.Tag = "";
+ //
+ // AddRecipeButton
+ //
+ this.AddRecipeButton.Location = new System.Drawing.Point(11, 9);
+ this.AddRecipeButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.AddRecipeButton.Name = "AddRecipeButton";
+ this.AddRecipeButton.Size = new System.Drawing.Size(103, 39);
+ this.AddRecipeButton.TabIndex = 1;
+ this.AddRecipeButton.Text = "添加配方信息";
+ this.AddRecipeButton.UseVisualStyleBackColor = true;
+ this.AddRecipeButton.Click += new System.EventHandler(this.AddRecipeButton_Click);
+ //
+ // 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.RefreshRecipeButton);
+ this.ButtonPanel.Controls.Add(this.UpdateRecipeButton);
+ this.ButtonPanel.Controls.Add(this.AddRecipeButton);
+ this.ButtonPanel.Controls.Add(this.DeleteRecipeButton);
+ this.ButtonPanel.Location = new System.Drawing.Point(0, 0);
+ this.ButtonPanel.Margin = new System.Windows.Forms.Padding(0);
+ this.ButtonPanel.Name = "ButtonPanel";
+ this.ButtonPanel.Size = new System.Drawing.Size(886, 58);
+ this.ButtonPanel.TabIndex = 4;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.WeightDataGridView);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox1.Location = new System.Drawing.Point(886, 0);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(0);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(887, 783);
+ this.groupBox1.TabIndex = 5;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "称量信息";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.RecipeDataGridView);
+ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox2.Location = new System.Drawing.Point(0, 0);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(0);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(886, 783);
+ this.groupBox2.TabIndex = 6;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "配方列表";
+ //
+ // RecipeDataGridView
+ //
+ this.RecipeDataGridView.AllowUserToAddRows = false;
+ this.RecipeDataGridView.AllowUserToDeleteRows = false;
+ this.RecipeDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.RecipeDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.RecipeCode,
+ this.RecipeName,
+ this.RecipeSpecCode,
+ this.RecipeSpecName,
+ this.SizeKind,
+ this.FixedWidth,
+ this.WeightError,
+ this.IsUse});
+ this.RecipeDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.RecipeDataGridView.Location = new System.Drawing.Point(3, 17);
+ this.RecipeDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.RecipeDataGridView.Name = "RecipeDataGridView";
+ this.RecipeDataGridView.RowHeadersVisible = false;
+ this.RecipeDataGridView.RowTemplate.Height = 25;
+ this.RecipeDataGridView.Size = new System.Drawing.Size(880, 763);
+ this.RecipeDataGridView.TabIndex = 0;
+ this.RecipeDataGridView.Tag = "";
+ //
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.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.tableLayoutPanel1.ColumnCount = 2;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.groupBox1, 1, 0);
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 253);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 1;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1773, 783);
+ this.tableLayoutPanel1.TabIndex = 7;
+ //
+ // groupBox3
+ //
+ this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox3.Location = new System.Drawing.Point(0, 63);
+ this.groupBox3.Margin = new System.Windows.Forms.Padding(0);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.Size = new System.Drawing.Size(1773, 190);
+ this.groupBox3.TabIndex = 8;
+ this.groupBox3.TabStop = false;
+ this.groupBox3.Text = "配方参数";
+ //
+ // RecipeCode
+ //
+ this.RecipeCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.RecipeCode.HeaderText = "配方编号";
+ this.RecipeCode.Name = "RecipeCode";
+ //
+ // RecipeName
+ //
+ this.RecipeName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.RecipeName.HeaderText = "配方名称";
+ this.RecipeName.Name = "RecipeName";
+ //
+ // RecipeSpecCode
+ //
+ this.RecipeSpecCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.RecipeSpecCode.HeaderText = "SPEC编号";
+ this.RecipeSpecCode.Name = "RecipeSpecCode";
+ //
+ // RecipeSpecName
+ //
+ this.RecipeSpecName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.RecipeSpecName.HeaderText = "SPEC名称";
+ this.RecipeSpecName.Name = "RecipeSpecName";
+ //
+ // SizeKind
+ //
+ this.SizeKind.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.SizeKind.HeaderText = "寸别";
+ this.SizeKind.Name = "SizeKind";
+ //
+ // FixedWidth
+ //
+ this.FixedWidth.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.FixedWidth.HeaderText = "固定胶宽度";
+ this.FixedWidth.Name = "FixedWidth";
+ //
+ // WeightError
+ //
+ this.WeightError.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.WeightError.HeaderText = "重量公差";
+ this.WeightError.Name = "WeightError";
+ //
+ // IsUse
+ //
+ this.IsUse.HeaderText = "启用";
+ this.IsUse.Name = "IsUse";
+ this.IsUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.IsUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.IsUse.Width = 40;
+ //
+ // DeleteRecipeButton
+ //
+ this.DeleteRecipeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.DeleteRecipeButton.Location = new System.Drawing.Point(771, 9);
+ this.DeleteRecipeButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.DeleteRecipeButton.Name = "DeleteRecipeButton";
+ this.DeleteRecipeButton.Size = new System.Drawing.Size(103, 39);
+ this.DeleteRecipeButton.TabIndex = 2;
+ this.DeleteRecipeButton.Text = "删除配方信息";
+ this.DeleteRecipeButton.UseVisualStyleBackColor = true;
+ this.DeleteRecipeButton.Click += new System.EventHandler(this.DeleteRecipeButton_Click);
+ //
+ // tableLayoutPanel2
+ //
+ this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tableLayoutPanel2.ColumnCount = 2;
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel2.Controls.Add(this.panel1, 1, 0);
+ this.tableLayoutPanel2.Controls.Add(this.ButtonPanel, 0, 0);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
+ this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+ this.tableLayoutPanel2.RowCount = 1;
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(1773, 63);
+ this.tableLayoutPanel2.TabIndex = 9;
+ //
+ // panel1
+ //
+ this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.panel1.Controls.Add(this.RefreshWeightButton);
+ this.panel1.Controls.Add(this.UpdateWeightButton);
+ this.panel1.Controls.Add(this.AddWeightButton);
+ this.panel1.Controls.Add(this.DeleteWeightButton);
+ this.panel1.Location = new System.Drawing.Point(886, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(887, 58);
+ this.panel1.TabIndex = 5;
+ //
+ // AddWeightButton
+ //
+ this.AddWeightButton.Location = new System.Drawing.Point(11, 9);
+ this.AddWeightButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.AddWeightButton.Name = "AddWeightButton";
+ this.AddWeightButton.Size = new System.Drawing.Size(103, 39);
+ this.AddWeightButton.TabIndex = 1;
+ this.AddWeightButton.Text = "添加称量信息";
+ this.AddWeightButton.UseVisualStyleBackColor = true;
+ this.AddWeightButton.Click += new System.EventHandler(this.AddWeightButton_Click);
+ //
+ // DeleteWeightButton
+ //
+ this.DeleteWeightButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.DeleteWeightButton.Location = new System.Drawing.Point(772, 9);
+ this.DeleteWeightButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.DeleteWeightButton.Name = "DeleteWeightButton";
+ this.DeleteWeightButton.Size = new System.Drawing.Size(103, 39);
+ this.DeleteWeightButton.TabIndex = 2;
+ this.DeleteWeightButton.Text = "删除称量信息";
+ this.DeleteWeightButton.UseVisualStyleBackColor = true;
+ this.DeleteWeightButton.Click += new System.EventHandler(this.DeleteWeightButton_Click);
+ //
+ // UpdateRecipeButton
+ //
+ this.UpdateRecipeButton.Location = new System.Drawing.Point(120, 9);
+ this.UpdateRecipeButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.UpdateRecipeButton.Name = "UpdateRecipeButton";
+ this.UpdateRecipeButton.Size = new System.Drawing.Size(103, 39);
+ this.UpdateRecipeButton.TabIndex = 3;
+ this.UpdateRecipeButton.Text = "修改配方信息";
+ this.UpdateRecipeButton.UseVisualStyleBackColor = true;
+ this.UpdateRecipeButton.Click += new System.EventHandler(this.UpdateRecipeButton_Click);
+ //
+ // UpdateWeightButton
+ //
+ this.UpdateWeightButton.Location = new System.Drawing.Point(120, 9);
+ this.UpdateWeightButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.UpdateWeightButton.Name = "UpdateWeightButton";
+ this.UpdateWeightButton.Size = new System.Drawing.Size(103, 39);
+ this.UpdateWeightButton.TabIndex = 3;
+ this.UpdateWeightButton.Text = "修改称量信息";
+ this.UpdateWeightButton.UseVisualStyleBackColor = true;
+ this.UpdateWeightButton.Click += new System.EventHandler(this.UpdateWeightButton_Click);
+ //
+ // Id
+ //
+ this.Id.HeaderText = "编号";
+ this.Id.Name = "Id";
+ this.Id.ReadOnly = true;
+ this.Id.Width = 40;
+ //
+ // MaterialCode
+ //
+ this.MaterialCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.MaterialCode.HeaderText = "物料编码";
+ this.MaterialCode.Name = "MaterialCode";
+ //
+ // MaterialName
+ //
+ this.MaterialName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.MaterialName.HeaderText = "物料名称";
+ this.MaterialName.Name = "MaterialName";
+ this.MaterialName.ReadOnly = true;
+ //
+ // MaterialType
+ //
+ this.MaterialType.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.MaterialType.HeaderText = "物料类型";
+ this.MaterialType.Name = "MaterialType";
+ this.MaterialType.ReadOnly = true;
+ //
+ // MaterialChildType
+ //
+ this.MaterialChildType.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.MaterialChildType.HeaderText = "子类型";
+ this.MaterialChildType.Name = "MaterialChildType";
+ this.MaterialChildType.ReadOnly = true;
+ //
+ // SetThickness
+ //
+ this.SetThickness.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.SetThickness.HeaderText = "厚度";
+ this.SetThickness.Name = "SetThickness";
+ //
+ // SetWidth
+ //
+ this.SetWidth.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.SetWidth.HeaderText = "宽度";
+ this.SetWidth.Name = "SetWidth";
+ //
+ // SetLayer
+ //
+ this.SetLayer.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.SetLayer.HeaderText = "层数";
+ this.SetLayer.Name = "SetLayer";
+ //
+ // SetWeight
+ //
+ this.SetWeight.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.SetWeight.HeaderText = "重量";
+ this.SetWeight.Name = "SetWeight";
+ //
+ // SetError
+ //
+ this.SetError.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.SetError.HeaderText = "公差";
+ this.SetError.Name = "SetError";
+ //
+ // WeightIsUse
+ //
+ this.WeightIsUse.HeaderText = "使用";
+ this.WeightIsUse.Name = "WeightIsUse";
+ this.WeightIsUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.WeightIsUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.WeightIsUse.Width = 40;
+ //
+ // RefreshRecipeButton
+ //
+ this.RefreshRecipeButton.Location = new System.Drawing.Point(229, 9);
+ this.RefreshRecipeButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.RefreshRecipeButton.Name = "RefreshRecipeButton";
+ this.RefreshRecipeButton.Size = new System.Drawing.Size(103, 39);
+ this.RefreshRecipeButton.TabIndex = 4;
+ this.RefreshRecipeButton.Text = "刷新配方信息";
+ this.RefreshRecipeButton.UseVisualStyleBackColor = true;
+ this.RefreshRecipeButton.Click += new System.EventHandler(this.RefreshRecipeButton_Click);
+ //
+ // RefreshWeightButton
+ //
+ this.RefreshWeightButton.Location = new System.Drawing.Point(229, 9);
+ this.RefreshWeightButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.RefreshWeightButton.Name = "RefreshWeightButton";
+ this.RefreshWeightButton.Size = new System.Drawing.Size(103, 39);
+ this.RefreshWeightButton.TabIndex = 4;
+ this.RefreshWeightButton.Text = "刷新称量信息";
+ this.RefreshWeightButton.UseVisualStyleBackColor = true;
+ this.RefreshWeightButton.Click += new System.EventHandler(this.RefreshWeightButton_Click);
+ //
+ // RecipeConfigPage
+ //
+ 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.tableLayoutPanel2);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.tableLayoutPanel1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Name = "RecipeConfigPage";
+ this.Size = new System.Drawing.Size(1773, 1036);
+ ((System.ComponentModel.ISupportInitialize)(this.WeightDataGridView)).EndInit();
+ this.ButtonPanel.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.RecipeDataGridView)).EndInit();
+ this.tableLayoutPanel1.ResumeLayout(false);
+ this.tableLayoutPanel2.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DataGridView WeightDataGridView;
+ private Button AddRecipeButton;
+ private Panel ButtonPanel;
+ private GroupBox groupBox1;
+ private GroupBox groupBox2;
+ private DataGridView RecipeDataGridView;
+ private TableLayoutPanel tableLayoutPanel1;
+ private GroupBox groupBox3;
+ private DataGridViewTextBoxColumn RecipeCode;
+ private DataGridViewTextBoxColumn RecipeName;
+ private DataGridViewTextBoxColumn RecipeSpecCode;
+ private DataGridViewTextBoxColumn RecipeSpecName;
+ private DataGridViewTextBoxColumn SizeKind;
+ private DataGridViewTextBoxColumn FixedWidth;
+ private DataGridViewTextBoxColumn WeightError;
+ private DataGridViewCheckBoxColumn IsUse;
+ private Button DeleteRecipeButton;
+ private TableLayoutPanel tableLayoutPanel2;
+ private Panel panel1;
+ private Button AddWeightButton;
+ private Button DeleteWeightButton;
+ private Button UpdateRecipeButton;
+ private Button UpdateWeightButton;
+ private DataGridViewTextBoxColumn Id;
+ private DataGridViewTextBoxColumn MaterialCode;
+ private DataGridViewTextBoxColumn MaterialName;
+ private DataGridViewTextBoxColumn MaterialType;
+ private DataGridViewTextBoxColumn MaterialChildType;
+ private DataGridViewTextBoxColumn SetThickness;
+ private DataGridViewTextBoxColumn SetWidth;
+ private DataGridViewTextBoxColumn SetLayer;
+ private DataGridViewTextBoxColumn SetWeight;
+ private DataGridViewTextBoxColumn SetError;
+ private DataGridViewCheckBoxColumn WeightIsUse;
+ private Button RefreshRecipeButton;
+ private Button RefreshWeightButton;
+ }
+}
diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.cs b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.cs
new file mode 100644
index 0000000..5b0b1b9
--- /dev/null
+++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace HighWayIot.Winform.UserControlPages
+{
+ public partial class RecipeConfigPage : UserControl
+ {
+ public RecipeConfigPage()
+ {
+ InitializeComponent();
+ Init();
+ }
+
+ private void Init()
+ {
+
+ }
+
+ ///
+ /// 添加配方信息
+ ///
+ ///
+ ///
+ private void AddRecipeButton_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ ///
+ /// 删除配方信息
+ ///
+ ///
+ ///
+ private void DeleteRecipeButton_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ ///
+ /// 修改配方信息
+ ///
+ ///
+ ///
+ private void UpdateRecipeButton_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ ///
+ /// 刷新配方信息
+ ///
+ ///
+ ///
+ private void RefreshRecipeButton_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ ///
+ /// 添加称量信息
+ ///
+ ///
+ ///
+ private void AddWeightButton_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ ///
+ /// 删除称量信息
+ ///
+ ///
+ ///
+ private void DeleteWeightButton_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ ///
+ /// 修改称量信息
+ ///
+ ///
+ ///
+ private void UpdateWeightButton_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ ///
+ /// 刷新称量信息
+ ///
+ ///
+ ///
+ private void RefreshWeightButton_Click(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.resx b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.resx
new file mode 100644
index 0000000..1111578
--- /dev/null
+++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.resx
@@ -0,0 +1,234 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 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
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
\ No newline at end of file
diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.Designer.cs b/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.Designer.cs
index b737add..17b917c 100644
--- a/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.Designer.cs
+++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.Designer.cs
@@ -59,6 +59,8 @@ namespace HighWayIot.Winform.UserControlPages.SysConfigPages
//
// UserInfoDataGridView
//
+ this.UserInfoDataGridView.AllowUserToAddRows = false;
+ this.UserInfoDataGridView.AllowUserToDeleteRows = false;
this.UserInfoDataGridView.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)));
diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.resx b/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.resx
index 5f526e4..ef7900e 100644
--- a/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.resx
+++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.resx
@@ -132,19 +132,4 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
\ No newline at end of file