From d54613ce0b6960dafcbd28454172f21a2d0bb6d1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 08 四月 2025 08:48:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 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 70981a6..572068e 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"
@@ -64,6 +64,9 @@
this.tabControl_MainInfo = new System.Windows.Forms.TabControl();
this.tabPage_BillInfo = new System.Windows.Forms.TabPage();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.radioButton_IsPrint_No = new System.Windows.Forms.RadioButton();
+ this.radioButton_IsPrint_Yes = new System.Windows.Forms.RadioButton();
this.cmdSourceBillNo = new System.Windows.Forms.Button();
this.cmbHWorksNumber = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
@@ -148,14 +151,13 @@
this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.timer3 = new System.Windows.Forms.Timer(this.components);
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.radioButton_IsPrint_Yes = new System.Windows.Forms.RadioButton();
- this.radioButton_IsPrint_No = new System.Windows.Forms.RadioButton();
+ this.timer4 = new System.Windows.Forms.Timer(this.components);
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
this.tabControl_MainInfo.SuspendLayout();
this.tabPage_BillInfo.SuspendLayout();
this.gbUp.SuspendLayout();
+ this.groupBox1.SuspendLayout();
this.tabPage_ParamsInfo.SuspendLayout();
this.groupBox_ParamsInfo.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -171,7 +173,6 @@
this.tabControl1.SuspendLayout();
this.tabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).BeginInit();
- this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// Tool
@@ -596,6 +597,38 @@
this.gbUp.Size = new System.Drawing.Size(1775, 310);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.radioButton_IsPrint_No);
+ this.groupBox1.Controls.Add(this.radioButton_IsPrint_Yes);
+ this.groupBox1.Location = new System.Drawing.Point(24, 162);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(200, 100);
+ this.groupBox1.TabIndex = 45;
+ this.groupBox1.TabStop = false;
+ //
+ // radioButton_IsPrint_No
+ //
+ this.radioButton_IsPrint_No.AutoSize = true;
+ this.radioButton_IsPrint_No.Location = new System.Drawing.Point(6, 68);
+ this.radioButton_IsPrint_No.Name = "radioButton_IsPrint_No";
+ this.radioButton_IsPrint_No.Size = new System.Drawing.Size(87, 22);
+ this.radioButton_IsPrint_No.TabIndex = 1;
+ this.radioButton_IsPrint_No.Text = "涓嶆墦鍗�";
+ this.radioButton_IsPrint_No.UseVisualStyleBackColor = true;
+ //
+ // radioButton_IsPrint_Yes
+ //
+ this.radioButton_IsPrint_Yes.AutoSize = true;
+ this.radioButton_IsPrint_Yes.Checked = true;
+ this.radioButton_IsPrint_Yes.Location = new System.Drawing.Point(7, 13);
+ this.radioButton_IsPrint_Yes.Name = "radioButton_IsPrint_Yes";
+ this.radioButton_IsPrint_Yes.Size = new System.Drawing.Size(69, 22);
+ this.radioButton_IsPrint_Yes.TabIndex = 0;
+ this.radioButton_IsPrint_Yes.TabStop = true;
+ this.radioButton_IsPrint_Yes.Text = "鎵撳嵃";
+ this.radioButton_IsPrint_Yes.UseVisualStyleBackColor = true;
//
// cmdSourceBillNo
//
@@ -1508,37 +1541,10 @@
this.timer3.Interval = 5000;
this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
//
- // groupBox1
+ // timer4
//
- this.groupBox1.Controls.Add(this.radioButton_IsPrint_No);
- this.groupBox1.Controls.Add(this.radioButton_IsPrint_Yes);
- this.groupBox1.Location = new System.Drawing.Point(24, 162);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(200, 100);
- this.groupBox1.TabIndex = 45;
- this.groupBox1.TabStop = false;
- //
- // radioButton_IsPrint_Yes
- //
- this.radioButton_IsPrint_Yes.AutoSize = true;
- this.radioButton_IsPrint_Yes.Checked = true;
- this.radioButton_IsPrint_Yes.Location = new System.Drawing.Point(7, 13);
- this.radioButton_IsPrint_Yes.Name = "radioButton_IsPrint_Yes";
- this.radioButton_IsPrint_Yes.Size = new System.Drawing.Size(69, 22);
- this.radioButton_IsPrint_Yes.TabIndex = 0;
- this.radioButton_IsPrint_Yes.TabStop = true;
- this.radioButton_IsPrint_Yes.Text = "鎵撳嵃";
- this.radioButton_IsPrint_Yes.UseVisualStyleBackColor = true;
- //
- // radioButton_IsPrint_No
- //
- this.radioButton_IsPrint_No.AutoSize = true;
- this.radioButton_IsPrint_No.Location = new System.Drawing.Point(6, 68);
- this.radioButton_IsPrint_No.Name = "radioButton_IsPrint_No";
- this.radioButton_IsPrint_No.Size = new System.Drawing.Size(87, 22);
- this.radioButton_IsPrint_No.TabIndex = 1;
- this.radioButton_IsPrint_No.Text = "涓嶆墦鍗�";
- this.radioButton_IsPrint_No.UseVisualStyleBackColor = true;
+ this.timer4.Enabled = true;
+ this.timer4.Tick += new System.EventHandler(this.timer4_Tick);
//
// Gy_BarCodeBill_automaticallyByPLC_New
//
@@ -1572,6 +1578,8 @@
this.tabPage_BillInfo.ResumeLayout(false);
this.gbUp.ResumeLayout(false);
this.gbUp.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.tabPage_ParamsInfo.ResumeLayout(false);
this.groupBox_ParamsInfo.ResumeLayout(false);
this.groupBox_ParamsInfo.PerformLayout();
@@ -1589,8 +1597,6 @@
this.tabControl1.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).EndInit();
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@@ -1718,5 +1724,6 @@
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.RadioButton radioButton_IsPrint_No;
private System.Windows.Forms.RadioButton radioButton_IsPrint_Yes;
+ private System.Windows.Forms.Timer timer4;
}
}
\ No newline at end of file
--
Gitblit v1.9.1