From b590f1374c4e48133a17c77bac8e9797811975ee Mon Sep 17 00:00:00 2001
From: 杨乐 <杨乐@DESKTOP-5CU1TNO>
Date: 星期二, 15 三月 2022 08:26:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/生产基础资料/Gy_Process.designer.cs | 186 +++++++++++++++++++++++++++++++++------------
1 files changed, 135 insertions(+), 51 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
index 9a3c0cb..35b5ee5 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.designer.cs"
@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_Process));
- System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("椤圭洰");
+ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
this.ToolBar = new System.Windows.Forms.ToolStrip();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.dc = new System.Windows.Forms.ToolStripButton();
@@ -58,6 +58,9 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
+ this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
+ this.label17 = new System.Windows.Forms.Label();
this.cmdHWasterWHID = new System.Windows.Forms.Button();
this.label16 = new System.Windows.Forms.Label();
this.txtHWasterWHID = new System.Windows.Forms.TextBox();
@@ -107,9 +110,12 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
- this.label17 = new System.Windows.Forms.Label();
- this.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWWWasterWHID = new System.Windows.Forms.Button();
+ this.label18 = new System.Windows.Forms.Label();
+ this.txtHWWWasterWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWWBadWHID = new System.Windows.Forms.Button();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHWWBadWHID = new System.Windows.Forms.TextBox();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -399,7 +405,7 @@
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(729, 469);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
@@ -425,6 +431,12 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.txtHWWBadWHID);
+ this.tabPage2.Controls.Add(this.cmdHWWWasterWHID);
+ this.tabPage2.Controls.Add(this.label18);
+ this.tabPage2.Controls.Add(this.txtHWWWasterWHID);
+ this.tabPage2.Controls.Add(this.cmdHWWBadWHID);
+ this.tabPage2.Controls.Add(this.label19);
this.tabPage2.Controls.Add(this.txtHBadCountDevelopWHID);
this.tabPage2.Controls.Add(this.cmdHBadCountDevelopWHID);
this.tabPage2.Controls.Add(this.label17);
@@ -473,10 +485,43 @@
this.tabPage2.Controls.Add(this.label1);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(729, 469);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+ //
+ // txtHBadCountDevelopWHID
+ //
+ this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
+ this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
+ this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHBadCountDevelopWHID.TabIndex = 226;
+ this.txtHBadCountDevelopWHID.Tag = "0";
+ this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
+ //
+ // cmdHBadCountDevelopWHID
+ //
+ this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
+ this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
+ this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
+ this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHBadCountDevelopWHID.TabIndex = 227;
+ this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
+ this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.ForeColor = System.Drawing.Color.Black;
+ this.label17.Location = new System.Drawing.Point(2, 203);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(77, 12);
+ this.label17.TabIndex = 225;
+ this.label17.Text = "鐮斿彂涓嶈壇鍝佷粨";
//
// cmdHWasterWHID
//
@@ -494,7 +539,7 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(284, 176);
+ this.label16.Location = new System.Drawing.Point(296, 176);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(41, 12);
this.label16.TabIndex = 222;
@@ -547,7 +592,7 @@
// txtHProcCheckNote
//
this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 294);
+ this.txtHProcCheckNote.Location = new System.Drawing.Point(77, 321);
this.txtHProcCheckNote.Multiline = true;
this.txtHProcCheckNote.Name = "txtHProcCheckNote";
this.txtHProcCheckNote.Size = new System.Drawing.Size(431, 60);
@@ -556,7 +601,7 @@
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(19, 298);
+ this.label14.Location = new System.Drawing.Point(19, 325);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(53, 36);
this.label14.TabIndex = 217;
@@ -654,7 +699,7 @@
// chkHAutoTrunFlag
//
this.chkHAutoTrunFlag.AutoSize = true;
- this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 361);
+ this.chkHAutoTrunFlag.Location = new System.Drawing.Point(335, 388);
this.chkHAutoTrunFlag.Name = "chkHAutoTrunFlag";
this.chkHAutoTrunFlag.Size = new System.Drawing.Size(72, 16);
this.chkHAutoTrunFlag.TabIndex = 205;
@@ -677,7 +722,7 @@
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(284, 149);
+ this.label9.Location = new System.Drawing.Point(278, 149);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(59, 12);
this.label9.TabIndex = 202;
@@ -731,7 +776,7 @@
// chkHTypeCount
//
this.chkHTypeCount.AutoSize = true;
- this.chkHTypeCount.Location = new System.Drawing.Point(250, 361);
+ this.chkHTypeCount.Location = new System.Drawing.Point(250, 388);
this.chkHTypeCount.Name = "chkHTypeCount";
this.chkHTypeCount.Size = new System.Drawing.Size(72, 16);
this.chkHTypeCount.TabIndex = 197;
@@ -741,7 +786,7 @@
// chkHTypeFlow
//
this.chkHTypeFlow.AutoSize = true;
- this.chkHTypeFlow.Location = new System.Drawing.Point(164, 361);
+ this.chkHTypeFlow.Location = new System.Drawing.Point(164, 388);
this.chkHTypeFlow.Name = "chkHTypeFlow";
this.chkHTypeFlow.Size = new System.Drawing.Size(72, 16);
this.chkHTypeFlow.TabIndex = 196;
@@ -818,7 +863,7 @@
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(457, 390);
+ this.cmdCancel.Location = new System.Drawing.Point(457, 417);
this.cmdCancel.Name = "cmdCancel";
this.cmdCancel.Size = new System.Drawing.Size(52, 23);
this.cmdCancel.TabIndex = 16;
@@ -828,7 +873,7 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(398, 390);
+ this.cmdOK.Location = new System.Drawing.Point(398, 417);
this.cmdOK.Name = "cmdOK";
this.cmdOK.Size = new System.Drawing.Size(52, 23);
this.cmdOK.TabIndex = 15;
@@ -839,7 +884,7 @@
// chkHStopflag
//
this.chkHStopflag.AutoSize = true;
- this.chkHStopflag.Location = new System.Drawing.Point(77, 361);
+ this.chkHStopflag.Location = new System.Drawing.Point(77, 388);
this.chkHStopflag.Name = "chkHStopflag";
this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
this.chkHStopflag.TabIndex = 12;
@@ -849,7 +894,7 @@
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(77, 227);
+ this.txtHRemark.Location = new System.Drawing.Point(77, 254);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
this.txtHRemark.Size = new System.Drawing.Size(431, 60);
@@ -858,7 +903,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(19, 227);
+ this.label5.Location = new System.Drawing.Point(19, 254);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(53, 12);
this.label5.TabIndex = 9;
@@ -934,13 +979,13 @@
this.tv.LineColor = System.Drawing.Color.Navy;
this.tv.Location = new System.Drawing.Point(0, 23);
this.tv.Name = "tv";
- treeNode2.ForeColor = System.Drawing.Color.Black;
- treeNode2.Name = "tjbb";
- treeNode2.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- treeNode2.StateImageKey = "鏂囦欢澶�1.ico";
- treeNode2.Text = "椤圭洰";
+ treeNode1.ForeColor = System.Drawing.Color.Black;
+ treeNode1.Name = "tjbb";
+ treeNode1.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ treeNode1.StateImageKey = "鏂囦欢澶�1.ico";
+ treeNode1.Text = "椤圭洰";
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode2});
+ treeNode1});
this.tv.SelectedImageIndex = 1;
this.tv.Size = new System.Drawing.Size(136, 472);
this.tv.TabIndex = 16;
@@ -977,38 +1022,71 @@
this.label3.TabIndex = 0;
this.label3.Text = "宸ュ簭璧勬枡-姝ｅ湪娴忚";
//
- // cmdHBadCountDevelopWHID
+ // cmdHWWWasterWHID
//
- this.cmdHBadCountDevelopWHID.BackColor = System.Drawing.Color.Transparent;
- this.cmdHBadCountDevelopWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadCountDevelopWHID.Image")));
- this.cmdHBadCountDevelopWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHBadCountDevelopWHID.Location = new System.Drawing.Point(221, 198);
- this.cmdHBadCountDevelopWHID.Name = "cmdHBadCountDevelopWHID";
- this.cmdHBadCountDevelopWHID.Size = new System.Drawing.Size(22, 22);
- this.cmdHBadCountDevelopWHID.TabIndex = 227;
- this.cmdHBadCountDevelopWHID.UseVisualStyleBackColor = false;
- this.cmdHBadCountDevelopWHID.Click += new System.EventHandler(this.cmdHBadCountDevelopWHID_Click);
+ this.cmdHWWWasterWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWWWasterWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWWWasterWHID.Image")));
+ this.cmdHWWWasterWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWWWasterWHID.Location = new System.Drawing.Point(487, 225);
+ this.cmdHWWWasterWHID.Name = "cmdHWWWasterWHID";
+ this.cmdHWWWasterWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWWWasterWHID.TabIndex = 233;
+ this.cmdHWWWasterWHID.UseVisualStyleBackColor = false;
+ this.cmdHWWWasterWHID.Click += new System.EventHandler(this.cmdHWWWasterWHID_Click);
//
- // label17
+ // label18
//
- this.label17.AutoSize = true;
- this.label17.ForeColor = System.Drawing.Color.Black;
- this.label17.Location = new System.Drawing.Point(1, 203);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(77, 12);
- this.label17.TabIndex = 225;
- this.label17.Text = "鐮斿彂涓嶈壇鍝佷粨";
+ this.label18.AutoSize = true;
+ this.label18.ForeColor = System.Drawing.Color.Black;
+ this.label18.Location = new System.Drawing.Point(272, 230);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(65, 12);
+ this.label18.TabIndex = 231;
+ this.label18.Text = "濮斿鎶ュ簾浠�";
//
- // txtHBadCountDevelopWHID
+ // txtHWWWasterWHID
//
- this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
- this.txtHBadCountDevelopWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBadCountDevelopWHID.Location = new System.Drawing.Point(77, 199);
- this.txtHBadCountDevelopWHID.Name = "txtHBadCountDevelopWHID";
- this.txtHBadCountDevelopWHID.Size = new System.Drawing.Size(144, 21);
- this.txtHBadCountDevelopWHID.TabIndex = 226;
- this.txtHBadCountDevelopWHID.Tag = "0";
- this.txtHBadCountDevelopWHID.TextChanged += new System.EventHandler(this.txtHBadCountDevelopWHID_TextChanged);
+ this.txtHWWWasterWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWWWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWWWasterWHID.Location = new System.Drawing.Point(343, 226);
+ this.txtHWWWasterWHID.Name = "txtHWWWasterWHID";
+ this.txtHWWWasterWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWWWasterWHID.TabIndex = 232;
+ this.txtHWWWasterWHID.Tag = "0";
+ this.txtHWWWasterWHID.TextChanged += new System.EventHandler(this.txtHWWWasterWHID_TextChanged);
+ //
+ // cmdHWWBadWHID
+ //
+ this.cmdHWWBadWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWWBadWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWWBadWHID.Image")));
+ this.cmdHWWBadWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWWBadWHID.Location = new System.Drawing.Point(221, 225);
+ this.cmdHWWBadWHID.Name = "cmdHWWBadWHID";
+ this.cmdHWWBadWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWWBadWHID.TabIndex = 230;
+ this.cmdHWWBadWHID.UseVisualStyleBackColor = false;
+ this.cmdHWWBadWHID.Click += new System.EventHandler(this.cmdHWWBadWHID_Click);
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.ForeColor = System.Drawing.Color.Black;
+ this.label19.Location = new System.Drawing.Point(2, 230);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(77, 12);
+ this.label19.TabIndex = 228;
+ this.label19.Text = "濮斿涓嶈壇鍝佷粨";
+ //
+ // txtHWWBadWHID
+ //
+ this.txtHWWBadWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWWBadWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWWBadWHID.Location = new System.Drawing.Point(77, 226);
+ this.txtHWWBadWHID.Name = "txtHWWBadWHID";
+ this.txtHWWBadWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWWBadWHID.TabIndex = 229;
+ this.txtHWWBadWHID.Tag = "0";
+ this.txtHWWBadWHID.TextChanged += new System.EventHandler(this.txtHWWBadWHID_TextChanged);
//
// Gy_Process
//
@@ -1121,5 +1199,11 @@
private System.Windows.Forms.TextBox txtHBadCountDevelopWHID;
private System.Windows.Forms.Button cmdHBadCountDevelopWHID;
private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.TextBox txtHWWBadWHID;
+ private System.Windows.Forms.Button cmdHWWWasterWHID;
+ private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.TextBox txtHWWWasterWHID;
+ private System.Windows.Forms.Button cmdHWWBadWHID;
+ private System.Windows.Forms.Label label19;
}
}
\ No newline at end of file
--
Gitblit v1.9.1