From 56270ee3a189c0dbd42446fbd726341c9f4e8efd Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 07 十二月 2021 09:11:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill.designer.cs | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 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 6df46ff..c63493e 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"
@@ -49,6 +49,8 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.tb = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.gl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.lblCaption = new System.Windows.Forms.Label();
@@ -100,10 +102,10 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.grdSub = new System.Windows.Forms.DataGridView();
- this.gl = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
+ this.BatchNo = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -147,6 +149,8 @@
this.tb,
this.toolStripSeparator6,
this.gl,
+ this.toolStripSeparator7,
+ this.BatchNo,
this.toolStripSeparator3,
this.tc});
this.Tool.Location = new System.Drawing.Point(0, 0);
@@ -350,6 +354,25 @@
this.tb.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tb.ToolTipText = "鍚屾鍩虹璧勬枡";
this.tb.Click += new System.EventHandler(this.tb_Click);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ //
+ // gl
+ //
+ this.gl.AutoSize = false;
+ this.gl.Image = ((System.Drawing.Image)(resources.GetObject("gl.Image")));
+ this.gl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.gl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.gl.ImageTransparentColor = System.Drawing.Color.White;
+ this.gl.Name = "gl";
+ this.gl.Size = new System.Drawing.Size(35, 47);
+ this.gl.Text = "鍏宠仈";
+ this.gl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.gl.Click += new System.EventHandler(this.gl_Click);
//
// toolStripSeparator3
//
@@ -915,25 +938,6 @@
this.grdSub.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellContentClick);
this.grdSub.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellEndEdit);
//
- // gl
- //
- this.gl.AutoSize = false;
- this.gl.Image = ((System.Drawing.Image)(resources.GetObject("gl.Image")));
- this.gl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.gl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.gl.ImageTransparentColor = System.Drawing.Color.White;
- this.gl.Name = "gl";
- this.gl.Size = new System.Drawing.Size(35, 47);
- this.gl.Text = "鍏宠仈";
- this.gl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.gl.Click += new System.EventHandler(this.gl_Click);
- //
- // toolStripSeparator6
- //
- this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
- //
// tabPage3
//
this.tabPage3.Controls.Add(this.grdList);
@@ -960,6 +964,25 @@
this.grdList.RowTemplate.Height = 23;
this.grdList.Size = new System.Drawing.Size(929, 288);
this.grdList.TabIndex = 46;
+ //
+ // BatchNo
+ //
+ this.BatchNo.AutoSize = false;
+ this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image")));
+ this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
+ this.BatchNo.Name = "BatchNo";
+ this.BatchNo.Size = new System.Drawing.Size(36, 47);
+ this.BatchNo.Text = "鎵规";
+ this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// Gy_BarCodeBill
//
@@ -1082,5 +1105,7 @@
private System.Windows.Forms.ToolStripButton gl;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.DataGridView grdList;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripButton BatchNo;
}
}
\ No newline at end of file
--
Gitblit v1.9.1