From 9671e1c0d88deeea2efc06b800f7eaedfcf82949 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 08 十一月 2021 14:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/生产基础资料/Gy_Process.designer.cs | 377 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 258 insertions(+), 119 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 0914f8f..5e3eb19 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,8 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.txtHProcCheckNote = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
this.cmdHProcMulID = new System.Windows.Forms.Button();
this.label13 = new System.Windows.Forms.Label();
this.txtHProcMulID = new System.Windows.Forms.TextBox();
@@ -99,8 +101,12 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- this.label14 = new System.Windows.Forms.Label();
- this.txtHProcCheckNote = new System.Windows.Forms.TextBox();
+ this.cmdHBadWHID = new System.Windows.Forms.Button();
+ this.label15 = new System.Windows.Forms.Label();
+ this.txtHBadWHID = new System.Windows.Forms.TextBox();
+ this.cmdHWasterWHID = new System.Windows.Forms.Button();
+ this.label16 = new System.Windows.Forms.Label();
+ this.txtHWasterWHID = new System.Windows.Forms.TextBox();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -144,7 +150,7 @@
this.ToolBar.Location = new System.Drawing.Point(0, 0);
this.ToolBar.Name = "ToolBar";
this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
- this.ToolBar.Size = new System.Drawing.Size(877, 50);
+ this.ToolBar.Size = new System.Drawing.Size(1169, 62);
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 13;
this.ToolBar.Text = "toolStrip1";
@@ -152,7 +158,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
// dc
//
@@ -184,7 +190,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// xz
//
@@ -232,7 +238,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// cx
//
@@ -265,7 +271,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// fz
//
@@ -298,13 +304,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -314,7 +320,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -324,7 +330,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -334,7 +340,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -344,7 +350,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -363,7 +369,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// imageList1
//
@@ -378,9 +384,10 @@
this.stTab.Controls.Add(this.tabPage2);
this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
this.stTab.Location = new System.Drawing.Point(0, 0);
+ this.stTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.stTab.Name = "stTab";
this.stTab.SelectedIndex = 0;
- this.stTab.Size = new System.Drawing.Size(736, 495);
+ this.stTab.Size = new System.Drawing.Size(982, 619);
this.stTab.TabIndex = 15;
//
// tabPage1
@@ -388,10 +395,11 @@
this.tabPage1.BackColor = System.Drawing.SystemColors.Control;
this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
- this.tabPage1.Size = new System.Drawing.Size(728, 469);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(974, 590);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
//
@@ -402,12 +410,14 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersVisible = false;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(720, 461);
+ this.grdMain.Size = new System.Drawing.Size(964, 580);
this.grdMain.TabIndex = 0;
this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
//
@@ -415,6 +425,12 @@
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
this.tabPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tabPage2.Controls.Add(this.cmdHWasterWHID);
+ this.tabPage2.Controls.Add(this.label16);
+ this.tabPage2.Controls.Add(this.txtHWasterWHID);
+ this.tabPage2.Controls.Add(this.cmdHBadWHID);
+ this.tabPage2.Controls.Add(this.label15);
+ this.tabPage2.Controls.Add(this.txtHBadWHID);
this.tabPage2.Controls.Add(this.txtHProcCheckNote);
this.tabPage2.Controls.Add(this.label14);
this.tabPage2.Controls.Add(this.cmdHProcMulID);
@@ -452,21 +468,43 @@
this.tabPage2.Controls.Add(this.label2);
this.tabPage2.Controls.Add(this.txtHNumber);
this.tabPage2.Controls.Add(this.label1);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Location = new System.Drawing.Point(4, 25);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
- this.tabPage2.Size = new System.Drawing.Size(728, 469);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage2.Size = new System.Drawing.Size(974, 590);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+ //
+ // txtHProcCheckNote
+ //
+ this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcCheckNote.Location = new System.Drawing.Point(103, 333);
+ this.txtHProcCheckNote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProcCheckNote.Multiline = true;
+ this.txtHProcCheckNote.Name = "txtHProcCheckNote";
+ this.txtHProcCheckNote.Size = new System.Drawing.Size(573, 74);
+ this.txtHProcCheckNote.TabIndex = 218;
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Location = new System.Drawing.Point(25, 337);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(68, 45);
+ this.label14.TabIndex = 217;
+ this.label14.Text = "鏈� 宸� 搴廫r\n\r\n纭璁板綍";
//
// cmdHProcMulID
//
this.cmdHProcMulID.BackColor = System.Drawing.Color.Transparent;
this.cmdHProcMulID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcMulID.Image")));
this.cmdHProcMulID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHProcMulID.Location = new System.Drawing.Point(497, 113);
+ this.cmdHProcMulID.Location = new System.Drawing.Point(649, 116);
+ this.cmdHProcMulID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHProcMulID.Name = "cmdHProcMulID";
- this.cmdHProcMulID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHProcMulID.Size = new System.Drawing.Size(29, 28);
this.cmdHProcMulID.TabIndex = 216;
this.cmdHProcMulID.UseVisualStyleBackColor = false;
this.cmdHProcMulID.Click += new System.EventHandler(this.cmdHProcMulID_Click);
@@ -475,9 +513,10 @@
//
this.label13.AutoSize = true;
this.label13.ForeColor = System.Drawing.Color.Black;
- this.label13.Location = new System.Drawing.Point(300, 118);
+ this.label13.Location = new System.Drawing.Point(386, 123);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(47, 12);
+ this.label13.Size = new System.Drawing.Size(61, 15);
this.label13.TabIndex = 214;
this.label13.Text = "宸� 娈�";
//
@@ -485,9 +524,10 @@
//
this.txtHProcMulID.BackColor = System.Drawing.SystemColors.Window;
this.txtHProcMulID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcMulID.Location = new System.Drawing.Point(353, 114);
+ this.txtHProcMulID.Location = new System.Drawing.Point(457, 117);
+ this.txtHProcMulID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcMulID.Name = "txtHProcMulID";
- this.txtHProcMulID.Size = new System.Drawing.Size(144, 21);
+ this.txtHProcMulID.Size = new System.Drawing.Size(191, 25);
this.txtHProcMulID.TabIndex = 215;
this.txtHProcMulID.Tag = "0";
this.txtHProcMulID.TextChanged += new System.EventHandler(this.txtHProcessID_K3_TextChanged);
@@ -495,26 +535,29 @@
// txtHOverFixPrice
//
this.txtHOverFixPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOverFixPrice.Location = new System.Drawing.Point(353, 86);
+ this.txtHOverFixPrice.Location = new System.Drawing.Point(457, 83);
+ this.txtHOverFixPrice.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHOverFixPrice.Name = "txtHOverFixPrice";
- this.txtHOverFixPrice.Size = new System.Drawing.Size(166, 21);
+ this.txtHOverFixPrice.Size = new System.Drawing.Size(220, 25);
this.txtHOverFixPrice.TabIndex = 213;
//
// txtHFixPrice
//
this.txtHFixPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHFixPrice.Location = new System.Drawing.Point(353, 58);
+ this.txtHFixPrice.Location = new System.Drawing.Point(457, 47);
+ this.txtHFixPrice.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHFixPrice.Name = "txtHFixPrice";
- this.txtHFixPrice.Size = new System.Drawing.Size(166, 21);
+ this.txtHFixPrice.Size = new System.Drawing.Size(220, 25);
this.txtHFixPrice.TabIndex = 212;
//
// label12
//
this.label12.AutoSize = true;
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(270, 90);
+ this.label12.Location = new System.Drawing.Point(346, 87);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(77, 12);
+ this.label12.Size = new System.Drawing.Size(97, 15);
this.label12.TabIndex = 211;
this.label12.Text = "鍔犵彮琛ヨ创瀹氶";
//
@@ -522,18 +565,20 @@
//
this.label11.AutoSize = true;
this.label11.ForeColor = System.Drawing.Color.Black;
- this.label11.Location = new System.Drawing.Point(294, 62);
+ this.label11.Location = new System.Drawing.Point(378, 53);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(53, 12);
+ this.label11.Size = new System.Drawing.Size(67, 15);
this.label11.TabIndex = 208;
this.label11.Text = "鐝骇瀹氶";
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(294, 34);
+ this.label10.Location = new System.Drawing.Point(378, 17);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(53, 12);
+ this.label10.Size = new System.Drawing.Size(67, 15);
this.label10.TabIndex = 207;
this.label10.Text = "姹囨姤绫诲瀷";
//
@@ -543,17 +588,19 @@
this.cmbHBillSubType.Items.AddRange(new object[] {
"璁惧",
"娴佹按绾�"});
- this.cmbHBillSubType.Location = new System.Drawing.Point(353, 30);
+ this.cmbHBillSubType.Location = new System.Drawing.Point(457, 13);
+ this.cmbHBillSubType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHBillSubType.Name = "cmbHBillSubType";
- this.cmbHBillSubType.Size = new System.Drawing.Size(166, 20);
+ this.cmbHBillSubType.Size = new System.Drawing.Size(220, 23);
this.cmbHBillSubType.TabIndex = 206;
//
// chkHAutoTrunFlag
//
this.chkHAutoTrunFlag.AutoSize = true;
- this.chkHAutoTrunFlag.Location = new System.Drawing.Point(346, 349);
+ this.chkHAutoTrunFlag.Location = new System.Drawing.Point(447, 437);
+ this.chkHAutoTrunFlag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkHAutoTrunFlag.Name = "chkHAutoTrunFlag";
- this.chkHAutoTrunFlag.Size = new System.Drawing.Size(72, 16);
+ this.chkHAutoTrunFlag.Size = new System.Drawing.Size(89, 19);
this.chkHAutoTrunFlag.TabIndex = 205;
this.chkHAutoTrunFlag.Text = "鑷姩绉昏浆";
this.chkHAutoTrunFlag.UseVisualStyleBackColor = true;
@@ -563,9 +610,10 @@
this.cmdHProcessID_K3.BackColor = System.Drawing.Color.Transparent;
this.cmdHProcessID_K3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcessID_K3.Image")));
this.cmdHProcessID_K3.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHProcessID_K3.Location = new System.Drawing.Point(497, 169);
+ this.cmdHProcessID_K3.Location = new System.Drawing.Point(649, 186);
+ this.cmdHProcessID_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHProcessID_K3.Name = "cmdHProcessID_K3";
- this.cmdHProcessID_K3.Size = new System.Drawing.Size(22, 22);
+ this.cmdHProcessID_K3.Size = new System.Drawing.Size(29, 28);
this.cmdHProcessID_K3.TabIndex = 204;
this.cmdHProcessID_K3.UseVisualStyleBackColor = false;
this.cmdHProcessID_K3.Click += new System.EventHandler(this.cmdHProcessID_K3_Click);
@@ -574,9 +622,10 @@
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(294, 174);
+ this.label9.Location = new System.Drawing.Point(378, 193);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(59, 12);
+ this.label9.Size = new System.Drawing.Size(77, 15);
this.label9.TabIndex = 202;
this.label9.Text = "ERP 宸� 搴�";
//
@@ -584,9 +633,10 @@
//
this.txtHProcessID_K3.BackColor = System.Drawing.SystemColors.Window;
this.txtHProcessID_K3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcessID_K3.Location = new System.Drawing.Point(353, 170);
+ this.txtHProcessID_K3.Location = new System.Drawing.Point(457, 187);
+ this.txtHProcessID_K3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHProcessID_K3.Name = "txtHProcessID_K3";
- this.txtHProcessID_K3.Size = new System.Drawing.Size(144, 21);
+ this.txtHProcessID_K3.Size = new System.Drawing.Size(191, 25);
this.txtHProcessID_K3.TabIndex = 203;
this.txtHProcessID_K3.Tag = "0";
this.txtHProcessID_K3.TextChanged += new System.EventHandler(this.txtHProcessID_K3_TextChanged);
@@ -594,43 +644,48 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(29, 174);
+ this.label8.Location = new System.Drawing.Point(25, 193);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(53, 12);
+ this.label8.Size = new System.Drawing.Size(69, 15);
this.label8.TabIndex = 201;
this.label8.Text = "搴� 鍙�";
//
// txtHSNo
//
this.txtHSNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSNo.Location = new System.Drawing.Point(88, 170);
+ this.txtHSNo.Location = new System.Drawing.Point(103, 187);
+ this.txtHSNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSNo.Name = "txtHSNo";
- this.txtHSNo.Size = new System.Drawing.Size(166, 21);
+ this.txtHSNo.Size = new System.Drawing.Size(220, 25);
this.txtHSNo.TabIndex = 200;
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(29, 146);
+ this.label7.Location = new System.Drawing.Point(25, 157);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(53, 12);
+ this.label7.Size = new System.Drawing.Size(67, 15);
this.label7.TabIndex = 199;
this.label7.Text = "閮ㄩ棬浠ｇ爜";
//
// txtHDeptNumber
//
this.txtHDeptNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHDeptNumber.Location = new System.Drawing.Point(88, 142);
+ this.txtHDeptNumber.Location = new System.Drawing.Point(103, 153);
+ this.txtHDeptNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHDeptNumber.Name = "txtHDeptNumber";
- this.txtHDeptNumber.Size = new System.Drawing.Size(166, 21);
+ this.txtHDeptNumber.Size = new System.Drawing.Size(220, 25);
this.txtHDeptNumber.TabIndex = 198;
//
// chkHTypeCount
//
this.chkHTypeCount.AutoSize = true;
- this.chkHTypeCount.Location = new System.Drawing.Point(260, 349);
+ this.chkHTypeCount.Location = new System.Drawing.Point(333, 437);
+ this.chkHTypeCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkHTypeCount.Name = "chkHTypeCount";
- this.chkHTypeCount.Size = new System.Drawing.Size(72, 16);
+ this.chkHTypeCount.Size = new System.Drawing.Size(89, 19);
this.chkHTypeCount.TabIndex = 197;
this.chkHTypeCount.Text = "鏍哥畻鏍囪";
this.chkHTypeCount.UseVisualStyleBackColor = true;
@@ -638,9 +693,10 @@
// chkHTypeFlow
//
this.chkHTypeFlow.AutoSize = true;
- this.chkHTypeFlow.Location = new System.Drawing.Point(174, 349);
+ this.chkHTypeFlow.Location = new System.Drawing.Point(218, 437);
+ this.chkHTypeFlow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkHTypeFlow.Name = "chkHTypeFlow";
- this.chkHTypeFlow.Size = new System.Drawing.Size(72, 16);
+ this.chkHTypeFlow.Size = new System.Drawing.Size(89, 19);
this.chkHTypeFlow.TabIndex = 196;
this.chkHTypeFlow.Text = "娴佽浆鏍囪";
this.chkHTypeFlow.UseVisualStyleBackColor = true;
@@ -648,18 +704,20 @@
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(29, 118);
+ this.label6.Location = new System.Drawing.Point(25, 123);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(53, 12);
+ this.label6.Size = new System.Drawing.Size(68, 15);
this.label6.TabIndex = 195;
this.label6.Text = "鏉� 褰� 鐮�";
//
// txtHBarCode
//
this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarCode.Location = new System.Drawing.Point(88, 114);
+ this.txtHBarCode.Location = new System.Drawing.Point(103, 117);
+ this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBarCode.Name = "txtHBarCode";
- this.txtHBarCode.Size = new System.Drawing.Size(166, 21);
+ this.txtHBarCode.Size = new System.Drawing.Size(220, 25);
this.txtHBarCode.TabIndex = 194;
//
// cmdHDeptID
@@ -667,9 +725,10 @@
this.cmdHDeptID.BackColor = System.Drawing.Color.Transparent;
this.cmdHDeptID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDeptID.Image")));
this.cmdHDeptID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHDeptID.Location = new System.Drawing.Point(497, 141);
+ this.cmdHDeptID.Location = new System.Drawing.Point(649, 151);
+ this.cmdHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHDeptID.Name = "cmdHDeptID";
- this.cmdHDeptID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHDeptID.Size = new System.Drawing.Size(29, 28);
this.cmdHDeptID.TabIndex = 193;
this.cmdHDeptID.UseVisualStyleBackColor = false;
this.cmdHDeptID.Click += new System.EventHandler(this.cmdHFactoryID_Click);
@@ -678,9 +737,10 @@
//
this.label28.AutoSize = true;
this.label28.ForeColor = System.Drawing.Color.Black;
- this.label28.Location = new System.Drawing.Point(294, 146);
+ this.label28.Location = new System.Drawing.Point(378, 157);
+ this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(53, 12);
+ this.label28.Size = new System.Drawing.Size(67, 15);
this.label28.TabIndex = 191;
this.label28.Text = "閮ㄩ棬杞﹂棿";
//
@@ -688,9 +748,10 @@
//
this.txtHDeptID.BackColor = System.Drawing.SystemColors.Window;
this.txtHDeptID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHDeptID.Location = new System.Drawing.Point(353, 142);
+ this.txtHDeptID.Location = new System.Drawing.Point(457, 153);
+ this.txtHDeptID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHDeptID.Name = "txtHDeptID";
- this.txtHDeptID.Size = new System.Drawing.Size(144, 21);
+ this.txtHDeptID.Size = new System.Drawing.Size(191, 25);
this.txtHDeptID.TabIndex = 192;
this.txtHDeptID.Tag = "0";
this.txtHDeptID.TextChanged += new System.EventHandler(this.txtHFactoryID_TextChanged);
@@ -699,25 +760,28 @@
//
this.txtHName.BackColor = System.Drawing.Color.Beige;
this.txtHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHName.Location = new System.Drawing.Point(88, 58);
+ this.txtHName.Location = new System.Drawing.Point(103, 47);
+ this.txtHName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHName.Name = "txtHName";
- this.txtHName.Size = new System.Drawing.Size(166, 21);
+ this.txtHName.Size = new System.Drawing.Size(220, 25);
this.txtHName.TabIndex = 18;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(29, 90);
+ this.label4.Location = new System.Drawing.Point(25, 87);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.Size = new System.Drawing.Size(68, 15);
this.label4.TabIndex = 17;
this.label4.Text = "鍔� 璁� 鐮�";
//
// cmdCancel
//
- this.cmdCancel.Location = new System.Drawing.Point(467, 389);
+ this.cmdCancel.Location = new System.Drawing.Point(609, 487);
+ this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdCancel.Name = "cmdCancel";
- this.cmdCancel.Size = new System.Drawing.Size(52, 23);
+ this.cmdCancel.Size = new System.Drawing.Size(69, 29);
this.cmdCancel.TabIndex = 16;
this.cmdCancel.Text = "鍙� 娑�";
this.cmdCancel.UseVisualStyleBackColor = true;
@@ -725,9 +789,10 @@
//
// cmdOK
//
- this.cmdOK.Location = new System.Drawing.Point(409, 389);
+ this.cmdOK.Location = new System.Drawing.Point(531, 487);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdOK.Name = "cmdOK";
- this.cmdOK.Size = new System.Drawing.Size(52, 23);
+ this.cmdOK.Size = new System.Drawing.Size(69, 29);
this.cmdOK.TabIndex = 15;
this.cmdOK.Text = "淇� 瀛�";
this.cmdOK.UseVisualStyleBackColor = true;
@@ -736,9 +801,10 @@
// chkHStopflag
//
this.chkHStopflag.AutoSize = true;
- this.chkHStopflag.Location = new System.Drawing.Point(88, 349);
+ this.chkHStopflag.Location = new System.Drawing.Point(103, 437);
+ this.chkHStopflag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkHStopflag.Name = "chkHStopflag";
- this.chkHStopflag.Size = new System.Drawing.Size(72, 16);
+ this.chkHStopflag.Size = new System.Drawing.Size(89, 19);
this.chkHStopflag.TabIndex = 12;
this.chkHStopflag.Text = "绂佺敤鏍囧織";
this.chkHStopflag.UseVisualStyleBackColor = true;
@@ -746,35 +812,39 @@
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(88, 198);
+ this.txtHRemark.Location = new System.Drawing.Point(103, 249);
+ this.txtHRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHRemark.Multiline = true;
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(431, 60);
+ this.txtHRemark.Size = new System.Drawing.Size(573, 74);
this.txtHRemark.TabIndex = 10;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(29, 198);
+ this.label5.Location = new System.Drawing.Point(25, 249);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(53, 12);
+ this.label5.Size = new System.Drawing.Size(69, 15);
this.label5.TabIndex = 9;
this.label5.Text = "澶� 娉�";
//
// txtHHelpCode
//
this.txtHHelpCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHHelpCode.Location = new System.Drawing.Point(88, 86);
+ this.txtHHelpCode.Location = new System.Drawing.Point(103, 83);
+ this.txtHHelpCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHHelpCode.Name = "txtHHelpCode";
- this.txtHHelpCode.Size = new System.Drawing.Size(166, 21);
+ this.txtHHelpCode.Size = new System.Drawing.Size(220, 25);
this.txtHHelpCode.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(29, 62);
+ this.label2.Location = new System.Drawing.Point(25, 53);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.Size = new System.Drawing.Size(69, 15);
this.label2.TabIndex = 2;
this.label2.Text = "宸� 搴�";
//
@@ -782,17 +852,19 @@
//
this.txtHNumber.BackColor = System.Drawing.Color.Beige;
this.txtHNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHNumber.Location = new System.Drawing.Point(88, 30);
+ this.txtHNumber.Location = new System.Drawing.Point(103, 13);
+ this.txtHNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHNumber.Name = "txtHNumber";
- this.txtHNumber.Size = new System.Drawing.Size(166, 21);
+ this.txtHNumber.Size = new System.Drawing.Size(220, 25);
this.txtHNumber.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(29, 34);
+ this.label1.Location = new System.Drawing.Point(25, 17);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 0;
this.label1.Text = "宸ュ簭浠ｇ爜";
//
@@ -804,7 +876,8 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 50);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 62);
+ this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -815,8 +888,9 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.stTab);
- this.splitContainer1.Size = new System.Drawing.Size(877, 495);
- this.splitContainer1.SplitterDistance = 137;
+ this.splitContainer1.Size = new System.Drawing.Size(1169, 619);
+ this.splitContainer1.SplitterDistance = 182;
+ this.splitContainer1.SplitterWidth = 5;
this.splitContainer1.TabIndex = 16;
//
// tv
@@ -829,7 +903,8 @@
this.tv.Indent = 18;
this.tv.ItemHeight = 18;
this.tv.LineColor = System.Drawing.Color.Navy;
- this.tv.Location = new System.Drawing.Point(0, 23);
+ this.tv.Location = new System.Drawing.Point(0, 28);
+ this.tv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tv.Name = "tv";
treeNode1.ForeColor = System.Drawing.Color.Black;
treeNode1.Name = "tjbb";
@@ -839,7 +914,7 @@
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode1});
this.tv.SelectedImageIndex = 1;
- this.tv.Size = new System.Drawing.Size(137, 472);
+ this.tv.Size = new System.Drawing.Size(182, 591);
this.tv.TabIndex = 16;
this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
//
@@ -850,16 +925,18 @@
this.panel1.Controls.Add(this.label3);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(137, 23);
+ this.panel1.Size = new System.Drawing.Size(182, 28);
this.panel1.TabIndex = 15;
//
// cmdLoadTree
//
this.cmdLoadTree.Dock = System.Windows.Forms.DockStyle.Right;
- this.cmdLoadTree.Location = new System.Drawing.Point(93, 0);
+ this.cmdLoadTree.Location = new System.Drawing.Point(125, 0);
+ this.cmdLoadTree.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdLoadTree.Name = "cmdLoadTree";
- this.cmdLoadTree.Size = new System.Drawing.Size(40, 19);
+ this.cmdLoadTree.Size = new System.Drawing.Size(53, 24);
this.cmdLoadTree.TabIndex = 1;
this.cmdLoadTree.Text = "鍒锋柊";
this.cmdLoadTree.UseVisualStyleBackColor = true;
@@ -868,38 +945,94 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(0, 3);
+ this.label3.Location = new System.Drawing.Point(0, 4);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(107, 12);
+ this.label3.Size = new System.Drawing.Size(135, 15);
this.label3.TabIndex = 0;
this.label3.Text = "宸ュ簭璧勬枡-姝ｅ湪娴忚";
//
- // label14
+ // cmdHBadWHID
//
- this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(29, 269);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(53, 36);
- this.label14.TabIndex = 217;
- this.label14.Text = "鏈� 宸� 搴廫r\n\r\n纭璁板綍";
+ this.cmdHBadWHID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHBadWHID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHBadWHID.Image")));
+ this.cmdHBadWHID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHBadWHID.Location = new System.Drawing.Point(295, 215);
+ this.cmdHBadWHID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHBadWHID.Name = "cmdHBadWHID";
+ this.cmdHBadWHID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHBadWHID.TabIndex = 221;
+ this.cmdHBadWHID.UseVisualStyleBackColor = false;
+ this.cmdHBadWHID.Click += new System.EventHandler(this.cmdHBadWHID_Click);
//
- // txtHProcCheckNote
+ // label15
//
- this.txtHProcCheckNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProcCheckNote.Location = new System.Drawing.Point(88, 266);
- this.txtHProcCheckNote.Multiline = true;
- this.txtHProcCheckNote.Name = "txtHProcCheckNote";
- this.txtHProcCheckNote.Size = new System.Drawing.Size(431, 60);
- this.txtHProcCheckNote.TabIndex = 218;
+ this.label15.AutoSize = true;
+ this.label15.ForeColor = System.Drawing.Color.Black;
+ this.label15.Location = new System.Drawing.Point(25, 222);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(67, 15);
+ this.label15.TabIndex = 219;
+ this.label15.Text = "涓嶈壇鍝佷粨";
+ //
+ // txtHBadWHID
+ //
+ this.txtHBadWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHBadWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBadWHID.Location = new System.Drawing.Point(103, 218);
+ this.txtHBadWHID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBadWHID.Name = "txtHBadWHID";
+ this.txtHBadWHID.Size = new System.Drawing.Size(191, 25);
+ this.txtHBadWHID.TabIndex = 220;
+ this.txtHBadWHID.Tag = "0";
+ this.txtHBadWHID.TextChanged += new System.EventHandler(this.txtHBadWHID_TextChanged);
+ //
+ // cmdHWasterWHID
+ //
+ 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(649, 217);
+ this.cmdHWasterWHID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHWasterWHID.Name = "cmdHWasterWHID";
+ this.cmdHWasterWHID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHWasterWHID.TabIndex = 224;
+ this.cmdHWasterWHID.UseVisualStyleBackColor = false;
+ this.cmdHWasterWHID.Click += new System.EventHandler(this.cmdHWasterWHID_Click);
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.ForeColor = System.Drawing.Color.Black;
+ this.label16.Location = new System.Drawing.Point(379, 224);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(52, 15);
+ this.label16.TabIndex = 222;
+ this.label16.Text = "鎶ュ簾浠�";
+ //
+ // txtHWasterWHID
+ //
+ this.txtHWasterWHID.BackColor = System.Drawing.SystemColors.Window;
+ this.txtHWasterWHID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHWasterWHID.Location = new System.Drawing.Point(457, 220);
+ this.txtHWasterWHID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHWasterWHID.Name = "txtHWasterWHID";
+ this.txtHWasterWHID.Size = new System.Drawing.Size(191, 25);
+ this.txtHWasterWHID.TabIndex = 223;
+ this.txtHWasterWHID.Tag = "0";
+ this.txtHWasterWHID.TextChanged += new System.EventHandler(this.txtHWasterWHID_TextChanged);
//
// Gy_Process
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
- this.ClientSize = new System.Drawing.Size(877, 545);
+ this.ClientSize = new System.Drawing.Size(1169, 681);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.ToolBar);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Gy_Process";
this.Text = "宸ュ簭璁剧疆";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -994,5 +1127,11 @@
private System.Windows.Forms.ToolStripButton dc;
private System.Windows.Forms.TextBox txtHProcCheckNote;
private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.Button cmdHWasterWHID;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.TextBox txtHWasterWHID;
+ private System.Windows.Forms.Button cmdHBadWHID;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.TextBox txtHBadWHID;
}
}
\ No newline at end of file
--
Gitblit v1.9.1