From f9ef44a67fbf73f073efe65600bc25e204fde04f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 17:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/条码打印/Sc_ICMOToBarCode.designer.cs |  235 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 150 insertions(+), 85 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
index 02598f9..7404c4a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
@@ -30,6 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sc_ICMOToBarCode));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             this.Tool = new System.Windows.Forms.ToolStrip();
             this.tc = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -38,6 +39,7 @@
             this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
             this.bclk = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+            this.cz = new System.Windows.Forms.ToolStripButton();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.timer2 = new System.Windows.Forms.Timer(this.components);
             this.grdMain = new System.Windows.Forms.DataGridView();
@@ -53,11 +55,11 @@
             this.txtHMaterID = new System.Windows.Forms.TextBox();
             this.cmdHMaterID = new System.Windows.Forms.Button();
             this.gbUp = new System.Windows.Forms.GroupBox();
+            this.txtHSeOrderBillNo = new System.Windows.Forms.TextBox();
+            this.label9 = new System.Windows.Forms.Label();
             this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
             this.label8 = new System.Windows.Forms.Label();
             this.cmdHSaveBill = new System.Windows.Forms.Button();
-            this.dtpHEndDate = new System.Windows.Forms.DateTimePicker();
-            this.label5 = new System.Windows.Forms.Label();
             this.dtpHBeginDate = new System.Windows.Forms.DateTimePicker();
             this.label6 = new System.Windows.Forms.Label();
             this.button4 = new System.Windows.Forms.Button();
@@ -80,13 +82,15 @@
             this.cmdHMaterID1 = new System.Windows.Forms.Button();
             this.grdSub = new System.Windows.Forms.DataGridView();
             this.button1 = new System.Windows.Forms.Button();
-            this.璁㈠崟鏁伴噺 = new System.Windows.Forms.Label();
-            this.txtHICMOQty = new System.Windows.Forms.TextBox();
+            this.鏁寸鏁伴噺 = new System.Windows.Forms.Label();
+            this.txtHZXQty = new System.Windows.Forms.TextBox();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.grdList = new System.Windows.Forms.DataGridView();
-            this.cz = new System.Windows.Forms.ToolStripButton();
+            this.button2 = new System.Windows.Forms.Button();
+            this.button3 = new System.Windows.Forms.Button();
+            this.button7 = new System.Windows.Forms.Button();
             this.Tool.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
             this.gbUp.SuspendLayout();
@@ -186,6 +190,20 @@
             this.toolStripSeparator8.Name = "toolStripSeparator8";
             this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
             // 
+            // cz
+            // 
+            this.cz.AutoSize = false;
+            this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
+            this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.cz.Name = "cz";
+            this.cz.Size = new System.Drawing.Size(35, 47);
+            this.cz.Text = "閲嶇疆";
+            this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cz.Click += new System.EventHandler(this.cz_Click);
+            // 
             // timer1
             // 
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
@@ -201,12 +219,21 @@
             this.grdMain.AllowUserToDeleteRows = false;
             this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
             this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;
             this.grdMain.Location = new System.Drawing.Point(4, 6);
             this.grdMain.Margin = new System.Windows.Forms.Padding(0);
             this.grdMain.Name = "grdMain";
             this.grdMain.ReadOnly = true;
+            this.grdMain.RowHeadersWidth = 51;
             this.grdMain.RowTemplate.Height = 23;
-            this.grdMain.Size = new System.Drawing.Size(866, 263);
+            this.grdMain.Size = new System.Drawing.Size(867, 263);
             this.grdMain.TabIndex = 19;
             this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
             this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
@@ -287,7 +314,7 @@
             // cmdHEmpID
             // 
             this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
-            this.cmdHEmpID.Location = new System.Drawing.Point(814, 27);
+            this.cmdHEmpID.Location = new System.Drawing.Point(817, 27);
             this.cmdHEmpID.Name = "cmdHEmpID";
             this.cmdHEmpID.Size = new System.Drawing.Size(32, 32);
             this.cmdHEmpID.TabIndex = 54;
@@ -304,6 +331,7 @@
             this.label4.Size = new System.Drawing.Size(40, 16);
             this.label4.TabIndex = 55;
             this.label4.Text = "鐗╂枡";
+            this.label4.Visible = false;
             // 
             // txtHMaterID
             // 
@@ -323,16 +351,17 @@
             this.cmdHMaterID.Size = new System.Drawing.Size(32, 32);
             this.cmdHMaterID.TabIndex = 57;
             this.cmdHMaterID.UseVisualStyleBackColor = true;
+            this.cmdHMaterID.Visible = false;
             this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
             // 
             // gbUp
             // 
             this.gbUp.BackColor = System.Drawing.Color.Transparent;
+            this.gbUp.Controls.Add(this.txtHSeOrderBillNo);
+            this.gbUp.Controls.Add(this.label9);
             this.gbUp.Controls.Add(this.cmbHBarCodeType);
             this.gbUp.Controls.Add(this.label8);
             this.gbUp.Controls.Add(this.cmdHSaveBill);
-            this.gbUp.Controls.Add(this.dtpHEndDate);
-            this.gbUp.Controls.Add(this.label5);
             this.gbUp.Controls.Add(this.dtpHBeginDate);
             this.gbUp.Controls.Add(this.label6);
             this.gbUp.Controls.Add(this.label4);
@@ -348,18 +377,38 @@
             this.gbUp.Controls.Add(this.cmdHEmpID);
             this.gbUp.Location = new System.Drawing.Point(11, 55);
             this.gbUp.Name = "gbUp";
-            this.gbUp.Size = new System.Drawing.Size(1148, 126);
+            this.gbUp.Size = new System.Drawing.Size(1149, 126);
             this.gbUp.TabIndex = 58;
             this.gbUp.TabStop = false;
+            // 
+            // txtHSeOrderBillNo
+            // 
+            this.txtHSeOrderBillNo.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.txtHSeOrderBillNo.Location = new System.Drawing.Point(112, 79);
+            this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
+            this.txtHSeOrderBillNo.ReadOnly = true;
+            this.txtHSeOrderBillNo.Size = new System.Drawing.Size(123, 30);
+            this.txtHSeOrderBillNo.TabIndex = 141;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.ForeColor = System.Drawing.Color.Black;
+            this.label9.Location = new System.Drawing.Point(19, 85);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(88, 16);
+            this.label9.TabIndex = 140;
+            this.label9.Text = "閿�鍞鍗曞彿";
             // 
             // cmbHBarCodeType
             // 
             this.cmbHBarCodeType.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cmbHBarCodeType.FormattingEnabled = true;
             this.cmbHBarCodeType.Items.AddRange(new object[] {
-            "鍞竴鏉$爜",
-            "鎵规鏉$爜"});
-            this.cmbHBarCodeType.Location = new System.Drawing.Point(826, 75);
+            "鍞竴鏉$爜"});
+            this.cmbHBarCodeType.Location = new System.Drawing.Point(642, 79);
             this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
             this.cmbHBarCodeType.Name = "cmbHBarCodeType";
             this.cmbHBarCodeType.Size = new System.Drawing.Size(140, 28);
@@ -370,7 +419,7 @@
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(748, 82);
+            this.label8.Location = new System.Drawing.Point(557, 86);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(72, 16);
             this.label8.TabIndex = 138;
@@ -380,7 +429,7 @@
             // 
             this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
             this.cmdHSaveBill.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmdHSaveBill.Location = new System.Drawing.Point(1010, 66);
+            this.cmdHSaveBill.Location = new System.Drawing.Point(821, 68);
             this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
             this.cmdHSaveBill.Name = "cmdHSaveBill";
             this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
@@ -389,35 +438,14 @@
             this.cmdHSaveBill.UseVisualStyleBackColor = false;
             this.cmdHSaveBill.Click += new System.EventHandler(this.cmdHSaveBill_Click);
             // 
-            // dtpHEndDate
-            // 
-            this.dtpHEndDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpHEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpHEndDate.Location = new System.Drawing.Point(478, 75);
-            this.dtpHEndDate.Margin = new System.Windows.Forms.Padding(2);
-            this.dtpHEndDate.Name = "dtpHEndDate";
-            this.dtpHEndDate.Size = new System.Drawing.Size(213, 30);
-            this.dtpHEndDate.TabIndex = 102;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(399, 83);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(72, 16);
-            this.label5.TabIndex = 101;
-            this.label5.Text = "缁撴潫鏃ユ湡";
-            // 
             // dtpHBeginDate
             // 
             this.dtpHBeginDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpHBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpHBeginDate.Location = new System.Drawing.Point(112, 77);
+            this.dtpHBeginDate.Location = new System.Drawing.Point(336, 77);
             this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2);
             this.dtpHBeginDate.Name = "dtpHBeginDate";
-            this.dtpHBeginDate.Size = new System.Drawing.Size(213, 30);
+            this.dtpHBeginDate.Size = new System.Drawing.Size(154, 30);
             this.dtpHBeginDate.TabIndex = 100;
             // 
             // label6
@@ -425,17 +453,17 @@
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.ForeColor = System.Drawing.Color.Black;
-            this.label6.Location = new System.Drawing.Point(33, 85);
+            this.label6.Location = new System.Drawing.Point(257, 85);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(72, 16);
             this.label6.TabIndex = 99;
-            this.label6.Text = "寮�濮嬫棩鏈�";
+            this.label6.Text = "鏃�    鏈�";
             // 
             // button4
             // 
             this.button4.BackColor = System.Drawing.Color.White;
             this.button4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button4.Location = new System.Drawing.Point(1036, 218);
+            this.button4.Location = new System.Drawing.Point(932, 189);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(112, 50);
@@ -448,7 +476,7 @@
             // 
             this.button5.BackColor = System.Drawing.Color.White;
             this.button5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button5.Location = new System.Drawing.Point(1036, 297);
+            this.button5.Location = new System.Drawing.Point(932, 247);
             this.button5.Margin = new System.Windows.Forms.Padding(2);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(112, 42);
@@ -461,7 +489,7 @@
             // 
             this.button6.BackColor = System.Drawing.Color.White;
             this.button6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button6.Location = new System.Drawing.Point(1036, 379);
+            this.button6.Location = new System.Drawing.Point(932, 296);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(112, 44);
@@ -472,9 +500,10 @@
             // 
             // txtHMiniQty
             // 
-            this.txtHMiniQty.Location = new System.Drawing.Point(898, 296);
+            this.txtHMiniQty.Location = new System.Drawing.Point(794, 296);
             this.txtHMiniQty.Multiline = true;
             this.txtHMiniQty.Name = "txtHMiniQty";
+            this.txtHMiniQty.ReadOnly = true;
             this.txtHMiniQty.Size = new System.Drawing.Size(112, 42);
             this.txtHMiniQty.TabIndex = 141;
             this.txtHMiniQty.TextChanged += new System.EventHandler(this.txtHMiniQty_TextChanged);
@@ -483,7 +512,7 @@
             // 
             this.鏍囧噯瑁呯.AutoSize = true;
             this.鏍囧噯瑁呯.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.鏍囧噯瑁呯.Location = new System.Drawing.Point(894, 265);
+            this.鏍囧噯瑁呯.Location = new System.Drawing.Point(790, 265);
             this.鏍囧噯瑁呯.Name = "鏍囧噯瑁呯";
             this.鏍囧噯瑁呯.Size = new System.Drawing.Size(120, 27);
             this.鏍囧噯瑁呯.TabIndex = 142;
@@ -493,19 +522,21 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(877, 349);
+            this.label7.Location = new System.Drawing.Point(779, 349);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(174, 27);
             this.label7.TabIndex = 144;
             this.label7.Text = "鏈鐢熸垚鏁伴噺";
+            this.label7.Visible = false;
             // 
             // txtHBQty
             // 
-            this.txtHBQty.Location = new System.Drawing.Point(901, 380);
+            this.txtHBQty.Location = new System.Drawing.Point(797, 380);
             this.txtHBQty.Multiline = true;
             this.txtHBQty.Name = "txtHBQty";
             this.txtHBQty.Size = new System.Drawing.Size(112, 42);
             this.txtHBQty.TabIndex = 143;
+            this.txtHBQty.Visible = false;
             this.txtHBQty.TextChanged += new System.EventHandler(this.txtHBQty_TextChanged);
             // 
             // groupBox1
@@ -523,7 +554,7 @@
             this.groupBox1.Controls.Add(this.cmdHMaterID1);
             this.groupBox1.Location = new System.Drawing.Point(10, 485);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(1148, 126);
+            this.groupBox1.Size = new System.Drawing.Size(1034, 126);
             this.groupBox1.TabIndex = 140;
             this.groupBox1.TabStop = false;
             // 
@@ -643,6 +674,7 @@
             this.grdSub.Location = new System.Drawing.Point(9, 618);
             this.grdSub.Name = "grdSub";
             this.grdSub.ReadOnly = true;
+            this.grdSub.RowHeadersWidth = 51;
             this.grdSub.RowTemplate.Height = 23;
             this.grdSub.Size = new System.Drawing.Size(866, 228);
             this.grdSub.TabIndex = 145;
@@ -651,7 +683,7 @@
             // 
             this.button1.BackColor = System.Drawing.Color.White;
             this.button1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(901, 688);
+            this.button1.Location = new System.Drawing.Point(900, 626);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(112, 50);
@@ -660,23 +692,23 @@
             this.button1.UseVisualStyleBackColor = false;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
-            // 璁㈠崟鏁伴噺
+            // 鏁寸鏁伴噺
             // 
-            this.璁㈠崟鏁伴噺.AutoSize = true;
-            this.璁㈠崟鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.璁㈠崟鏁伴噺.Location = new System.Drawing.Point(900, 190);
-            this.璁㈠崟鏁伴噺.Name = "璁㈠崟鏁伴噺";
-            this.璁㈠崟鏁伴噺.Size = new System.Drawing.Size(120, 27);
-            this.璁㈠崟鏁伴噺.TabIndex = 148;
-            this.璁㈠崟鏁伴噺.Text = "璁㈠崟鏁伴噺";
+            this.鏁寸鏁伴噺.AutoSize = true;
+            this.鏁寸鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.鏁寸鏁伴噺.Location = new System.Drawing.Point(796, 190);
+            this.鏁寸鏁伴噺.Name = "鏁寸鏁伴噺";
+            this.鏁寸鏁伴噺.Size = new System.Drawing.Size(120, 27);
+            this.鏁寸鏁伴噺.TabIndex = 148;
+            this.鏁寸鏁伴噺.Text = "鏈鏁伴噺";
             // 
-            // txtHICMOQty
+            // txtHZXQty
             // 
-            this.txtHICMOQty.Location = new System.Drawing.Point(900, 221);
-            this.txtHICMOQty.Multiline = true;
-            this.txtHICMOQty.Name = "txtHICMOQty";
-            this.txtHICMOQty.Size = new System.Drawing.Size(112, 42);
-            this.txtHICMOQty.TabIndex = 147;
+            this.txtHZXQty.Location = new System.Drawing.Point(796, 221);
+            this.txtHZXQty.Multiline = true;
+            this.txtHZXQty.Name = "txtHZXQty";
+            this.txtHZXQty.Size = new System.Drawing.Size(112, 42);
+            this.txtHZXQty.TabIndex = 147;
             // 
             // tabControl1
             // 
@@ -685,7 +717,7 @@
             this.tabControl1.Location = new System.Drawing.Point(9, 181);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(879, 298);
+            this.tabControl1.Size = new System.Drawing.Size(759, 298);
             this.tabControl1.TabIndex = 149;
             // 
             // tabPage1
@@ -694,7 +726,7 @@
             this.tabPage1.Location = new System.Drawing.Point(4, 22);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(871, 272);
+            this.tabPage1.Size = new System.Drawing.Size(751, 272);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "鐗╂枡淇℃伅";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -705,7 +737,7 @@
             this.tabPage2.Location = new System.Drawing.Point(4, 22);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(871, 272);
+            this.tabPage2.Size = new System.Drawing.Size(751, 272);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "鏉$爜淇℃伅";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -720,33 +752,63 @@
             this.grdList.Margin = new System.Windows.Forms.Padding(0);
             this.grdList.Name = "grdList";
             this.grdList.ReadOnly = true;
+            this.grdList.RowHeadersWidth = 51;
             this.grdList.RowTemplate.Height = 23;
             this.grdList.Size = new System.Drawing.Size(866, 269);
             this.grdList.TabIndex = 20;
             // 
-            // cz
+            // button2
             // 
-            this.cz.AutoSize = false;
-            this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
-            this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.cz.Name = "cz";
-            this.cz.Size = new System.Drawing.Size(35, 47);
-            this.cz.Text = "閲嶇疆";
-            this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
-            this.cz.Click += new System.EventHandler(this.cz_Click);
+            this.button2.BackColor = System.Drawing.Color.White;
+            this.button2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.button2.Location = new System.Drawing.Point(796, 436);
+            this.button2.Margin = new System.Windows.Forms.Padding(2);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(112, 44);
+            this.button2.TabIndex = 150;
+            this.button2.Text = "涓婁竴涓墿鏂�";
+            this.button2.UseVisualStyleBackColor = false;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // button3
+            // 
+            this.button3.BackColor = System.Drawing.Color.White;
+            this.button3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.button3.Location = new System.Drawing.Point(932, 378);
+            this.button3.Margin = new System.Windows.Forms.Padding(2);
+            this.button3.Name = "button3";
+            this.button3.Size = new System.Drawing.Size(112, 44);
+            this.button3.TabIndex = 151;
+            this.button3.Text = "涓嬩竴涓墿鏂�";
+            this.button3.UseVisualStyleBackColor = false;
+            this.button3.Click += new System.EventHandler(this.button3_Click);
+            // 
+            // button7
+            // 
+            this.button7.BackColor = System.Drawing.Color.White;
+            this.button7.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.button7.Location = new System.Drawing.Point(932, 436);
+            this.button7.Margin = new System.Windows.Forms.Padding(2);
+            this.button7.Name = "button7";
+            this.button7.Size = new System.Drawing.Size(112, 44);
+            this.button7.TabIndex = 152;
+            this.button7.Text = "瓒呴鐢熶骇";
+            this.button7.UseVisualStyleBackColor = false;
+            this.button7.Click += new System.EventHandler(this.button7_Click);
             // 
             // Sc_ICMOToBarCode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSize = true;
             this.BackColor = System.Drawing.SystemColors.ActiveCaption;
-            this.ClientSize = new System.Drawing.Size(1172, 869);
+            this.ClientSize = new System.Drawing.Size(1172, 844);
+            this.Controls.Add(this.button7);
+            this.Controls.Add(this.button3);
+            this.Controls.Add(this.button2);
             this.Controls.Add(this.tabControl1);
-            this.Controls.Add(this.璁㈠崟鏁伴噺);
-            this.Controls.Add(this.txtHICMOQty);
+            this.Controls.Add(this.鏁寸鏁伴噺);
+            this.Controls.Add(this.txtHZXQty);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.grdSub);
             this.Controls.Add(this.groupBox1);
@@ -805,8 +867,6 @@
         private System.Windows.Forms.Button cmdHMaterID;
         private System.Windows.Forms.GroupBox gbUp;
         private System.Windows.Forms.Button cmdHSaveBill;
-        private System.Windows.Forms.DateTimePicker dtpHEndDate;
-        private System.Windows.Forms.Label label5;
         private System.Windows.Forms.DateTimePicker dtpHBeginDate;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Button button4;
@@ -831,12 +891,17 @@
         private System.Windows.Forms.Button cmdHMaterID1;
         private System.Windows.Forms.DataGridView grdSub;
         private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Label 璁㈠崟鏁伴噺;
-        private System.Windows.Forms.TextBox txtHICMOQty;
+        private System.Windows.Forms.Label 鏁寸鏁伴噺;
+        private System.Windows.Forms.TextBox txtHZXQty;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabPage tabPage1;
         private System.Windows.Forms.TabPage tabPage2;
         private System.Windows.Forms.DataGridView grdList;
         private System.Windows.Forms.ToolStripButton cz;
+        private System.Windows.Forms.TextBox txtHSeOrderBillNo;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.Button button3;
+        private System.Windows.Forms.Button button7;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1