From a2a242077d814b48eb5ef2d609b5538f4fe30fad Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 06 五月 2024 17:16:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_PackBarCodeBill_automaticallyByPLC.Designer.cs | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_PackBarCodeBill_automaticallyByPLC.Designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_PackBarCodeBill_automaticallyByPLC.Designer.cs"
index c435527..703f4cb 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_PackBarCodeBill_automaticallyByPLC.Designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_PackBarCodeBill_automaticallyByPLC.Designer.cs"
@@ -34,6 +34,7 @@
this.tabControl_MainInfo = new System.Windows.Forms.TabControl();
this.tabPage_BillInfo = new System.Windows.Forms.TabPage();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.button_produceTemp = new System.Windows.Forms.Button();
this.label_sBillNo = new System.Windows.Forms.Label();
this.textBox_sBillNo = new System.Windows.Forms.TextBox();
this.label_sBillID = new System.Windows.Forms.Label();
@@ -121,6 +122,7 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.button_produceTemp);
this.gbUp.Controls.Add(this.label_sBillNo);
this.gbUp.Controls.Add(this.textBox_sBillNo);
this.gbUp.Controls.Add(this.label_sBillID);
@@ -149,6 +151,16 @@
this.gbUp.Size = new System.Drawing.Size(1374, 310);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
+ //
+ // button_produceTemp
+ //
+ this.button_produceTemp.Location = new System.Drawing.Point(829, 215);
+ this.button_produceTemp.Name = "button_produceTemp";
+ this.button_produceTemp.Size = new System.Drawing.Size(158, 70);
+ this.button_produceTemp.TabIndex = 123;
+ this.button_produceTemp.Text = "涓存椂缁勬墭";
+ this.button_produceTemp.UseVisualStyleBackColor = true;
+ this.button_produceTemp.Click += new System.EventHandler(this.button_produceTemp_Click);
//
// label_sBillNo
//
@@ -193,9 +205,9 @@
//
// button_produceByHand
//
- this.button_produceByHand.Location = new System.Drawing.Point(591, 250);
+ this.button_produceByHand.Location = new System.Drawing.Point(591, 215);
this.button_produceByHand.Name = "button_produceByHand";
- this.button_produceByHand.Size = new System.Drawing.Size(151, 35);
+ this.button_produceByHand.Size = new System.Drawing.Size(186, 70);
this.button_produceByHand.TabIndex = 118;
this.button_produceByHand.Text = "鏈弧鎵樼敓鎴�";
this.button_produceByHand.UseVisualStyleBackColor = true;
@@ -276,9 +288,9 @@
//
// button_stopListen
//
- this.button_stopListen.Location = new System.Drawing.Point(404, 250);
+ this.button_stopListen.Location = new System.Drawing.Point(379, 215);
this.button_stopListen.Name = "button_stopListen";
- this.button_stopListen.Size = new System.Drawing.Size(151, 35);
+ this.button_stopListen.Size = new System.Drawing.Size(176, 70);
this.button_stopListen.TabIndex = 97;
this.button_stopListen.Text = "鍋滄缁勬墭";
this.button_stopListen.UseVisualStyleBackColor = true;
@@ -287,11 +299,11 @@
// textBox_HPackBarCode
//
this.textBox_HPackBarCode.BackColor = System.Drawing.SystemColors.ScrollBar;
- this.textBox_HPackBarCode.Enabled = false;
this.textBox_HPackBarCode.Location = new System.Drawing.Point(122, 81);
this.textBox_HPackBarCode.Name = "textBox_HPackBarCode";
this.textBox_HPackBarCode.Size = new System.Drawing.Size(280, 28);
this.textBox_HPackBarCode.TabIndex = 43;
+ this.textBox_HPackBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox_HPackBarCode__KeyPress);
//
// dtpHDate
//
@@ -312,9 +324,9 @@
//
// button_startListen
//
- this.button_startListen.Location = new System.Drawing.Point(214, 250);
+ this.button_startListen.Location = new System.Drawing.Point(147, 215);
this.button_startListen.Name = "button_startListen";
- this.button_startListen.Size = new System.Drawing.Size(133, 35);
+ this.button_startListen.Size = new System.Drawing.Size(200, 70);
this.button_startListen.TabIndex = 96;
this.button_startListen.Text = "鑷姩缁勬墭";
this.button_startListen.UseVisualStyleBackColor = true;
@@ -387,16 +399,16 @@
//
this.button_resetParams.Location = new System.Drawing.Point(590, 173);
this.button_resetParams.Name = "button_resetParams";
- this.button_resetParams.Size = new System.Drawing.Size(89, 40);
+ this.button_resetParams.Size = new System.Drawing.Size(134, 81);
this.button_resetParams.TabIndex = 105;
this.button_resetParams.Text = "閲� 缃�";
this.button_resetParams.UseVisualStyleBackColor = true;
//
// button_saveParams
//
- this.button_saveParams.Location = new System.Drawing.Point(377, 173);
+ this.button_saveParams.Location = new System.Drawing.Point(311, 173);
this.button_saveParams.Name = "button_saveParams";
- this.button_saveParams.Size = new System.Drawing.Size(89, 40);
+ this.button_saveParams.Size = new System.Drawing.Size(155, 81);
this.button_saveParams.TabIndex = 104;
this.button_saveParams.Text = "淇� 瀛�";
this.button_saveParams.UseVisualStyleBackColor = true;
@@ -638,7 +650,7 @@
this.toolStripButton_Delete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButton_Delete.ImageTransparentColor = System.Drawing.Color.White;
this.toolStripButton_Delete.Name = "toolStripButton_Delete";
- this.toolStripButton_Delete.Size = new System.Drawing.Size(35, 47);
+ this.toolStripButton_Delete.Size = new System.Drawing.Size(60, 60);
this.toolStripButton_Delete.Text = "鍒犻櫎";
this.toolStripButton_Delete.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripButton_Delete.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -651,8 +663,9 @@
this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Margin = new System.Windows.Forms.Padding(100, 2, 0, 3);
this.tc.Name = "tc";
- this.tc.Size = new System.Drawing.Size(35, 47);
+ this.tc.Size = new System.Drawing.Size(60, 60);
this.tc.Text = "閫�鍑�";
this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -743,5 +756,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
private System.Windows.Forms.ToolStripButton tc;
private System.Windows.Forms.ToolStripButton toolStripButton_Delete;
+ private System.Windows.Forms.Button button_produceTemp;
}
}
\ No newline at end of file
--
Gitblit v1.9.1