From 76dfcdf6ced44433f4e70f9cc3edc8bb46635fa3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 21 一月 2023 12:12:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/生产基础资料/Gy_Process.designer.cs | 180 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 111 insertions(+), 69 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 35b5ee5..ae97445 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"
@@ -58,6 +58,12 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.txtHWWBadWHID = 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.txtHBadCountDevelopWHID = new System.Windows.Forms.TextBox();
this.cmdHBadCountDevelopWHID = new System.Windows.Forms.Button();
this.label17 = new System.Windows.Forms.Label();
@@ -110,12 +116,9 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- 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.cmdHWHID = new System.Windows.Forms.Button();
+ this.label20 = new System.Windows.Forms.Label();
+ this.txtHWHID = new System.Windows.Forms.TextBox();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -431,6 +434,9 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.cmdHWHID);
+ this.tabPage2.Controls.Add(this.label20);
+ this.tabPage2.Controls.Add(this.txtHWHID);
this.tabPage2.Controls.Add(this.txtHWWBadWHID);
this.tabPage2.Controls.Add(this.cmdHWWWasterWHID);
this.tabPage2.Controls.Add(this.label18);
@@ -490,6 +496,72 @@
this.tabPage2.TabIndex = 1;
this.tabPage2.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);
+ //
+ // cmdHWWWasterWHID
+ //
+ 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);
+ //
+ // label18
+ //
+ 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 = "濮斿鎶ュ簾浠�";
+ //
+ // txtHWWWasterWHID
+ //
+ 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 = "濮斿涓嶈壇鍝佷粨";
+ //
// txtHBadCountDevelopWHID
//
this.txtHBadCountDevelopWHID.BackColor = System.Drawing.SystemColors.Window;
@@ -528,7 +600,7 @@
this.cmdHWasterWHID.BackColor = System.Drawing.Color.Transparent;
this.cmdHWasterWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWasterWHID.Image")));
this.cmdHWasterWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHWasterWHID.Location = new System.Drawing.Point(487, 171);
+ this.cmdHWasterWHID.Location = new System.Drawing.Point(487, 198);
this.cmdHWasterWHID.Name = "cmdHWasterWHID";
this.cmdHWasterWHID.Size = new System.Drawing.Size(22, 22);
this.cmdHWasterWHID.TabIndex = 224;
@@ -539,7 +611,7 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(296, 176);
+ this.label16.Location = new System.Drawing.Point(296, 203);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(41, 12);
this.label16.TabIndex = 222;
@@ -549,7 +621,7 @@
//
this.txtHWasterWHID.BackColor = System.Drawing.SystemColors.Window;
this.txtHWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWasterWHID.Location = new System.Drawing.Point(343, 172);
+ this.txtHWasterWHID.Location = new System.Drawing.Point(343, 199);
this.txtHWasterWHID.Name = "txtHWasterWHID";
this.txtHWasterWHID.Size = new System.Drawing.Size(144, 21);
this.txtHWasterWHID.TabIndex = 223;
@@ -1022,71 +1094,38 @@
this.label3.TabIndex = 0;
this.label3.Text = "宸ュ簭璧勬枡-姝ｅ湪娴忚";
//
- // cmdHWWWasterWHID
+ // cmdHWHID
//
- 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);
+ this.cmdHWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWHID.Image")));
+ this.cmdHWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHWHID.Location = new System.Drawing.Point(487, 171);
+ this.cmdHWHID.Name = "cmdHWHID";
+ this.cmdHWHID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHWHID.TabIndex = 236;
+ this.cmdHWHID.UseVisualStyleBackColor = false;
+ this.cmdHWHID.Click += new System.EventHandler(this.cmdHWHID_Click);
//
- // label18
+ // label20
//
- 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 = "濮斿鎶ュ簾浠�";
+ this.label20.AutoSize = true;
+ this.label20.ForeColor = System.Drawing.Color.Black;
+ this.label20.Location = new System.Drawing.Point(296, 176);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(41, 12);
+ this.label20.TabIndex = 234;
+ this.label20.Text = "鑹搧浠�";
//
- // txtHWWWasterWHID
+ // txtHWHID
//
- 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);
+ this.txtHWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWHID.Location = new System.Drawing.Point(343, 172);
+ this.txtHWHID.Name = "txtHWHID";
+ this.txtHWHID.Size = new System.Drawing.Size(144, 21);
+ this.txtHWHID.TabIndex = 235;
+ this.txtHWHID.Tag = "0";
+ this.txtHWHID.TextChanged += new System.EventHandler(this.txtHWHID_TextChanged);
//
// Gy_Process
//
@@ -1205,5 +1244,8 @@
private System.Windows.Forms.TextBox txtHWWWasterWHID;
private System.Windows.Forms.Button cmdHWWBadWHID;
private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Button cmdHWHID;
+ private System.Windows.Forms.Label label20;
+ private System.Windows.Forms.TextBox txtHWHID;
}
}
\ No newline at end of file
--
Gitblit v1.9.1