From eb38ca9a6cd3fab7e857b0cc654f01a26d24f725 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 10 一月 2022 08:49:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill.designer.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 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..9a89e5e 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,6 +32,7 @@
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();
@@ -106,7 +107,9 @@
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.wxm = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -139,6 +142,9 @@
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
//
@@ -1037,19 +1057,29 @@
this.grdList.Size = new System.Drawing.Size(1241, 347);
this.grdList.TabIndex = 46;
//
- // sdy
+ // wxm
//
- 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);
+ 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);
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// Gy_BarCodeBill
//
@@ -1176,5 +1206,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