From 22eec752e72650a42c7208397fefdcb0e61a749d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 19 四月 2022 10:34:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Sc_ICMOToBarCode.designer.cs | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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 dca0cd7..8970d29 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"
@@ -119,7 +119,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1172, 50);
+ this.Tool.Size = new System.Drawing.Size(1069, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -224,7 +224,7 @@
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);
@@ -420,7 +420,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(862, 68);
+ 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);
@@ -454,7 +454,7 @@
//
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, 189);
+ 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);
@@ -467,7 +467,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, 247);
+ 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);
@@ -480,7 +480,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, 296);
+ 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);
@@ -491,7 +491,7 @@
//
// 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;
@@ -503,7 +503,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;
@@ -513,7 +513,7 @@
//
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(883, 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;
@@ -522,7 +522,7 @@
//
// 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);
@@ -545,7 +545,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;
//
@@ -687,7 +687,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(900, 190);
+ this.鏁寸鏁伴噺.Location = new System.Drawing.Point(796, 190);
this.鏁寸鏁伴噺.Name = "鏁寸鏁伴噺";
this.鏁寸鏁伴噺.Size = new System.Drawing.Size(120, 27);
this.鏁寸鏁伴噺.TabIndex = 148;
@@ -695,7 +695,7 @@
//
// txtHZXQty
//
- this.txtHZXQty.Location = new System.Drawing.Point(900, 221);
+ 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);
@@ -708,7 +708,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
@@ -717,7 +717,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;
@@ -752,7 +752,7 @@
//
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(900, 436);
+ 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);
@@ -765,7 +765,7 @@
//
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(1036, 378);
+ 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);
@@ -778,7 +778,7 @@
//
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(1036, 436);
+ 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);
@@ -791,8 +791,9 @@
//
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, 844);
+ this.ClientSize = new System.Drawing.Size(1069, 844);
this.Controls.Add(this.button7);
this.Controls.Add(this.button3);
this.Controls.Add(this.button2);
--
Gitblit v1.9.1