From dc21d9a0e78853f81b4c3ec95b5b38bed32d9bc7 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 14 十月 2024 11:30:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 PlanM/计划管理/Gy_RoutingBill.designer.cs |  344 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 188 insertions(+), 156 deletions(-)

diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
index 1cc9378..483057e 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
@@ -81,6 +81,18 @@
             this.P1 = new System.Windows.Forms.Panel();
             this.pic1 = new System.Windows.Forms.PictureBox();
             this.gbUp = new System.Windows.Forms.GroupBox();
+            this.cmbHOrgID = new System.Windows.Forms.ComboBox();
+            this.label39 = new System.Windows.Forms.Label();
+            this.textHVerNum = new System.Windows.Forms.TextBox();
+            this.label38 = new System.Windows.Forms.Label();
+            this.textHProductNum = new System.Windows.Forms.TextBox();
+            this.label37 = new System.Windows.Forms.Label();
+            this.textHMaterTexture = new System.Windows.Forms.TextBox();
+            this.label36 = new System.Windows.Forms.Label();
+            this.textHPicNumAssemble = new System.Windows.Forms.TextBox();
+            this.label34 = new System.Windows.Forms.Label();
+            this.textHPicNumVer = new System.Windows.Forms.TextBox();
+            this.label32 = new System.Windows.Forms.Label();
             this.chkHUseFlag = new System.Windows.Forms.CheckBox();
             this.cmdHGroupID = new System.Windows.Forms.Button();
             this.txtHGroupID = new System.Windows.Forms.TextBox();
@@ -159,16 +171,6 @@
             this.grdMain = new System.Windows.Forms.DataGridView();
             this.grdSum = new System.Windows.Forms.DataGridView();
             this.grdPrint = new System.Windows.Forms.DataGridView();
-            this.label32 = new System.Windows.Forms.Label();
-            this.textHPicNumVer = new System.Windows.Forms.TextBox();
-            this.textHPicNumAssemble = new System.Windows.Forms.TextBox();
-            this.label34 = new System.Windows.Forms.Label();
-            this.textHMaterTexture = new System.Windows.Forms.TextBox();
-            this.label36 = new System.Windows.Forms.Label();
-            this.textHProductNum = new System.Windows.Forms.TextBox();
-            this.label37 = new System.Windows.Forms.Label();
-            this.textHVerNum = new System.Windows.Forms.TextBox();
-            this.label38 = new System.Windows.Forms.Label();
             this.Tool.SuspendLayout();
             this.P1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -414,6 +416,7 @@
             this.fsy.Text = "鍙栨秷";
             this.fsy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.fsy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.fsy.Visible = false;
             this.fsy.Click += new System.EventHandler(this.fsy_Click);
             // 
             // toolStripSeparator1
@@ -527,64 +530,70 @@
             // 鍏抽棴ToolStripMenuItem
             // 
             this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
-            this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
+            this.鍏抽棴ToolStripMenuItem.Visible = false;
             this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
             // 
             // 鍙嶅叧闂璗oolStripMenuItem
             // 
             this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
-            this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
+            this.鍙嶅叧闂璗oolStripMenuItem.Visible = false;
             this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
             // 
             // toolStripSeparator15
             // 
             this.toolStripSeparator15.Name = "toolStripSeparator15";
-            this.toolStripSeparator15.Size = new System.Drawing.Size(133, 6);
+            this.toolStripSeparator15.Size = new System.Drawing.Size(177, 6);
             // 
             // 瀹℃牳ToolStripMenuItem
             // 
             this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
-            this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
+            this.瀹℃牳ToolStripMenuItem.Visible = false;
             this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
             // 
             // 鍙嶅鏍窽oolStripMenuItem
             // 
             this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
-            this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
+            this.鍙嶅鏍窽oolStripMenuItem.Visible = false;
             this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
             // 
             // toolStripSeparator14
             // 
             this.toolStripSeparator14.Name = "toolStripSeparator14";
-            this.toolStripSeparator14.Size = new System.Drawing.Size(133, 6);
+            this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6);
             // 
             // 浣滃簾ToolStripMenuItem
             // 
             this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
-            this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
+            this.浣滃簾ToolStripMenuItem.Visible = false;
             this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
             // 
             // 鎾ら攢浣滃簾ToolStripMenuItem
             // 
             this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
-            this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
+            this.鎾ら攢浣滃簾ToolStripMenuItem.Visible = false;
             this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(133, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
             // 
             // 闅愯棌鍒楄缃甌oolStripMenuItem
             // 
             this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
-            this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+            this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
             this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click);
             // 
@@ -666,7 +675,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(18, 21);
+            this.label2.Location = new System.Drawing.Point(28, 25);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(53, 12);
             this.label2.TabIndex = 19;
@@ -685,7 +694,7 @@
             // 
             this.txtHUnitID.BackColor = System.Drawing.Color.Beige;
             this.txtHUnitID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHUnitID.Location = new System.Drawing.Point(91, 79);
+            this.txtHUnitID.Location = new System.Drawing.Point(91, 75);
             this.txtHUnitID.Name = "txtHUnitID";
             this.txtHUnitID.Size = new System.Drawing.Size(166, 21);
             this.txtHUnitID.TabIndex = 24;
@@ -696,7 +705,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(19, 82);
+            this.label4.Location = new System.Drawing.Point(28, 79);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(53, 12);
             this.label4.TabIndex = 23;
@@ -727,6 +736,8 @@
             // gbUp
             // 
             this.gbUp.BackColor = System.Drawing.Color.Transparent;
+            this.gbUp.Controls.Add(this.cmbHOrgID);
+            this.gbUp.Controls.Add(this.label39);
             this.gbUp.Controls.Add(this.textHVerNum);
             this.gbUp.Controls.Add(this.label38);
             this.gbUp.Controls.Add(this.textHProductNum);
@@ -789,6 +800,120 @@
             this.gbUp.TabIndex = 33;
             this.gbUp.TabStop = false;
             // 
+            // cmbHOrgID
+            // 
+            this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbHOrgID.FormattingEnabled = true;
+            this.cmbHOrgID.Location = new System.Drawing.Point(966, 156);
+            this.cmbHOrgID.Name = "cmbHOrgID";
+            this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
+            this.cmbHOrgID.TabIndex = 146;
+            // 
+            // label39
+            // 
+            this.label39.AutoSize = true;
+            this.label39.ForeColor = System.Drawing.Color.Black;
+            this.label39.Location = new System.Drawing.Point(903, 160);
+            this.label39.Name = "label39";
+            this.label39.Size = new System.Drawing.Size(53, 12);
+            this.label39.TabIndex = 145;
+            this.label39.Text = "缁�    缁�";
+            // 
+            // textHVerNum
+            // 
+            this.textHVerNum.BackColor = System.Drawing.Color.Beige;
+            this.textHVerNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.textHVerNum.Location = new System.Drawing.Point(967, 129);
+            this.textHVerNum.Name = "textHVerNum";
+            this.textHVerNum.Size = new System.Drawing.Size(187, 21);
+            this.textHVerNum.TabIndex = 144;
+            // 
+            // label38
+            // 
+            this.label38.AutoSize = true;
+            this.label38.ForeColor = System.Drawing.Color.Black;
+            this.label38.Location = new System.Drawing.Point(903, 133);
+            this.label38.Name = "label38";
+            this.label38.Size = new System.Drawing.Size(53, 12);
+            this.label38.TabIndex = 143;
+            this.label38.Text = "鐗�    鏈�";
+            // 
+            // textHProductNum
+            // 
+            this.textHProductNum.BackColor = System.Drawing.Color.Beige;
+            this.textHProductNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.textHProductNum.Location = new System.Drawing.Point(967, 102);
+            this.textHProductNum.Name = "textHProductNum";
+            this.textHProductNum.Size = new System.Drawing.Size(187, 21);
+            this.textHProductNum.TabIndex = 142;
+            // 
+            // label37
+            // 
+            this.label37.AutoSize = true;
+            this.label37.ForeColor = System.Drawing.Color.Black;
+            this.label37.Location = new System.Drawing.Point(903, 106);
+            this.label37.Name = "label37";
+            this.label37.Size = new System.Drawing.Size(53, 12);
+            this.label37.TabIndex = 141;
+            this.label37.Text = "鎴愬搧缂栧彿";
+            // 
+            // textHMaterTexture
+            // 
+            this.textHMaterTexture.BackColor = System.Drawing.Color.Beige;
+            this.textHMaterTexture.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.textHMaterTexture.Location = new System.Drawing.Point(967, 75);
+            this.textHMaterTexture.Name = "textHMaterTexture";
+            this.textHMaterTexture.Size = new System.Drawing.Size(187, 21);
+            this.textHMaterTexture.TabIndex = 140;
+            // 
+            // label36
+            // 
+            this.label36.AutoSize = true;
+            this.label36.ForeColor = System.Drawing.Color.Black;
+            this.label36.Location = new System.Drawing.Point(903, 79);
+            this.label36.Name = "label36";
+            this.label36.Size = new System.Drawing.Size(53, 12);
+            this.label36.TabIndex = 139;
+            this.label36.Text = "鏉�    璐�";
+            // 
+            // textHPicNumAssemble
+            // 
+            this.textHPicNumAssemble.BackColor = System.Drawing.Color.Beige;
+            this.textHPicNumAssemble.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.textHPicNumAssemble.Location = new System.Drawing.Point(967, 48);
+            this.textHPicNumAssemble.Name = "textHPicNumAssemble";
+            this.textHPicNumAssemble.Size = new System.Drawing.Size(187, 21);
+            this.textHPicNumAssemble.TabIndex = 138;
+            // 
+            // label34
+            // 
+            this.label34.AutoSize = true;
+            this.label34.ForeColor = System.Drawing.Color.Black;
+            this.label34.Location = new System.Drawing.Point(903, 52);
+            this.label34.Name = "label34";
+            this.label34.Size = new System.Drawing.Size(53, 12);
+            this.label34.TabIndex = 137;
+            this.label34.Text = "鎬昏鍥惧彿";
+            // 
+            // textHPicNumVer
+            // 
+            this.textHPicNumVer.BackColor = System.Drawing.Color.Beige;
+            this.textHPicNumVer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.textHPicNumVer.Location = new System.Drawing.Point(967, 21);
+            this.textHPicNumVer.Name = "textHPicNumVer";
+            this.textHPicNumVer.Size = new System.Drawing.Size(187, 21);
+            this.textHPicNumVer.TabIndex = 136;
+            // 
+            // label32
+            // 
+            this.label32.AutoSize = true;
+            this.label32.ForeColor = System.Drawing.Color.Black;
+            this.label32.Location = new System.Drawing.Point(903, 25);
+            this.label32.Name = "label32";
+            this.label32.Size = new System.Drawing.Size(53, 12);
+            this.label32.TabIndex = 135;
+            this.label32.Text = "鍥惧彿鐗堟湰";
+            // 
             // chkHUseFlag
             // 
             this.chkHUseFlag.AutoSize = true;
@@ -805,7 +930,7 @@
             this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
             this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
             this.cmdHGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdHGroupID.Location = new System.Drawing.Point(828, 106);
+            this.cmdHGroupID.Location = new System.Drawing.Point(828, 101);
             this.cmdHGroupID.Name = "cmdHGroupID";
             this.cmdHGroupID.Size = new System.Drawing.Size(22, 22);
             this.cmdHGroupID.TabIndex = 133;
@@ -816,7 +941,7 @@
             // 
             this.txtHGroupID.BackColor = System.Drawing.Color.Beige;
             this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHGroupID.Location = new System.Drawing.Point(667, 105);
+            this.txtHGroupID.Location = new System.Drawing.Point(667, 102);
             this.txtHGroupID.Name = "txtHGroupID";
             this.txtHGroupID.Size = new System.Drawing.Size(161, 21);
             this.txtHGroupID.TabIndex = 132;
@@ -826,7 +951,7 @@
             // 
             this.label31.AutoSize = true;
             this.label31.ForeColor = System.Drawing.Color.Black;
-            this.label31.Location = new System.Drawing.Point(606, 108);
+            this.label31.Location = new System.Drawing.Point(605, 106);
             this.label31.Name = "label31";
             this.label31.Size = new System.Drawing.Size(53, 12);
             this.label31.TabIndex = 131;
@@ -836,7 +961,7 @@
             // 
             this.txtHMainPrice.BackColor = System.Drawing.Color.Beige;
             this.txtHMainPrice.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMainPrice.Location = new System.Drawing.Point(667, 132);
+            this.txtHMainPrice.Location = new System.Drawing.Point(667, 129);
             this.txtHMainPrice.Name = "txtHMainPrice";
             this.txtHMainPrice.Size = new System.Drawing.Size(187, 21);
             this.txtHMainPrice.TabIndex = 130;
@@ -845,7 +970,7 @@
             // 
             this.label30.AutoSize = true;
             this.label30.ForeColor = System.Drawing.Color.Black;
-            this.label30.Location = new System.Drawing.Point(605, 135);
+            this.label30.Location = new System.Drawing.Point(605, 133);
             this.label30.Name = "label30";
             this.label30.Size = new System.Drawing.Size(53, 12);
             this.label30.TabIndex = 129;
@@ -855,7 +980,7 @@
             // 
             this.txtHDelSourceRate.BackColor = System.Drawing.Color.Beige;
             this.txtHDelSourceRate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHDelSourceRate.Location = new System.Drawing.Point(667, 160);
+            this.txtHDelSourceRate.Location = new System.Drawing.Point(667, 156);
             this.txtHDelSourceRate.Name = "txtHDelSourceRate";
             this.txtHDelSourceRate.Size = new System.Drawing.Size(187, 21);
             this.txtHDelSourceRate.TabIndex = 128;
@@ -864,7 +989,7 @@
             // 
             this.label29.AutoSize = true;
             this.label29.ForeColor = System.Drawing.Color.Black;
-            this.label29.Location = new System.Drawing.Point(596, 163);
+            this.label29.Location = new System.Drawing.Point(593, 160);
             this.label29.Name = "label29";
             this.label29.Size = new System.Drawing.Size(65, 12);
             this.label29.TabIndex = 127;
@@ -874,7 +999,7 @@
             // 
             this.txtHAddSourceRate.BackColor = System.Drawing.Color.Beige;
             this.txtHAddSourceRate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHAddSourceRate.Location = new System.Drawing.Point(384, 160);
+            this.txtHAddSourceRate.Location = new System.Drawing.Point(384, 156);
             this.txtHAddSourceRate.Name = "txtHAddSourceRate";
             this.txtHAddSourceRate.Size = new System.Drawing.Size(187, 21);
             this.txtHAddSourceRate.TabIndex = 126;
@@ -883,7 +1008,7 @@
             // 
             this.label28.AutoSize = true;
             this.label28.ForeColor = System.Drawing.Color.Black;
-            this.label28.Location = new System.Drawing.Point(310, 163);
+            this.label28.Location = new System.Drawing.Point(312, 160);
             this.label28.Name = "label28";
             this.label28.Size = new System.Drawing.Size(65, 12);
             this.label28.TabIndex = 125;
@@ -893,7 +1018,7 @@
             // 
             this.txtHStdSourceQty.BackColor = System.Drawing.Color.Beige;
             this.txtHStdSourceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHStdSourceQty.Location = new System.Drawing.Point(92, 160);
+            this.txtHStdSourceQty.Location = new System.Drawing.Point(91, 156);
             this.txtHStdSourceQty.Name = "txtHStdSourceQty";
             this.txtHStdSourceQty.Size = new System.Drawing.Size(187, 21);
             this.txtHStdSourceQty.TabIndex = 124;
@@ -902,7 +1027,7 @@
             // 
             this.label26.AutoSize = true;
             this.label26.ForeColor = System.Drawing.Color.Black;
-            this.label26.Location = new System.Drawing.Point(18, 163);
+            this.label26.Location = new System.Drawing.Point(16, 160);
             this.label26.Name = "label26";
             this.label26.Size = new System.Drawing.Size(65, 12);
             this.label26.TabIndex = 123;
@@ -913,7 +1038,7 @@
             this.cmdHMainCenterID.BackColor = System.Drawing.Color.Transparent;
             this.cmdHMainCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMainCenterID.Image")));
             this.cmdHMainCenterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdHMainCenterID.Location = new System.Drawing.Point(546, 106);
+            this.cmdHMainCenterID.Location = new System.Drawing.Point(546, 101);
             this.cmdHMainCenterID.Name = "cmdHMainCenterID";
             this.cmdHMainCenterID.Size = new System.Drawing.Size(22, 22);
             this.cmdHMainCenterID.TabIndex = 122;
@@ -925,7 +1050,7 @@
             this.cmdHMainProcID.BackColor = System.Drawing.Color.Transparent;
             this.cmdHMainProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMainProcID.Image")));
             this.cmdHMainProcID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdHMainProcID.Location = new System.Drawing.Point(257, 105);
+            this.cmdHMainProcID.Location = new System.Drawing.Point(257, 101);
             this.cmdHMainProcID.Name = "cmdHMainProcID";
             this.cmdHMainProcID.Size = new System.Drawing.Size(22, 22);
             this.cmdHMainProcID.TabIndex = 121;
@@ -940,7 +1065,7 @@
             this.cmbHMainTimeUnit.Items.AddRange(new object[] {
             "灏忔椂",
             "澶�"});
-            this.cmbHMainTimeUnit.Location = new System.Drawing.Point(667, 80);
+            this.cmbHMainTimeUnit.Location = new System.Drawing.Point(667, 75);
             this.cmbHMainTimeUnit.Name = "cmbHMainTimeUnit";
             this.cmbHMainTimeUnit.Size = new System.Drawing.Size(187, 20);
             this.cmbHMainTimeUnit.TabIndex = 120;
@@ -949,7 +1074,7 @@
             // 
             this.label24.AutoSize = true;
             this.label24.ForeColor = System.Drawing.Color.Black;
-            this.label24.Location = new System.Drawing.Point(608, 83);
+            this.label24.Location = new System.Drawing.Point(605, 79);
             this.label24.Name = "label24";
             this.label24.Size = new System.Drawing.Size(53, 12);
             this.label24.TabIndex = 119;
@@ -959,7 +1084,7 @@
             // 
             this.txtHMainUnitTime.BackColor = System.Drawing.Color.Beige;
             this.txtHMainUnitTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMainUnitTime.Location = new System.Drawing.Point(385, 132);
+            this.txtHMainUnitTime.Location = new System.Drawing.Point(385, 129);
             this.txtHMainUnitTime.Name = "txtHMainUnitTime";
             this.txtHMainUnitTime.Size = new System.Drawing.Size(183, 21);
             this.txtHMainUnitTime.TabIndex = 92;
@@ -968,7 +1093,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.ForeColor = System.Drawing.Color.Black;
-            this.label18.Location = new System.Drawing.Point(322, 136);
+            this.label18.Location = new System.Drawing.Point(324, 133);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(53, 12);
             this.label18.TabIndex = 91;
@@ -978,7 +1103,7 @@
             // 
             this.txtHMainWorkQty.BackColor = System.Drawing.Color.Beige;
             this.txtHMainWorkQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMainWorkQty.Location = new System.Drawing.Point(92, 133);
+            this.txtHMainWorkQty.Location = new System.Drawing.Point(91, 129);
             this.txtHMainWorkQty.Name = "txtHMainWorkQty";
             this.txtHMainWorkQty.Size = new System.Drawing.Size(187, 21);
             this.txtHMainWorkQty.TabIndex = 90;
@@ -987,7 +1112,7 @@
             // 
             this.label12.AutoSize = true;
             this.label12.ForeColor = System.Drawing.Color.Black;
-            this.label12.Location = new System.Drawing.Point(18, 136);
+            this.label12.Location = new System.Drawing.Point(28, 133);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(53, 12);
             this.label12.TabIndex = 89;
@@ -997,7 +1122,7 @@
             // 
             this.txtHMainCenterID.BackColor = System.Drawing.Color.Beige;
             this.txtHMainCenterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMainCenterID.Location = new System.Drawing.Point(385, 105);
+            this.txtHMainCenterID.Location = new System.Drawing.Point(385, 102);
             this.txtHMainCenterID.Name = "txtHMainCenterID";
             this.txtHMainCenterID.Size = new System.Drawing.Size(161, 21);
             this.txtHMainCenterID.TabIndex = 88;
@@ -1007,7 +1132,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.ForeColor = System.Drawing.Color.Black;
-            this.label7.Location = new System.Drawing.Point(324, 108);
+            this.label7.Location = new System.Drawing.Point(324, 106);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(53, 12);
             this.label7.TabIndex = 87;
@@ -1017,7 +1142,7 @@
             // 
             this.txtHMainProcID.BackColor = System.Drawing.Color.Beige;
             this.txtHMainProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMainProcID.Location = new System.Drawing.Point(92, 106);
+            this.txtHMainProcID.Location = new System.Drawing.Point(91, 102);
             this.txtHMainProcID.Name = "txtHMainProcID";
             this.txtHMainProcID.Size = new System.Drawing.Size(165, 21);
             this.txtHMainProcID.TabIndex = 86;
@@ -1027,7 +1152,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.ForeColor = System.Drawing.Color.Black;
-            this.label6.Location = new System.Drawing.Point(18, 109);
+            this.label6.Location = new System.Drawing.Point(28, 106);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(53, 12);
             this.label6.TabIndex = 85;
@@ -1047,7 +1172,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(605, 54);
+            this.label3.Location = new System.Drawing.Point(605, 52);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(53, 12);
             this.label3.TabIndex = 83;
@@ -1057,7 +1182,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(324, 54);
+            this.label1.Location = new System.Drawing.Point(324, 52);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(53, 12);
             this.label1.TabIndex = 82;
@@ -1066,7 +1191,7 @@
             // txtHMaterModel
             // 
             this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMaterModel.Location = new System.Drawing.Point(667, 51);
+            this.txtHMaterModel.Location = new System.Drawing.Point(667, 48);
             this.txtHMaterModel.Name = "txtHMaterModel";
             this.txtHMaterModel.ReadOnly = true;
             this.txtHMaterModel.Size = new System.Drawing.Size(187, 21);
@@ -1076,7 +1201,7 @@
             // txtHMaterName
             // 
             this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHMaterName.Location = new System.Drawing.Point(385, 50);
+            this.txtHMaterName.Location = new System.Drawing.Point(385, 48);
             this.txtHMaterName.Name = "txtHMaterName";
             this.txtHMaterName.ReadOnly = true;
             this.txtHMaterName.Size = new System.Drawing.Size(183, 21);
@@ -1088,7 +1213,7 @@
             this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
             this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
             this.cmdHMaterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdHMaterID.Location = new System.Drawing.Point(257, 49);
+            this.cmdHMaterID.Location = new System.Drawing.Point(257, 47);
             this.cmdHMaterID.Name = "cmdHMaterID";
             this.cmdHMaterID.Size = new System.Drawing.Size(22, 22);
             this.cmdHMaterID.TabIndex = 79;
@@ -1100,7 +1225,7 @@
             this.cmdHRoutingGroupID.BackColor = System.Drawing.Color.Transparent;
             this.cmdHRoutingGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHRoutingGroupID.Image")));
             this.cmdHRoutingGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdHRoutingGroupID.Location = new System.Drawing.Point(546, 75);
+            this.cmdHRoutingGroupID.Location = new System.Drawing.Point(546, 74);
             this.cmdHRoutingGroupID.Name = "cmdHRoutingGroupID";
             this.cmdHRoutingGroupID.Size = new System.Drawing.Size(22, 22);
             this.cmdHRoutingGroupID.TabIndex = 78;
@@ -1112,7 +1237,7 @@
             this.cmdHUnitID.BackColor = System.Drawing.Color.Transparent;
             this.cmdHUnitID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHUnitID.Image")));
             this.cmdHUnitID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdHUnitID.Location = new System.Drawing.Point(257, 77);
+            this.cmdHUnitID.Location = new System.Drawing.Point(257, 74);
             this.cmdHUnitID.Name = "cmdHUnitID";
             this.cmdHUnitID.Size = new System.Drawing.Size(22, 22);
             this.cmdHUnitID.TabIndex = 77;
@@ -1123,7 +1248,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(300, 80);
+            this.label5.Location = new System.Drawing.Point(300, 79);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(77, 12);
             this.label5.TabIndex = 62;
@@ -1132,7 +1257,7 @@
             // txtHRoutingGroupID
             // 
             this.txtHRoutingGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHRoutingGroupID.Location = new System.Drawing.Point(385, 77);
+            this.txtHRoutingGroupID.Location = new System.Drawing.Point(385, 75);
             this.txtHRoutingGroupID.Name = "txtHRoutingGroupID";
             this.txtHRoutingGroupID.Size = new System.Drawing.Size(161, 21);
             this.txtHRoutingGroupID.TabIndex = 63;
@@ -1142,7 +1267,7 @@
             // 
             this.txtHName.BackColor = System.Drawing.Color.Beige;
             this.txtHName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHName.Location = new System.Drawing.Point(667, 20);
+            this.txtHName.Location = new System.Drawing.Point(667, 21);
             this.txtHName.Name = "txtHName";
             this.txtHName.Size = new System.Drawing.Size(187, 21);
             this.txtHName.TabIndex = 59;
@@ -1151,7 +1276,7 @@
             // 
             this.label22.AutoSize = true;
             this.label22.ForeColor = System.Drawing.Color.Black;
-            this.label22.Location = new System.Drawing.Point(581, 23);
+            this.label22.Location = new System.Drawing.Point(581, 25);
             this.label22.Name = "label22";
             this.label22.Size = new System.Drawing.Size(77, 12);
             this.label22.TabIndex = 58;
@@ -1160,7 +1285,7 @@
             // txtHRemark
             // 
             this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHRemark.Location = new System.Drawing.Point(91, 187);
+            this.txtHRemark.Location = new System.Drawing.Point(91, 183);
             this.txtHRemark.Name = "txtHRemark";
             this.txtHRemark.Size = new System.Drawing.Size(480, 21);
             this.txtHRemark.TabIndex = 57;
@@ -1169,7 +1294,7 @@
             // 
             this.label20.AutoSize = true;
             this.label20.ForeColor = System.Drawing.Color.Black;
-            this.label20.Location = new System.Drawing.Point(18, 190);
+            this.label20.Location = new System.Drawing.Point(28, 190);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(53, 12);
             this.label20.TabIndex = 56;
@@ -1190,7 +1315,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.ForeColor = System.Drawing.Color.Black;
-            this.label16.Location = new System.Drawing.Point(18, 50);
+            this.label16.Location = new System.Drawing.Point(28, 52);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(53, 12);
             this.label16.TabIndex = 43;
@@ -1209,7 +1334,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.ForeColor = System.Drawing.Color.Black;
-            this.label9.Location = new System.Drawing.Point(324, 23);
+            this.label9.Location = new System.Drawing.Point(324, 25);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(53, 12);
             this.label9.TabIndex = 31;
@@ -1614,101 +1739,6 @@
             this.grdPrint.TabIndex = 46;
             this.grdPrint.Visible = false;
             // 
-            // label32
-            // 
-            this.label32.AutoSize = true;
-            this.label32.ForeColor = System.Drawing.Color.Black;
-            this.label32.Location = new System.Drawing.Point(884, 23);
-            this.label32.Name = "label32";
-            this.label32.Size = new System.Drawing.Size(53, 12);
-            this.label32.TabIndex = 135;
-            this.label32.Text = "鍥惧彿鐗堟湰";
-            // 
-            // textHPicNumVer
-            // 
-            this.textHPicNumVer.BackColor = System.Drawing.Color.Beige;
-            this.textHPicNumVer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.textHPicNumVer.Location = new System.Drawing.Point(967, 20);
-            this.textHPicNumVer.Name = "textHPicNumVer";
-            this.textHPicNumVer.Size = new System.Drawing.Size(187, 21);
-            this.textHPicNumVer.TabIndex = 136;
-            // 
-            // textHPicNumAssemble
-            // 
-            this.textHPicNumAssemble.BackColor = System.Drawing.Color.Beige;
-            this.textHPicNumAssemble.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.textHPicNumAssemble.Location = new System.Drawing.Point(967, 51);
-            this.textHPicNumAssemble.Name = "textHPicNumAssemble";
-            this.textHPicNumAssemble.Size = new System.Drawing.Size(187, 21);
-            this.textHPicNumAssemble.TabIndex = 138;
-            // 
-            // label34
-            // 
-            this.label34.AutoSize = true;
-            this.label34.ForeColor = System.Drawing.Color.Black;
-            this.label34.Location = new System.Drawing.Point(884, 54);
-            this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(53, 12);
-            this.label34.TabIndex = 137;
-            this.label34.Text = "鎬昏鍥惧彿";
-            // 
-            // textHMaterTexture
-            // 
-            this.textHMaterTexture.BackColor = System.Drawing.Color.Beige;
-            this.textHMaterTexture.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.textHMaterTexture.Location = new System.Drawing.Point(967, 78);
-            this.textHMaterTexture.Name = "textHMaterTexture";
-            this.textHMaterTexture.Size = new System.Drawing.Size(187, 21);
-            this.textHMaterTexture.TabIndex = 140;
-            // 
-            // label36
-            // 
-            this.label36.AutoSize = true;
-            this.label36.ForeColor = System.Drawing.Color.Black;
-            this.label36.Location = new System.Drawing.Point(884, 82);
-            this.label36.Name = "label36";
-            this.label36.Size = new System.Drawing.Size(29, 12);
-            this.label36.TabIndex = 139;
-            this.label36.Text = "鏉愯川";
-            // 
-            // textHProductNum
-            // 
-            this.textHProductNum.BackColor = System.Drawing.Color.Beige;
-            this.textHProductNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.textHProductNum.Location = new System.Drawing.Point(967, 110);
-            this.textHProductNum.Name = "textHProductNum";
-            this.textHProductNum.Size = new System.Drawing.Size(187, 21);
-            this.textHProductNum.TabIndex = 142;
-            // 
-            // label37
-            // 
-            this.label37.AutoSize = true;
-            this.label37.ForeColor = System.Drawing.Color.Black;
-            this.label37.Location = new System.Drawing.Point(884, 113);
-            this.label37.Name = "label37";
-            this.label37.Size = new System.Drawing.Size(53, 12);
-            this.label37.TabIndex = 141;
-            this.label37.Text = "鎴愬搧缂栧彿";
-            // 
-            // textHVerNum
-            // 
-            this.textHVerNum.BackColor = System.Drawing.Color.Beige;
-            this.textHVerNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.textHVerNum.Location = new System.Drawing.Point(967, 137);
-            this.textHVerNum.Name = "textHVerNum";
-            this.textHVerNum.Size = new System.Drawing.Size(187, 21);
-            this.textHVerNum.TabIndex = 144;
-            // 
-            // label38
-            // 
-            this.label38.AutoSize = true;
-            this.label38.ForeColor = System.Drawing.Color.Black;
-            this.label38.Location = new System.Drawing.Point(884, 140);
-            this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(29, 12);
-            this.label38.TabIndex = 143;
-            this.label38.Text = "鐗堟湰";
-            // 
             // Gy_RoutingBill
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1894,5 +1924,7 @@
         private System.Windows.Forms.Label label34;
         private System.Windows.Forms.TextBox textHPicNumVer;
         private System.Windows.Forms.Label label32;
+        private System.Windows.Forms.ComboBox cmbHOrgID;
+        private System.Windows.Forms.Label label39;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1