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_BarCodeBill_automaticallyByPLC_New.designer.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 4ee964d..0831a25 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"
@@ -296,7 +296,7 @@
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.Size = new System.Drawing.Size(60, 60);
this.bc.Text = "鐢熸垚";
this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -498,8 +498,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;
@@ -593,11 +594,10 @@
// cmdSourceBillNo
//
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
- this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(1214, 11);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(1214, -4);
this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(33, 33);
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(60, 60);
this.cmdSourceBillNo.TabIndex = 99;
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click_1);
@@ -638,6 +638,7 @@
// radioButton_HIsUsingBatchNo
//
this.radioButton_HIsUsingBatchNo.AutoSize = true;
+ this.radioButton_HIsUsingBatchNo.Enabled = false;
this.radioButton_HIsUsingBatchNo.Location = new System.Drawing.Point(874, 190);
this.radioButton_HIsUsingBatchNo.Name = "radioButton_HIsUsingBatchNo";
this.radioButton_HIsUsingBatchNo.Size = new System.Drawing.Size(141, 22);
@@ -657,9 +658,9 @@
//
// button_stopListen
//
- this.button_stopListen.Location = new System.Drawing.Point(404, 250);
+ this.button_stopListen.Location = new System.Drawing.Point(404, 223);
this.button_stopListen.Name = "button_stopListen";
- this.button_stopListen.Size = new System.Drawing.Size(151, 35);
+ this.button_stopListen.Size = new System.Drawing.Size(192, 62);
this.button_stopListen.TabIndex = 97;
this.button_stopListen.Text = "鍋滄鐩戝惉";
this.button_stopListen.UseVisualStyleBackColor = true;
@@ -711,9 +712,9 @@
//
// button_startListen
//
- this.button_startListen.Location = new System.Drawing.Point(214, 250);
+ this.button_startListen.Location = new System.Drawing.Point(187, 223);
this.button_startListen.Name = "button_startListen";
- this.button_startListen.Size = new System.Drawing.Size(133, 35);
+ this.button_startListen.Size = new System.Drawing.Size(160, 62);
this.button_startListen.TabIndex = 96;
this.button_startListen.Text = "寮�濮嬬洃鍚�";
this.button_startListen.UseVisualStyleBackColor = true;
@@ -906,7 +907,7 @@
//
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(153, 75);
this.button_resetParams.TabIndex = 105;
this.button_resetParams.Text = "閲� 缃�";
this.button_resetParams.UseVisualStyleBackColor = true;
@@ -914,9 +915,9 @@
//
// 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, 75);
this.button_saveParams.TabIndex = 104;
this.button_saveParams.Text = "淇� 瀛�";
this.button_saveParams.UseVisualStyleBackColor = true;
--
Gitblit v1.9.1