From ec5c28f717d481e06300ee1b94a760bf9a44df23 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 26 四月 2024 16:18:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
index f65d20c..4ee964d 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
@@ -143,9 +143,10 @@
this.tabPage4 = new System.Windows.Forms.TabPage();
this.grdBillBarCodeList = new System.Windows.Forms.DataGridView();
this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
+ this.printDocument1 = new System.Drawing.Printing.PrintDocument();
this.printDialog1 = new System.Windows.Forms.PrintDialog();
this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
- this.printDocument1 = new System.Drawing.Printing.PrintDocument();
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
this.tabControl_MainInfo.SuspendLayout();
@@ -224,7 +225,6 @@
this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.dy.Visible = false;
- this.dy.Click += new System.EventHandler(this.dy_Click);
//
// sdy
//
@@ -239,7 +239,6 @@
this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.sdy.Visible = false;
- this.sdy.Click += new System.EventHandler(this.sdy_Click);
//
// yl
//
@@ -254,7 +253,6 @@
this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.yl.Visible = false;
- this.yl.Click += new System.EventHandler(this.yl_Click);
//
// toolStripSeparator2
//
@@ -289,7 +287,6 @@
this.spRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.spRow.Visible = false;
- this.spRow.Click += new System.EventHandler(this.spRow_Click);
//
// bc
//
@@ -345,7 +342,6 @@
this.wxm.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.wxm.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.wxm.Visible = false;
- this.wxm.Click += new System.EventHandler(this.wxm_Click);
//
// toolStripSeparator9
//
@@ -385,7 +381,6 @@
this.kc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.kc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.kc.Visible = false;
- this.kc.Click += new System.EventHandler(this.kc_Click);
//
// toolStripSeparator1
//
@@ -452,7 +447,6 @@
this.tb.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tb.ToolTipText = "鍚屾鍩虹璧勬枡";
this.tb.Visible = false;
- this.tb.Click += new System.EventHandler(this.tb_Click);
//
// toolStripSeparator6
//
@@ -472,7 +466,6 @@
this.gl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.gl.Visible = false;
- this.gl.Click += new System.EventHandler(this.gl_Click);
//
// toolStripSeparator7
//
@@ -492,7 +485,6 @@
this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.BatchNo.Visible = false;
- this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click);
//
// toolStripSeparator3
//
@@ -857,7 +849,6 @@
this.cmbSourceBillType.Name = "cmbSourceBillType";
this.cmbSourceBillType.Size = new System.Drawing.Size(280, 26);
this.cmbSourceBillType.TabIndex = 36;
- this.cmbSourceBillType.TextChanged += new System.EventHandler(this.cmbSourceBillType_TextChanged);
//
// label14
//
@@ -1395,9 +1386,6 @@
this.grdSub.RowTemplate.Height = 23;
this.grdSub.Size = new System.Drawing.Size(1390, 280);
this.grdSub.TabIndex = 45;
- this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
- this.grdSub.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellContentClick);
- this.grdSub.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellEndEdit);
//
// tabPage1
//
@@ -1428,13 +1416,6 @@
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(1390, 280);
this.grdMain.TabIndex = 44;
- this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
- this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
- this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
- this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
- this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
- this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
- this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
//
// tabControl1
//
@@ -1501,6 +1482,11 @@
this.printPreviewDialog1.Icon = ((System.Drawing.Icon)(resources.GetObject("printPreviewDialog1.Icon")));
this.printPreviewDialog1.Name = "printPreviewDialog1";
this.printPreviewDialog1.Visible = false;
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
//
// Gy_BarCodeBill_automaticallyByPLC_New
//
@@ -1673,5 +1659,6 @@
private System.Drawing.Printing.PrintDocument printDocument1;
private System.Windows.Forms.PrintDialog printDialog1;
private System.Windows.Forms.PrintPreviewDialog printPreviewDialog1;
+ private System.Windows.Forms.Timer timer2;
}
}
\ No newline at end of file
--
Gitblit v1.9.1