From 25c2291ded30737b07fb7c93e5e231cc64733d2a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 19 八月 2025 16:15:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_PackBarCodeBill_automaticallyByPLC.Designer.cs | 97 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 38 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 ea49d71..aa5c8ce 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();
@@ -104,7 +105,7 @@
this.tabControl_MainInfo.Location = new System.Drawing.Point(76, 88);
this.tabControl_MainInfo.Name = "tabControl_MainInfo";
this.tabControl_MainInfo.SelectedIndex = 0;
- this.tabControl_MainInfo.Size = new System.Drawing.Size(1393, 346);
+ this.tabControl_MainInfo.Size = new System.Drawing.Size(1798, 346);
this.tabControl_MainInfo.TabIndex = 39;
//
// tabPage_BillInfo
@@ -114,13 +115,14 @@
this.tabPage_BillInfo.Location = new System.Drawing.Point(4, 28);
this.tabPage_BillInfo.Name = "tabPage_BillInfo";
this.tabPage_BillInfo.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage_BillInfo.Size = new System.Drawing.Size(1385, 314);
+ this.tabPage_BillInfo.Size = new System.Drawing.Size(1790, 314);
this.tabPage_BillInfo.TabIndex = 0;
this.tabPage_BillInfo.Text = "宸ュ崟淇℃伅";
//
// 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);
@@ -146,14 +148,24 @@
this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1374, 310);
+ this.gbUp.Size = new System.Drawing.Size(1779, 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
//
this.label_sBillNo.AutoSize = true;
- this.label_sBillNo.Location = new System.Drawing.Point(450, 136);
+ this.label_sBillNo.Location = new System.Drawing.Point(19, 184);
this.label_sBillNo.Name = "label_sBillNo";
this.label_sBillNo.Size = new System.Drawing.Size(80, 18);
this.label_sBillNo.TabIndex = 121;
@@ -164,16 +176,16 @@
//
this.textBox_sBillNo.BackColor = System.Drawing.SystemColors.ScrollBar;
this.textBox_sBillNo.Enabled = false;
- this.textBox_sBillNo.Location = new System.Drawing.Point(552, 133);
+ this.textBox_sBillNo.Location = new System.Drawing.Point(121, 181);
this.textBox_sBillNo.Name = "textBox_sBillNo";
- this.textBox_sBillNo.Size = new System.Drawing.Size(280, 28);
+ this.textBox_sBillNo.Size = new System.Drawing.Size(500, 28);
this.textBox_sBillNo.TabIndex = 122;
this.textBox_sBillNo.Visible = false;
//
// label_sBillID
//
this.label_sBillID.AutoSize = true;
- this.label_sBillID.Location = new System.Drawing.Point(19, 136);
+ this.label_sBillID.Location = new System.Drawing.Point(19, 150);
this.label_sBillID.Name = "label_sBillID";
this.label_sBillID.Size = new System.Drawing.Size(80, 18);
this.label_sBillID.TabIndex = 119;
@@ -184,9 +196,9 @@
//
this.textBox_sBillID.BackColor = System.Drawing.SystemColors.ScrollBar;
this.textBox_sBillID.Enabled = false;
- this.textBox_sBillID.Location = new System.Drawing.Point(121, 133);
+ this.textBox_sBillID.Location = new System.Drawing.Point(121, 147);
this.textBox_sBillID.Name = "textBox_sBillID";
- this.textBox_sBillID.Size = new System.Drawing.Size(280, 28);
+ this.textBox_sBillID.Size = new System.Drawing.Size(500, 28);
this.textBox_sBillID.TabIndex = 120;
this.textBox_sBillID.Text = "0";
this.textBox_sBillID.Visible = false;
@@ -204,18 +216,20 @@
// textBox_PackQty
//
this.textBox_PackQty.BackColor = System.Drawing.SystemColors.Window;
- this.textBox_PackQty.Location = new System.Drawing.Point(1058, 80);
+ this.textBox_PackQty.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.textBox_PackQty.Location = new System.Drawing.Point(1062, 150);
+ this.textBox_PackQty.Multiline = true;
this.textBox_PackQty.Name = "textBox_PackQty";
- this.textBox_PackQty.Size = new System.Drawing.Size(49, 28);
+ this.textBox_PackQty.Size = new System.Drawing.Size(80, 52);
this.textBox_PackQty.TabIndex = 117;
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label6.Location = new System.Drawing.Point(1026, 83);
+ this.label6.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label6.Location = new System.Drawing.Point(1019, 150);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(22, 24);
+ this.label6.Size = new System.Drawing.Size(37, 40);
this.label6.TabIndex = 116;
this.label6.Text = "/";
//
@@ -223,15 +237,17 @@
//
this.textBox_currentQty.BackColor = System.Drawing.SystemColors.ScrollBar;
this.textBox_currentQty.Enabled = false;
- this.textBox_currentQty.Location = new System.Drawing.Point(971, 80);
+ this.textBox_currentQty.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.textBox_currentQty.Location = new System.Drawing.Point(928, 150);
+ this.textBox_currentQty.Multiline = true;
this.textBox_currentQty.Name = "textBox_currentQty";
- this.textBox_currentQty.Size = new System.Drawing.Size(49, 28);
+ this.textBox_currentQty.Size = new System.Drawing.Size(71, 52);
this.textBox_currentQty.TabIndex = 115;
//
// label_Pack
//
this.label_Pack.AutoSize = true;
- this.label_Pack.Location = new System.Drawing.Point(871, 86);
+ this.label_Pack.Location = new System.Drawing.Point(828, 156);
this.label_Pack.Name = "label_Pack";
this.label_Pack.Size = new System.Drawing.Size(80, 18);
this.label_Pack.TabIndex = 114;
@@ -240,7 +256,7 @@
// label_HBarCode
//
this.label_HBarCode.AutoSize = true;
- this.label_HBarCode.Location = new System.Drawing.Point(450, 84);
+ this.label_HBarCode.Location = new System.Drawing.Point(828, 99);
this.label_HBarCode.Name = "label_HBarCode";
this.label_HBarCode.Size = new System.Drawing.Size(80, 18);
this.label_HBarCode.TabIndex = 99;
@@ -249,9 +265,11 @@
// textBox_HBarCode
//
this.textBox_HBarCode.BackColor = System.Drawing.SystemColors.Window;
- this.textBox_HBarCode.Location = new System.Drawing.Point(552, 81);
+ this.textBox_HBarCode.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.textBox_HBarCode.Location = new System.Drawing.Point(930, 76);
+ this.textBox_HBarCode.Multiline = true;
this.textBox_HBarCode.Name = "textBox_HBarCode";
- this.textBox_HBarCode.Size = new System.Drawing.Size(280, 28);
+ this.textBox_HBarCode.Size = new System.Drawing.Size(573, 60);
this.textBox_HBarCode.TabIndex = 100;
this.textBox_HBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox_HBarCode_KeyPress);
//
@@ -262,13 +280,13 @@
this.cmbHOrgID.Location = new System.Drawing.Point(121, 21);
this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4);
this.cmbHOrgID.Name = "cmbHOrgID";
- this.cmbHOrgID.Size = new System.Drawing.Size(280, 26);
+ this.cmbHOrgID.Size = new System.Drawing.Size(500, 26);
this.cmbHOrgID.TabIndex = 85;
//
// label_HPackBarCode
//
this.label_HPackBarCode.AutoSize = true;
- this.label_HPackBarCode.Location = new System.Drawing.Point(20, 84);
+ this.label_HPackBarCode.Location = new System.Drawing.Point(826, 29);
this.label_HPackBarCode.Name = "label_HPackBarCode";
this.label_HPackBarCode.Size = new System.Drawing.Size(80, 18);
this.label_HPackBarCode.TabIndex = 0;
@@ -287,24 +305,26 @@
// 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.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.textBox_HPackBarCode.Location = new System.Drawing.Point(928, 8);
+ this.textBox_HPackBarCode.Multiline = true;
this.textBox_HPackBarCode.Name = "textBox_HPackBarCode";
- this.textBox_HPackBarCode.Size = new System.Drawing.Size(280, 28);
+ this.textBox_HPackBarCode.Size = new System.Drawing.Size(575, 49);
this.textBox_HPackBarCode.TabIndex = 43;
+ this.textBox_HPackBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox_HPackBarCode__KeyPress);
//
// dtpHDate
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHDate.Location = new System.Drawing.Point(550, 21);
+ this.dtpHDate.Location = new System.Drawing.Point(121, 76);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(280, 28);
+ this.dtpHDate.Size = new System.Drawing.Size(500, 28);
this.dtpHDate.TabIndex = 96;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(450, 27);
+ this.label2.Location = new System.Drawing.Point(21, 82);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(80, 18);
this.label2.TabIndex = 95;
@@ -324,17 +344,17 @@
//
this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHBarCodeType.FormattingEnabled = true;
- this.cmbHBarCodeType.Location = new System.Drawing.Point(971, 24);
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(121, 112);
this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
- this.cmbHBarCodeType.Size = new System.Drawing.Size(280, 26);
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(500, 26);
this.cmbHBarCodeType.TabIndex = 81;
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(871, 30);
+ this.label1.Location = new System.Drawing.Point(21, 118);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(80, 18);
@@ -511,7 +531,7 @@
this.tabControl1.Location = new System.Drawing.Point(80, 444);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1458, 383);
+ this.tabControl1.Size = new System.Drawing.Size(1794, 383);
this.tabControl1.TabIndex = 40;
//
// tabPage1
@@ -521,7 +541,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 28);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(1450, 351);
+ this.tabPage1.Size = new System.Drawing.Size(1786, 351);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "瀛愭潯鐮佸垪琛�";
//
@@ -533,7 +553,7 @@
this.grdMain.Name = "grdMain";
this.grdMain.RowHeadersWidth = 62;
this.grdMain.RowTemplate.Height = 30;
- this.grdMain.Size = new System.Drawing.Size(1444, 345);
+ this.grdMain.Size = new System.Drawing.Size(1780, 345);
this.grdMain.TabIndex = 0;
//
// tabPage2
@@ -543,7 +563,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 28);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(1450, 351);
+ this.tabPage2.Size = new System.Drawing.Size(1786, 351);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鎵樼洏鏉＄爜";
//
@@ -555,7 +575,7 @@
this.grdSub.Name = "grdSub";
this.grdSub.RowHeadersWidth = 62;
this.grdSub.RowTemplate.Height = 30;
- this.grdSub.Size = new System.Drawing.Size(1438, 342);
+ this.grdSub.Size = new System.Drawing.Size(1777, 342);
this.grdSub.TabIndex = 1;
//
// Tool
@@ -576,7 +596,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1617, 75);
+ this.Tool.Size = new System.Drawing.Size(1886, 75);
this.Tool.Stretch = true;
this.Tool.TabIndex = 41;
this.Tool.Text = "toolStrip1";
@@ -664,7 +684,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1617, 956);
+ this.ClientSize = new System.Drawing.Size(1886, 956);
this.Controls.Add(this.Tool);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.tabControl_MainInfo);
@@ -744,5 +764,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