From 328bde0d2678361078f9f1a714049f7b7ad69198 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 26 十月 2022 16:47:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill.designer.cs | 144 +++++++++++++++++++++++++++++------------------
1 files changed, 89 insertions(+), 55 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index 3a12b1c..332204e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -32,13 +32,17 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeBill));
this.Tool = new System.Windows.Forms.ToolStrip();
this.dy = new System.Windows.Forms.ToolStripButton();
+ this.sdy = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.AddRow = new System.Windows.Forms.ToolStripButton();
this.spRow = new System.Windows.Forms.ToolStripButton();
+ this.bc = new System.Windows.Forms.ToolStripButton();
this.DelRow = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.bc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.wxm = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.cz = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.kc = new System.Windows.Forms.ToolStripButton();
@@ -106,7 +110,6 @@
this.grdSub = new System.Windows.Forms.DataGridView();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
- this.sdy = new System.Windows.Forms.ToolStripButton();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -136,9 +139,12 @@
this.toolStripSeparator2,
this.AddRow,
this.spRow,
+ this.bc,
this.DelRow,
this.toolStripSeparator4,
- this.bc,
+ this.toolStripSeparator8,
+ this.wxm,
+ this.toolStripSeparator9,
this.cz,
this.toolStripSeparator5,
this.kc,
@@ -176,6 +182,20 @@
this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.dy.Click += new System.EventHandler(this.dy_Click);
+ //
+ // sdy
+ //
+ this.sdy.AutoSize = false;
+ this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
+ this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sdy.Name = "sdy";
+ this.sdy.Size = new System.Drawing.Size(35, 47);
+ this.sdy.Text = "娴忚";
+ this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sdy.Click += new System.EventHandler(this.sdy_Click);
//
// yl
//
@@ -225,6 +245,20 @@
this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.spRow.Click += new System.EventHandler(this.spRow_Click);
//
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "鐢熸垚";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
// DelRow
//
this.DelRow.AutoSize = false;
@@ -243,20 +277,31 @@
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Visible = false;
//
- // bc
+ // toolStripSeparator8
//
- this.bc.AutoSize = false;
- this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
- this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.bc.Name = "bc";
- this.bc.Size = new System.Drawing.Size(35, 47);
- this.bc.Text = "鐢熸垚";
- this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.bc.Click += new System.EventHandler(this.bc_Click);
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ //
+ // wxm
+ //
+ this.wxm.AutoSize = false;
+ this.wxm.Image = ((System.Drawing.Image)(resources.GetObject("wxm.Image")));
+ this.wxm.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.wxm.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.wxm.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.wxm.Name = "wxm";
+ this.wxm.Size = new System.Drawing.Size(50, 47);
+ this.wxm.Text = "澶栫鐮�";
+ this.wxm.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.wxm.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.wxm.Click += new System.EventHandler(this.wxm_Click);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// cz
//
@@ -433,7 +478,7 @@
this.P1.Controls.Add(this.gbUp);
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
this.P1.Location = new System.Drawing.Point(55, 62);
- this.P1.Margin = new System.Windows.Forms.Padding(4);
+ this.P1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.P1.Name = "P1";
this.P1.Size = new System.Drawing.Size(1249, 171);
this.P1.TabIndex = 31;
@@ -441,7 +486,7 @@
// pic1
//
this.pic1.Location = new System.Drawing.Point(417, 4);
- this.pic1.Margin = new System.Windows.Forms.Padding(4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pic1.Name = "pic1";
this.pic1.Size = new System.Drawing.Size(104, 51);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -467,9 +512,9 @@
this.gbUp.Controls.Add(this.cmbSourceBillType);
this.gbUp.Controls.Add(this.label10);
this.gbUp.Location = new System.Drawing.Point(19, 49);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gbUp.Size = new System.Drawing.Size(1189, 100);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
@@ -479,7 +524,7 @@
this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHWorksNumber.FormattingEnabled = true;
this.cmbHWorksNumber.Location = new System.Drawing.Point(525, 21);
- this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHWorksNumber.Name = "cmbHWorksNumber";
this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
this.cmbHWorksNumber.TabIndex = 98;
@@ -518,7 +563,7 @@
this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHOrgID.FormattingEnabled = true;
this.cmbHOrgID.Location = new System.Drawing.Point(135, 21);
- this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHOrgID.Name = "cmbHOrgID";
this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
this.cmbHOrgID.TabIndex = 85;
@@ -539,7 +584,7 @@
this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHBarCodeType.FormattingEnabled = true;
this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 58);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
this.cmbHBarCodeType.TabIndex = 81;
@@ -561,7 +606,7 @@
this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
this.cmdHEmpID.Location = new System.Drawing.Point(1189, -9);
- this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHEmpID.Name = "cmdHEmpID";
this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
this.cmdHEmpID.TabIndex = 79;
@@ -573,7 +618,7 @@
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
this.cmdSourceBillNo.Location = new System.Drawing.Point(747, 56);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
this.cmdSourceBillNo.TabIndex = 42;
@@ -584,7 +629,7 @@
//
this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 58);
- this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSourceBillNo.Name = "txtHSourceBillNo";
this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
this.txtHSourceBillNo.TabIndex = 41;
@@ -607,7 +652,7 @@
this.cmbSourceBillType.FormattingEnabled = true;
this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.cmbSourceBillType.Location = new System.Drawing.Point(135, 58);
- this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbSourceBillType.Name = "cmbSourceBillType";
this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
this.cmbSourceBillType.TabIndex = 36;
@@ -648,7 +693,7 @@
this.panel2.Controls.Add(this.label8);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(55, 633);
- this.panel2.Margin = new System.Windows.Forms.Padding(4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1249, 116);
this.panel2.TabIndex = 32;
@@ -882,7 +927,7 @@
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
this.panel1.Location = new System.Drawing.Point(0, 62);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(55, 687);
this.panel1.TabIndex = 33;
@@ -891,7 +936,7 @@
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
this.panel3.Location = new System.Drawing.Point(1304, 62);
- this.panel3.Margin = new System.Windows.Forms.Padding(4);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(52, 687);
this.panel3.TabIndex = 34;
@@ -906,7 +951,7 @@
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.grdMain.Location = new System.Drawing.Point(4, 4);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
@@ -929,7 +974,7 @@
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
this.grdSum.Location = new System.Drawing.Point(55, 609);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
@@ -942,7 +987,7 @@
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdPrint.Location = new System.Drawing.Point(1079, 679);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
@@ -957,7 +1002,7 @@
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(55, 233);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1249, 376);
@@ -967,9 +1012,9 @@
//
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Size = new System.Drawing.Size(1241, 347);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鐗╂枡淇℃伅";
@@ -979,9 +1024,9 @@
//
this.tabPage2.Controls.Add(this.grdSub);
this.tabPage2.Location = new System.Drawing.Point(4, 25);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Size = new System.Drawing.Size(1241, 347);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏉＄爜淇℃伅";
@@ -997,7 +1042,7 @@
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.grdSub.Location = new System.Drawing.Point(4, 4);
- this.grdSub.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSub.Name = "grdSub";
this.grdSub.ReadOnly = true;
this.grdSub.RowHeadersWidth = 30;
@@ -1012,7 +1057,7 @@
//
this.tabPage3.Controls.Add(this.grdList);
this.tabPage3.Location = new System.Drawing.Point(4, 25);
- this.tabPage3.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1241, 347);
this.tabPage3.TabIndex = 2;
@@ -1029,27 +1074,13 @@
this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.grdList.Location = new System.Drawing.Point(0, 0);
- this.grdList.Margin = new System.Windows.Forms.Padding(4);
+ this.grdList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdList.Name = "grdList";
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
this.grdList.Size = new System.Drawing.Size(1241, 347);
this.grdList.TabIndex = 46;
- //
- // sdy
- //
- this.sdy.AutoSize = false;
- this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
- this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sdy.Name = "sdy";
- this.sdy.Size = new System.Drawing.Size(35, 47);
- this.sdy.Text = "娴忚";
- this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sdy.Click += new System.EventHandler(this.sdy_Click);
//
// Gy_BarCodeBill
//
@@ -1067,7 +1098,7 @@
this.Controls.Add(this.grdPrint);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Gy_BarCodeBill";
this.Text = "鍗曟嵁缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1176,5 +1207,8 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripButton BatchNo;
private System.Windows.Forms.ToolStripButton sdy;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.ToolStripButton wxm;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
}
}
\ No newline at end of file
--
Gitblit v1.9.1