From ded7321ad0c1c5930f803f20c756dc8cd4e8aa2d Mon Sep 17 00:00:00 2001
From: "ruoxing.wang" <88384874@qq.com>
Date: Thu, 24 Apr 2025 14:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=93=E7=A0=81=E4=B8=8D?=
=?UTF-8?q?=E6=89=93=E6=9D=A1=E7=A0=81=E9=97=AE=E9=A2=98,=20=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0IsHandPrint=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
InjectionPC/FrmMain2408.Designer.cs | 725 +++++++++---------
InjectionPC/FrmMain2408.cs | 76 +-
InjectionPC/FrmMain2411.Designer.cs | 396 +++++-----
InjectionPC/FrmMainNew.Designer.cs | 410 +++++-----
InjectionSearch/FrmBarCodeSearch2408.cs | 2 +-
.../BLL/Inspection/InjectionBoxBLL.cs | 4 +-
.../DAL/Injection/InjectionBoxDAL.cs | 10 +-
7 files changed, 822 insertions(+), 801 deletions(-)
diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs
index 48f9d87..9c88dff 100644
--- a/InjectionPC/FrmMain2408.Designer.cs
+++ b/InjectionPC/FrmMain2408.Designer.cs
@@ -29,10 +29,10 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- GlacialComponents.Controls.GLColumn glColumn5 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn6 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn7 = new GlacialComponents.Controls.GLColumn();
- GlacialComponents.Controls.GLColumn glColumn8 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn4 = new GlacialComponents.Controls.GLColumn();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2408));
this.panel1 = new System.Windows.Forms.Panel();
this.panel7 = new System.Windows.Forms.Panel();
@@ -151,6 +151,7 @@
this.panel5 = new System.Windows.Forms.Panel();
this.label2 = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel();
+ this.lbVer = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label35 = new System.Windows.Forms.Label();
this.label39 = new System.Windows.Forms.Label();
@@ -158,7 +159,6 @@
this.serialPort1 = new System.IO.Ports.SerialPort(this.components);
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.timer3 = new System.Windows.Forms.Timer(this.components);
- this.lbVer = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.panel7.SuspendLayout();
this.panel23.SuspendLayout();
@@ -223,9 +223,9 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2666, 1600);
+ this.panel1.Size = new System.Drawing.Size(2908, 1790);
this.panel1.TabIndex = 0;
//
// panel7
@@ -234,10 +234,10 @@
this.panel7.Controls.Add(this.panel8);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.panel7.Location = new System.Drawing.Point(0, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2666, 1453);
+ this.panel7.Size = new System.Drawing.Size(2908, 1622);
this.panel7.TabIndex = 1;
//
// panel23
@@ -245,10 +245,10 @@
this.panel23.Controls.Add(this.panel27);
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel23.Location = new System.Drawing.Point(0, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2666, 1362);
+ this.panel23.Size = new System.Drawing.Size(2908, 1518);
this.panel23.TabIndex = 1;
//
// panel27
@@ -256,10 +256,10 @@
this.panel27.Controls.Add(this.panel29);
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel27.Location = new System.Drawing.Point(0, 976);
- this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel27.Location = new System.Drawing.Point(0, 1116);
+ this.panel27.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2666, 386);
+ this.panel27.Size = new System.Drawing.Size(2908, 402);
this.panel27.TabIndex = 1;
//
// panel29
@@ -267,10 +267,10 @@
this.panel29.Controls.Add(this.panel31);
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel29.Location = new System.Drawing.Point(311, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel29.Location = new System.Drawing.Point(340, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2355, 386);
+ this.panel29.Size = new System.Drawing.Size(2568, 402);
this.panel29.TabIndex = 1;
//
// panel31
@@ -278,10 +278,10 @@
this.panel31.Controls.Add(this.panel33);
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel31.Location = new System.Drawing.Point(122, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel31.Location = new System.Drawing.Point(134, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(2233, 386);
+ this.panel31.Size = new System.Drawing.Size(2434, 402);
this.panel31.TabIndex = 1;
//
// panel33
@@ -289,10 +289,10 @@
this.panel33.Controls.Add(this.panel35);
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel33.Location = new System.Drawing.Point(122, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel33.Location = new System.Drawing.Point(134, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(2111, 386);
+ this.panel33.Size = new System.Drawing.Size(2300, 402);
this.panel33.TabIndex = 1;
//
// panel35
@@ -300,9 +300,9 @@
this.panel35.Controls.Add(this.panel37);
this.panel35.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel35.Location = new System.Drawing.Point(0, 0);
- this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel35.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1989, 386);
+ this.panel35.Size = new System.Drawing.Size(2166, 402);
this.panel35.TabIndex = 1;
//
// panel37
@@ -310,9 +310,9 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel37.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1989, 386);
+ this.panel37.Size = new System.Drawing.Size(2166, 402);
this.panel37.TabIndex = 1;
//
// panel40
@@ -321,9 +321,9 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel40.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1989, 386);
+ this.panel40.Size = new System.Drawing.Size(2166, 402);
this.panel40.TabIndex = 1;
//
// panel42
@@ -332,9 +332,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel42.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1867, 386);
+ this.panel42.Size = new System.Drawing.Size(2032, 402);
this.panel42.TabIndex = 1;
//
// panel39
@@ -354,19 +354,19 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel39.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1745, 386);
+ this.panel39.Size = new System.Drawing.Size(1898, 402);
this.panel39.TabIndex = 1;
//
// lbDevState
//
this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbDevState.Location = new System.Drawing.Point(854, 239);
- this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbDevState.Location = new System.Drawing.Point(932, 274);
+ this.lbDevState.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.lbDevState.Name = "lbDevState";
- this.lbDevState.Size = new System.Drawing.Size(347, 58);
+ this.lbDevState.Size = new System.Drawing.Size(378, 66);
this.lbDevState.TabIndex = 15;
this.lbDevState.Text = "设备已连接";
this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -376,10 +376,10 @@
//
this.lbAddPrintR.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbAddPrintR.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbAddPrintR.Location = new System.Drawing.Point(532, 298);
- this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbAddPrintR.Location = new System.Drawing.Point(580, 340);
+ this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.lbAddPrintR.Name = "lbAddPrintR";
- this.lbAddPrintR.Size = new System.Drawing.Size(314, 58);
+ this.lbAddPrintR.Size = new System.Drawing.Size(342, 66);
this.lbAddPrintR.TabIndex = 3;
this.lbAddPrintR.Text = "右条码添打";
this.lbAddPrintR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -389,10 +389,10 @@
//
this.lbAddPrintL.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbAddPrintL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbAddPrintL.Location = new System.Drawing.Point(532, 239);
- this.lbAddPrintL.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbAddPrintL.Location = new System.Drawing.Point(580, 274);
+ this.lbAddPrintL.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.lbAddPrintL.Name = "lbAddPrintL";
- this.lbAddPrintL.Size = new System.Drawing.Size(314, 58);
+ this.lbAddPrintL.Size = new System.Drawing.Size(342, 66);
this.lbAddPrintL.TabIndex = 2;
this.lbAddPrintL.Text = "左条码添打";
this.lbAddPrintL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -404,10 +404,10 @@
this.cboxHandBox.Checked = true;
this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked;
this.cboxHandBox.Enabled = false;
- this.cboxHandBox.Location = new System.Drawing.Point(924, 172);
- this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4);
+ this.cboxHandBox.Location = new System.Drawing.Point(1008, 196);
+ this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cboxHandBox.Name = "cboxHandBox";
- this.cboxHandBox.Size = new System.Drawing.Size(256, 55);
+ this.cboxHandBox.Size = new System.Drawing.Size(293, 62);
this.cboxHandBox.TabIndex = 14;
this.cboxHandBox.Tag = "true";
this.cboxHandBox.Text = "打印箱码";
@@ -417,20 +417,20 @@
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(220, 291);
- this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox2.Location = new System.Drawing.Point(240, 332);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(302, 65);
+ this.textBox2.Size = new System.Drawing.Size(330, 74);
this.textBox2.TabIndex = 13;
//
// label18
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.Location = new System.Drawing.Point(40, 304);
- this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label18.Location = new System.Drawing.Point(44, 348);
+ this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -438,10 +438,10 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.Location = new System.Drawing.Point(606, 178);
- this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label19.Location = new System.Drawing.Point(662, 204);
+ this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -449,20 +449,20 @@
//
this.textBox1.Enabled = false;
this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(223, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox1.Location = new System.Drawing.Point(244, 196);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
this.textBox1.TabIndex = 10;
//
// label20
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label20.Location = new System.Drawing.Point(41, 186);
- this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label20.Location = new System.Drawing.Point(44, 212);
+ this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -472,10 +472,10 @@
this.comboBox2.Enabled = false;
this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(223, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox2.Location = new System.Drawing.Point(244, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(851, 50);
+ this.comboBox2.Size = new System.Drawing.Size(928, 56);
this.comboBox2.TabIndex = 8;
this.comboBox2.SelectedValueChanged += new System.EventHandler(this.comboBox2_SelectedValueChanged);
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
@@ -484,10 +484,10 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(41, 70);
- this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label21.Location = new System.Drawing.Point(44, 80);
+ this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -495,10 +495,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1745, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel43.Location = new System.Drawing.Point(1898, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(122, 386);
+ this.panel43.Size = new System.Drawing.Size(134, 402);
this.panel43.TabIndex = 0;
//
// label23
@@ -507,9 +507,9 @@
this.label23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label23.Dock = System.Windows.Forms.DockStyle.Fill;
this.label23.Location = new System.Drawing.Point(0, 0);
- this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(122, 386);
+ this.label23.Size = new System.Drawing.Size(134, 402);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -519,10 +519,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1867, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel41.Location = new System.Drawing.Point(2032, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(122, 386);
+ this.panel41.Size = new System.Drawing.Size(134, 402);
this.panel41.TabIndex = 0;
//
// label22
@@ -531,9 +531,9 @@
this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label22.Dock = System.Windows.Forms.DockStyle.Fill;
this.label22.Location = new System.Drawing.Point(0, 0);
- this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(122, 386);
+ this.label22.Size = new System.Drawing.Size(134, 402);
this.label22.TabIndex = 1;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -543,10 +543,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1989, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel34.Location = new System.Drawing.Point(2166, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(122, 386);
+ this.panel34.Size = new System.Drawing.Size(134, 402);
this.panel34.TabIndex = 0;
//
// label15
@@ -555,9 +555,9 @@
this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label15.Dock = System.Windows.Forms.DockStyle.Fill;
this.label15.Location = new System.Drawing.Point(0, 0);
- this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(122, 386);
+ this.label15.Size = new System.Drawing.Size(134, 402);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -568,9 +568,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel32.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(122, 386);
+ this.panel32.Size = new System.Drawing.Size(134, 402);
this.panel32.TabIndex = 0;
//
// label14
@@ -579,9 +579,9 @@
this.label14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label14.Dock = System.Windows.Forms.DockStyle.Fill;
this.label14.Location = new System.Drawing.Point(0, 0);
- this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(122, 386);
+ this.label14.Size = new System.Drawing.Size(134, 402);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -592,9 +592,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel30.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(122, 386);
+ this.panel30.Size = new System.Drawing.Size(134, 402);
this.panel30.TabIndex = 0;
//
// label13
@@ -603,9 +603,9 @@
this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label13.Dock = System.Windows.Forms.DockStyle.Fill;
this.label13.Location = new System.Drawing.Point(0, 0);
- this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(122, 386);
+ this.label13.Size = new System.Drawing.Size(134, 402);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -616,9 +616,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel28.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(311, 386);
+ this.panel28.Size = new System.Drawing.Size(340, 402);
this.panel28.TabIndex = 0;
//
// label12
@@ -628,9 +628,9 @@
this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
this.label12.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.Location = new System.Drawing.Point(0, 0);
- this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(311, 386);
+ this.label12.Size = new System.Drawing.Size(340, 402);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -641,9 +641,9 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel24.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2666, 976);
+ this.panel24.Size = new System.Drawing.Size(2908, 1116);
this.panel24.TabIndex = 0;
//
// panel26
@@ -652,10 +652,10 @@
this.panel26.Controls.Add(this.panel44);
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel26.Location = new System.Drawing.Point(380, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel26.Location = new System.Drawing.Point(414, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(2286, 976);
+ this.panel26.Size = new System.Drawing.Size(2494, 1116);
this.panel26.TabIndex = 1;
//
// panel45
@@ -665,19 +665,19 @@
this.panel45.Controls.Add(this.button4);
this.panel45.Controls.Add(this.textBox4);
this.panel45.Controls.Add(this.label25);
- this.panel45.Location = new System.Drawing.Point(296, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel45.Location = new System.Drawing.Point(322, 676);
+ this.panel45.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1281, 132);
+ this.panel45.Size = new System.Drawing.Size(1398, 150);
this.panel45.TabIndex = 2;
//
// button3
//
this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1129, 38);
- this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button3.Location = new System.Drawing.Point(1232, 44);
+ this.button3.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 60);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -686,10 +686,10 @@
// button4
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(951, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button4.Location = new System.Drawing.Point(1038, 44);
+ this.button4.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 60);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -698,20 +698,20 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(308, 39);
- this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox4.Location = new System.Drawing.Point(336, 44);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
this.textBox4.TabIndex = 3;
//
// label25
//
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.Location = new System.Drawing.Point(26, 46);
- this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label25.Location = new System.Drawing.Point(28, 52);
+ this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -723,19 +723,19 @@
this.panel44.Controls.Add(this.button1);
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
- this.panel44.Location = new System.Drawing.Point(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel44.Location = new System.Drawing.Point(360, 364);
+ this.panel44.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1281, 132);
+ this.panel44.Size = new System.Drawing.Size(1398, 150);
this.panel44.TabIndex = 1;
//
// button2
//
this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(1097, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button2.Location = new System.Drawing.Point(1196, 44);
+ this.button2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 60);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -744,10 +744,10 @@
// button1
//
this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(941, 35);
- this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button1.Location = new System.Drawing.Point(1026, 40);
+ this.button1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 52);
+ this.button1.Size = new System.Drawing.Size(160, 60);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -756,20 +756,20 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox3.Location = new System.Drawing.Point(208, 44);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(676, 49);
+ this.textBox3.Size = new System.Drawing.Size(738, 55);
this.textBox3.TabIndex = 1;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label24.Location = new System.Drawing.Point(25, 46);
- this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label24.Location = new System.Drawing.Point(28, 52);
+ this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -783,43 +783,43 @@
this.glacialList1.AutoHeight = true;
this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.glacialList1.BackgroundStretchToFit = true;
- glColumn5.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn5.CheckBoxes = false;
- glColumn5.ImageIndex = -1;
- glColumn5.Name = "条码";
- glColumn5.NumericSort = false;
- glColumn5.Text = "条码";
- glColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn5.Width = 350;
- glColumn6.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn6.CheckBoxes = false;
- glColumn6.ImageIndex = -1;
- glColumn6.Name = "产品名称";
- glColumn6.NumericSort = false;
- glColumn6.Text = "产品名称";
- glColumn6.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn6.Width = 320;
- glColumn7.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn7.CheckBoxes = false;
- glColumn7.ImageIndex = -1;
- glColumn7.Name = "打印方式";
- glColumn7.NumericSort = false;
- glColumn7.Text = "打印方式";
- glColumn7.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn7.Width = 150;
- glColumn8.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
- glColumn8.CheckBoxes = false;
- glColumn8.ImageIndex = -1;
- glColumn8.Name = "打印时间";
- glColumn8.NumericSort = false;
- glColumn8.Text = "打印时间";
- glColumn8.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
- glColumn8.Width = 270;
+ glColumn1.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn1.CheckBoxes = false;
+ glColumn1.ImageIndex = -1;
+ glColumn1.Name = "条码";
+ glColumn1.NumericSort = false;
+ glColumn1.Text = "条码";
+ glColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn1.Width = 350;
+ glColumn2.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn2.CheckBoxes = false;
+ glColumn2.ImageIndex = -1;
+ glColumn2.Name = "产品名称";
+ glColumn2.NumericSort = false;
+ glColumn2.Text = "产品名称";
+ glColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn2.Width = 320;
+ glColumn3.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn3.CheckBoxes = false;
+ glColumn3.ImageIndex = -1;
+ glColumn3.Name = "打印方式";
+ glColumn3.NumericSort = false;
+ glColumn3.Text = "打印方式";
+ glColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn3.Width = 150;
+ glColumn4.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn4.CheckBoxes = false;
+ glColumn4.ImageIndex = -1;
+ glColumn4.Name = "打印时间";
+ glColumn4.NumericSort = false;
+ glColumn4.Text = "打印时间";
+ glColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn4.Width = 270;
this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] {
- glColumn5,
- glColumn6,
- glColumn7,
- glColumn8});
+ glColumn1,
+ glColumn2,
+ glColumn3,
+ glColumn4});
this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal;
this.glacialList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.glacialList1.Font = new System.Drawing.Font("宋体", 15.75F);
@@ -840,14 +840,14 @@
this.glacialList1.ItemHeight = 50;
this.glacialList1.ItemWordWrap = false;
this.glacialList1.Location = new System.Drawing.Point(0, 0);
- this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.glacialList1.Name = "glacialList1";
this.glacialList1.Selectable = true;
this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue;
this.glacialList1.ShowBorder = true;
this.glacialList1.ShowFocusRect = false;
- this.glacialList1.Size = new System.Drawing.Size(2286, 976);
+ this.glacialList1.Size = new System.Drawing.Size(2494, 1116);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -860,9 +860,9 @@
this.panel25.Controls.Add(this.panel36);
this.panel25.Dock = System.Windows.Forms.DockStyle.Left;
this.panel25.Location = new System.Drawing.Point(0, 0);
- this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel25.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(380, 976);
+ this.panel25.Size = new System.Drawing.Size(414, 1116);
this.panel25.TabIndex = 0;
//
// tableLayoutPanel2
@@ -872,13 +872,13 @@
this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406);
- this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 262F));
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 300F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570);
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(414, 652);
this.tableLayoutPanel2.TabIndex = 1;
//
// panel38
@@ -890,19 +890,20 @@
this.panel38.Controls.Add(this.label26);
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
- this.panel38.Location = new System.Drawing.Point(5, 4);
- this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel38.Location = new System.Drawing.Point(6, 4);
+ this.panel38.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(370, 252);
+ this.panel38.Size = new System.Drawing.Size(402, 288);
this.panel38.TabIndex = 1;
//
// btn_lastBoxPrintR
//
this.btn_lastBoxPrintR.BackColor = System.Drawing.Color.Aquamarine;
this.btn_lastBoxPrintR.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_lastBoxPrintR.Location = new System.Drawing.Point(255, 129);
+ this.btn_lastBoxPrintR.Location = new System.Drawing.Point(278, 148);
+ this.btn_lastBoxPrintR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btn_lastBoxPrintR.Name = "btn_lastBoxPrintR";
- this.btn_lastBoxPrintR.Size = new System.Drawing.Size(116, 123);
+ this.btn_lastBoxPrintR.Size = new System.Drawing.Size(126, 140);
this.btn_lastBoxPrintR.TabIndex = 4;
this.btn_lastBoxPrintR.Text = "右侧前一箱单";
this.btn_lastBoxPrintR.UseVisualStyleBackColor = false;
@@ -912,9 +913,10 @@
//
this.btn_lastBoxPrintL.BackColor = System.Drawing.Color.Aquamarine;
this.btn_lastBoxPrintL.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_lastBoxPrintL.Location = new System.Drawing.Point(255, 0);
+ this.btn_lastBoxPrintL.Location = new System.Drawing.Point(278, 0);
+ this.btn_lastBoxPrintL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btn_lastBoxPrintL.Name = "btn_lastBoxPrintL";
- this.btn_lastBoxPrintL.Size = new System.Drawing.Size(116, 123);
+ this.btn_lastBoxPrintL.Size = new System.Drawing.Size(126, 140);
this.btn_lastBoxPrintL.TabIndex = 2;
this.btn_lastBoxPrintL.Text = "左侧前一箱单";
this.btn_lastBoxPrintL.UseVisualStyleBackColor = false;
@@ -923,10 +925,10 @@
// label27
//
this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label27.Location = new System.Drawing.Point(-3, 171);
- this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label27.Location = new System.Drawing.Point(-4, 196);
+ this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(291, 73);
+ this.label27.Size = new System.Drawing.Size(318, 84);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -935,20 +937,20 @@
//
this.label26.AutoSize = true;
this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label26.Location = new System.Drawing.Point(0, 136);
- this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label26.Location = new System.Drawing.Point(0, 156);
+ this.label26.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(151, 33);
+ this.label26.Size = new System.Drawing.Size(169, 37);
this.label26.TabIndex = 2;
this.label26.Text = "完成数量";
//
// label17
//
this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label17.Location = new System.Drawing.Point(-3, 49);
- this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label17.Location = new System.Drawing.Point(-4, 56);
+ this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(291, 74);
+ this.label17.Size = new System.Drawing.Size(318, 84);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -957,10 +959,10 @@
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label16.Location = new System.Drawing.Point(0, 10);
- this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label16.Location = new System.Drawing.Point(0, 12);
+ this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(151, 33);
+ this.label16.Size = new System.Drawing.Size(169, 37);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
@@ -970,11 +972,11 @@
this.groupBox1.Controls.Add(this.tableLayoutPanel3);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox1.Location = new System.Drawing.Point(4, 266);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Location = new System.Drawing.Point(4, 304);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(372, 300);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Size = new System.Drawing.Size(406, 344);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "模具2";
@@ -989,14 +991,14 @@
this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0);
this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 32);
- this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 36);
+ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 3;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 264);
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(398, 304);
this.tableLayoutPanel3.TabIndex = 2;
//
// panel47
@@ -1007,10 +1009,10 @@
this.panel47.Controls.Add(this.lbNeedQtyR);
this.panel47.Controls.Add(this.lbCurrentlQtyR);
this.panel47.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel47.Location = new System.Drawing.Point(4, 179);
- this.panel47.Margin = new System.Windows.Forms.Padding(4);
+ this.panel47.Location = new System.Drawing.Point(4, 206);
+ this.panel47.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel47.Name = "panel47";
- this.panel47.Size = new System.Drawing.Size(356, 81);
+ this.panel47.Size = new System.Drawing.Size(390, 94);
this.panel47.TabIndex = 4;
//
// btnHandPrintR
@@ -1018,10 +1020,10 @@
this.btnHandPrintR.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnHandPrintR.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnHandPrintR.Location = new System.Drawing.Point(247, 16);
- this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4);
+ this.btnHandPrintR.Location = new System.Drawing.Point(270, 18);
+ this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnHandPrintR.Name = "btnHandPrintR";
- this.btnHandPrintR.Size = new System.Drawing.Size(115, 64);
+ this.btnHandPrintR.Size = new System.Drawing.Size(126, 74);
this.btnHandPrintR.TabIndex = 3;
this.btnHandPrintR.Text = "打印";
this.btnHandPrintR.UseVisualStyleBackColor = false;
@@ -1031,10 +1033,10 @@
//
this.label30.AutoSize = true;
this.label30.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label30.Location = new System.Drawing.Point(86, 25);
+ this.label30.Location = new System.Drawing.Point(94, 28);
this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(50, 52);
+ this.label30.Size = new System.Drawing.Size(56, 59);
this.label30.TabIndex = 2;
this.label30.Text = "/";
//
@@ -1042,10 +1044,10 @@
//
this.lbNeedQtyR.AutoSize = true;
this.lbNeedQtyR.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbNeedQtyR.Location = new System.Drawing.Point(160, 28);
+ this.lbNeedQtyR.Location = new System.Drawing.Point(174, 32);
this.lbNeedQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbNeedQtyR.Name = "lbNeedQtyR";
- this.lbNeedQtyR.Size = new System.Drawing.Size(50, 52);
+ this.lbNeedQtyR.Size = new System.Drawing.Size(56, 59);
this.lbNeedQtyR.TabIndex = 1;
this.lbNeedQtyR.Text = "0";
//
@@ -1053,10 +1055,10 @@
//
this.lbCurrentlQtyR.AutoSize = true;
this.lbCurrentlQtyR.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbCurrentlQtyR.Location = new System.Drawing.Point(7, 27);
+ this.lbCurrentlQtyR.Location = new System.Drawing.Point(8, 30);
this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbCurrentlQtyR.Name = "lbCurrentlQtyR";
- this.lbCurrentlQtyR.Size = new System.Drawing.Size(50, 52);
+ this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59);
this.lbCurrentlQtyR.TabIndex = 0;
this.lbCurrentlQtyR.Text = "0";
this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click);
@@ -1066,10 +1068,10 @@
this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label34.BackColor = System.Drawing.Color.Transparent;
this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label34.Location = new System.Drawing.Point(5, 108);
- this.label34.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label34.Location = new System.Drawing.Point(6, 125);
+ this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(106, 46);
+ this.label34.Size = new System.Drawing.Size(116, 52);
this.label34.TabIndex = 1;
this.label34.Text = "规格:";
this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1080,10 +1082,10 @@
this.lbPackageCodeR.AutoSize = true;
this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2);
this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbPackageCodeR.Location = new System.Drawing.Point(4, 27);
+ this.lbPackageCodeR.Location = new System.Drawing.Point(4, 32);
this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbPackageCodeR.Name = "lbPackageCodeR";
- this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33);
+ this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37);
this.lbPackageCodeR.TabIndex = 5;
//
// panel49
@@ -1091,9 +1093,10 @@
this.panel49.Controls.Add(this.btnChangeSizeR);
this.panel49.Controls.Add(this.comBoxSizeR);
this.panel49.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel49.Location = new System.Drawing.Point(124, 90);
+ this.panel49.Location = new System.Drawing.Point(136, 105);
+ this.panel49.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel49.Name = "panel49";
- this.panel49.Size = new System.Drawing.Size(237, 82);
+ this.panel49.Size = new System.Drawing.Size(258, 93);
this.panel49.TabIndex = 6;
//
// btnChangeSizeR
@@ -1101,10 +1104,10 @@
this.btnChangeSizeR.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnChangeSizeR.Location = new System.Drawing.Point(127, 15);
- this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4);
+ this.btnChangeSizeR.Location = new System.Drawing.Point(138, 18);
+ this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnChangeSizeR.Name = "btnChangeSizeR";
- this.btnChangeSizeR.Size = new System.Drawing.Size(121, 64);
+ this.btnChangeSizeR.Size = new System.Drawing.Size(132, 74);
this.btnChangeSizeR.TabIndex = 4;
this.btnChangeSizeR.Text = "调整";
this.btnChangeSizeR.UseVisualStyleBackColor = false;
@@ -1117,10 +1120,10 @@
this.comBoxSizeR.Enabled = false;
this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comBoxSizeR.FormattingEnabled = true;
- this.comBoxSizeR.Location = new System.Drawing.Point(0, 18);
- this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comBoxSizeR.Location = new System.Drawing.Point(0, 19);
+ this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.comBoxSizeR.Name = "comBoxSizeR";
- this.comBoxSizeR.Size = new System.Drawing.Size(125, 64);
+ this.comBoxSizeR.Size = new System.Drawing.Size(136, 72);
this.comBoxSizeR.TabIndex = 3;
//
// panel36
@@ -1128,26 +1131,26 @@
this.panel36.Controls.Add(this.tableLayoutPanel1);
this.panel36.Dock = System.Windows.Forms.DockStyle.Top;
this.panel36.Location = new System.Drawing.Point(0, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel36.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(380, 406);
+ this.panel36.Size = new System.Drawing.Size(414, 464);
this.panel36.TabIndex = 0;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00047F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 74.99953F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(414, 464);
this.tableLayoutPanel1.TabIndex = 1;
//
// label11
@@ -1155,10 +1158,10 @@
this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label11.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.label11.Location = new System.Drawing.Point(5, 18);
- this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label11.Location = new System.Drawing.Point(6, 22);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(370, 83);
+ this.label11.Size = new System.Drawing.Size(400, 94);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -1169,11 +1172,11 @@
this.groupBox2.Controls.Add(this.tableLayoutPanel4);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold);
- this.groupBox2.Location = new System.Drawing.Point(4, 105);
- this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox2.Location = new System.Drawing.Point(4, 120);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox2.Size = new System.Drawing.Size(372, 297);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox2.Size = new System.Drawing.Size(406, 340);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "模具1&&手打";
@@ -1188,15 +1191,15 @@
this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0);
this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 32);
- this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 36);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 3;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F));
- this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 261);
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(398, 300);
this.tableLayoutPanel4.TabIndex = 3;
//
// label38
@@ -1204,10 +1207,10 @@
this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label38.BackColor = System.Drawing.Color.Transparent;
this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label38.Location = new System.Drawing.Point(5, 106);
- this.label38.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label38.Location = new System.Drawing.Point(6, 123);
+ this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(106, 46);
+ this.label38.Size = new System.Drawing.Size(116, 52);
this.label38.TabIndex = 1;
this.label38.Text = "规格:";
this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1220,10 +1223,10 @@
this.panel46.Controls.Add(this.lbNeedQtyL);
this.panel46.Controls.Add(this.lbCurrentlQtyL);
this.panel46.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel46.Location = new System.Drawing.Point(4, 177);
- this.panel46.Margin = new System.Windows.Forms.Padding(4);
+ this.panel46.Location = new System.Drawing.Point(4, 203);
+ this.panel46.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel46.Name = "panel46";
- this.panel46.Size = new System.Drawing.Size(356, 80);
+ this.panel46.Size = new System.Drawing.Size(390, 93);
this.panel46.TabIndex = 4;
//
// btnHandPrintL
@@ -1231,10 +1234,10 @@
this.btnHandPrintL.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnHandPrintL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnHandPrintL.Location = new System.Drawing.Point(245, 13);
- this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4);
+ this.btnHandPrintL.Location = new System.Drawing.Point(268, 14);
+ this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnHandPrintL.Name = "btnHandPrintL";
- this.btnHandPrintL.Size = new System.Drawing.Size(115, 64);
+ this.btnHandPrintL.Size = new System.Drawing.Size(126, 74);
this.btnHandPrintL.TabIndex = 3;
this.btnHandPrintL.Text = "打印";
this.btnHandPrintL.UseVisualStyleBackColor = false;
@@ -1244,10 +1247,10 @@
//
this.label31.AutoSize = true;
this.label31.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label31.Location = new System.Drawing.Point(83, 25);
+ this.label31.Location = new System.Drawing.Point(90, 28);
this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(50, 52);
+ this.label31.Size = new System.Drawing.Size(56, 59);
this.label31.TabIndex = 2;
this.label31.Text = "/";
//
@@ -1255,10 +1258,10 @@
//
this.lbNeedQtyL.AutoSize = true;
this.lbNeedQtyL.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbNeedQtyL.Location = new System.Drawing.Point(155, 28);
+ this.lbNeedQtyL.Location = new System.Drawing.Point(170, 32);
this.lbNeedQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbNeedQtyL.Name = "lbNeedQtyL";
- this.lbNeedQtyL.Size = new System.Drawing.Size(50, 52);
+ this.lbNeedQtyL.Size = new System.Drawing.Size(56, 59);
this.lbNeedQtyL.TabIndex = 1;
this.lbNeedQtyL.Text = "0";
//
@@ -1266,10 +1269,10 @@
//
this.lbCurrentlQtyL.AutoSize = true;
this.lbCurrentlQtyL.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbCurrentlQtyL.Location = new System.Drawing.Point(8, 27);
+ this.lbCurrentlQtyL.Location = new System.Drawing.Point(8, 30);
this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbCurrentlQtyL.Name = "lbCurrentlQtyL";
- this.lbCurrentlQtyL.Size = new System.Drawing.Size(50, 52);
+ this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59);
this.lbCurrentlQtyL.TabIndex = 0;
this.lbCurrentlQtyL.Text = "0";
this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click);
@@ -1280,10 +1283,10 @@
this.lbPackageCodeL.AutoSize = true;
this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2);
this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbPackageCodeL.Location = new System.Drawing.Point(4, 26);
+ this.lbPackageCodeL.Location = new System.Drawing.Point(4, 31);
this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbPackageCodeL.Name = "lbPackageCodeL";
- this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33);
+ this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37);
this.lbPackageCodeL.TabIndex = 5;
//
// panel48
@@ -1291,9 +1294,10 @@
this.panel48.Controls.Add(this.btnChangeSizeL);
this.panel48.Controls.Add(this.comBoxSizeL);
this.panel48.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel48.Location = new System.Drawing.Point(124, 89);
+ this.panel48.Location = new System.Drawing.Point(136, 103);
+ this.panel48.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel48.Name = "panel48";
- this.panel48.Size = new System.Drawing.Size(237, 81);
+ this.panel48.Size = new System.Drawing.Size(258, 92);
this.panel48.TabIndex = 6;
//
// btnChangeSizeL
@@ -1301,10 +1305,10 @@
this.btnChangeSizeL.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnChangeSizeL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnChangeSizeL.Location = new System.Drawing.Point(127, 10);
- this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4);
+ this.btnChangeSizeL.Location = new System.Drawing.Point(138, 12);
+ this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnChangeSizeL.Name = "btnChangeSizeL";
- this.btnChangeSizeL.Size = new System.Drawing.Size(115, 64);
+ this.btnChangeSizeL.Size = new System.Drawing.Size(126, 74);
this.btnChangeSizeL.TabIndex = 4;
this.btnChangeSizeL.Text = "调整";
this.btnChangeSizeL.UseVisualStyleBackColor = false;
@@ -1317,10 +1321,10 @@
this.comBoxSizeL.Enabled = false;
this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comBoxSizeL.FormattingEnabled = true;
- this.comBoxSizeL.Location = new System.Drawing.Point(2, 9);
- this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comBoxSizeL.Location = new System.Drawing.Point(2, 10);
+ this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.comBoxSizeL.Name = "comBoxSizeL";
- this.comBoxSizeL.Size = new System.Drawing.Size(125, 64);
+ this.comBoxSizeL.Size = new System.Drawing.Size(136, 72);
this.comBoxSizeL.TabIndex = 3;
//
// panel8
@@ -1329,9 +1333,9 @@
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel8.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2666, 91);
+ this.panel8.Size = new System.Drawing.Size(2908, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -1339,10 +1343,10 @@
this.panel10.Controls.Add(this.panel12);
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(380, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel10.Location = new System.Drawing.Point(414, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(2286, 91);
+ this.panel10.Size = new System.Drawing.Size(2494, 104);
this.panel10.TabIndex = 2;
//
// panel12
@@ -1350,10 +1354,10 @@
this.panel12.Controls.Add(this.panel16);
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1835, 91);
+ this.panel12.Size = new System.Drawing.Size(2002, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -1361,10 +1365,10 @@
this.panel16.Controls.Add(this.panel20);
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(467, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel16.Location = new System.Drawing.Point(510, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1368, 91);
+ this.panel16.Size = new System.Drawing.Size(1492, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -1372,10 +1376,10 @@
this.panel20.Controls.Add(this.label10);
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel20.Location = new System.Drawing.Point(428, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel20.Location = new System.Drawing.Point(466, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(940, 91);
+ this.panel20.Size = new System.Drawing.Size(1026, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -1383,10 +1387,10 @@
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Location = new System.Drawing.Point(341, 0);
- this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
+ this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(599, 91);
+ this.label10.Size = new System.Drawing.Size(654, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1397,9 +1401,9 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel22.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -1409,9 +1413,9 @@
this.label9.Dock = System.Windows.Forms.DockStyle.Fill;
this.label9.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label9.Location = new System.Drawing.Point(0, 0);
- this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1423,9 +1427,9 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel19.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(428, 91);
+ this.panel19.Size = new System.Drawing.Size(466, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -1433,10 +1437,10 @@
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.label8.Location = new System.Drawing.Point(202, 0);
- this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
+ this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(226, 91);
+ this.label8.Size = new System.Drawing.Size(246, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1446,9 +1450,9 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel21.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -1458,9 +1462,9 @@
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label7.Location = new System.Drawing.Point(0, 0);
- this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1472,19 +1476,19 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel15.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(467, 91);
+ this.panel15.Size = new System.Drawing.Size(510, 104);
this.panel15.TabIndex = 0;
//
// panel18
//
this.panel18.Controls.Add(this.label6);
this.panel18.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel18.Location = new System.Drawing.Point(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(265, 91);
+ this.panel18.Size = new System.Drawing.Size(290, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -1493,9 +1497,9 @@
this.label6.Dock = System.Windows.Forms.DockStyle.Fill;
this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label6.Location = new System.Drawing.Point(0, 0);
- this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(265, 91);
+ this.label6.Size = new System.Drawing.Size(290, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1505,9 +1509,9 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel17.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -1517,9 +1521,9 @@
this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label5.Location = new System.Drawing.Point(0, 0);
- this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1532,19 +1536,19 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel11.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
this.panel11.TabIndex = 0;
//
// panel14
//
this.panel14.Controls.Add(this.comboBox1);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel14.Location = new System.Drawing.Point(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1557,9 +1561,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
//
// panel13
@@ -1567,9 +1571,9 @@
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel13.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1579,9 +1583,9 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label4.Location = new System.Drawing.Point(0, 0);
- this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1591,9 +1595,9 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel9.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(380, 91);
+ this.panel9.Size = new System.Drawing.Size(414, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1603,9 +1607,9 @@
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label3.Location = new System.Drawing.Point(0, 0);
- this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(380, 91);
+ this.label3.Size = new System.Drawing.Size(414, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1616,9 +1620,9 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2666, 147);
+ this.panel2.Size = new System.Drawing.Size(2908, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1626,10 +1630,10 @@
this.panel4.Controls.Add(this.panel6);
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(311, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel4.Location = new System.Drawing.Point(340, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2355, 147);
+ this.panel4.Size = new System.Drawing.Size(2568, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1639,17 +1643,18 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel6.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(2003, 147);
+ this.panel6.Size = new System.Drawing.Size(2184, 168);
this.panel6.TabIndex = 1;
//
// checkBox1
//
this.checkBox1.AutoSize = true;
- this.checkBox1.Location = new System.Drawing.Point(1603, 60);
+ this.checkBox1.Location = new System.Drawing.Point(1748, 68);
+ this.checkBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.checkBox1.Name = "checkBox1";
- this.checkBox1.Size = new System.Drawing.Size(120, 25);
+ this.checkBox1.Size = new System.Drawing.Size(138, 28);
this.checkBox1.TabIndex = 2;
this.checkBox1.Text = "插入异常";
this.checkBox1.UseVisualStyleBackColor = true;
@@ -1659,9 +1664,10 @@
//
this.btnOnlyBarCode.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnOnlyBarCode.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnOnlyBarCode.Location = new System.Drawing.Point(3, 1);
+ this.btnOnlyBarCode.Location = new System.Drawing.Point(4, 2);
+ this.btnOnlyBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOnlyBarCode.Name = "btnOnlyBarCode";
- this.btnOnlyBarCode.Size = new System.Drawing.Size(217, 143);
+ this.btnOnlyBarCode.Size = new System.Drawing.Size(236, 164);
this.btnOnlyBarCode.TabIndex = 1;
this.btnOnlyBarCode.Text = "条码模式";
this.btnOnlyBarCode.UseVisualStyleBackColor = false;
@@ -1673,9 +1679,9 @@
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold);
this.label1.Location = new System.Drawing.Point(0, 0);
- this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(2003, 147);
+ this.label1.Size = new System.Drawing.Size(2184, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间箱码条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1684,10 +1690,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(2003, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel5.Location = new System.Drawing.Point(2184, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1696,9 +1702,9 @@
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold);
this.label2.Location = new System.Drawing.Point(0, 0);
- this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1710,19 +1716,31 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel3.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(311, 147);
+ this.panel3.Size = new System.Drawing.Size(340, 168);
this.panel3.TabIndex = 0;
//
+ // lbVer
+ //
+ this.lbVer.AutoSize = true;
+ this.lbVer.BackColor = System.Drawing.SystemColors.Window;
+ this.lbVer.ForeColor = System.Drawing.Color.LightSkyBlue;
+ this.lbVer.Location = new System.Drawing.Point(16, 138);
+ this.lbVer.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbVer.Name = "lbVer";
+ this.lbVer.Size = new System.Drawing.Size(34, 24);
+ this.lbVer.TabIndex = 1;
+ this.lbVer.Text = " ";
+ //
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(5, 4);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.pictureBox1.Location = new System.Drawing.Point(6, 4);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(307, 139);
+ this.pictureBox1.Size = new System.Drawing.Size(334, 158);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1761,25 +1779,14 @@
this.timer3.Interval = 5000;
this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
//
- // lbVer
- //
- this.lbVer.AutoSize = true;
- this.lbVer.BackColor = System.Drawing.SystemColors.Window;
- this.lbVer.ForeColor = System.Drawing.Color.LightSkyBlue;
- this.lbVer.Location = new System.Drawing.Point(14, 120);
- this.lbVer.Name = "lbVer";
- this.lbVer.Size = new System.Drawing.Size(32, 21);
- this.lbVer.TabIndex = 1;
- this.lbVer.Text = " ";
- //
// FrmMain2408
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2666, 1600);
+ this.ClientSize = new System.Drawing.Size(2908, 1790);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.Name = "FrmMain2408";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs
index 2d03f2b..dc22294 100644
--- a/InjectionPC/FrmMain2408.cs
+++ b/InjectionPC/FrmMain2408.cs
@@ -569,7 +569,7 @@ namespace InjectionPC
md.Des1 = PartName;
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, mould, false, IsOne, IsSupply, ManufacturerName,"",ref errMsg);//PLC来信号,切换计划后,IsSame == "1"时插入
+ bool saveRst = SaveInfo(md, true, mould, false,0, IsOne, IsSupply, ManufacturerName,"",ref errMsg);//PLC来信号,切换计划后,IsSame == "1"时插入
if (saveRst == false)
{
LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:"+ errMsg, MethodBase.GetCurrentMethod());
@@ -680,7 +680,7 @@ namespace InjectionPC
}
string fileName214 = AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName("0", "Print" + Program.station + "_887");
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, mould, false, IsOne, IsSupply, ManufacturerName, fileName214, ref errMsg); //PLC来信号,切换计划后,IsSame == "0"时插入
+ bool saveRst = SaveInfo(md, true, mould, false, 0, IsOne, IsSupply, ManufacturerName, fileName214, ref errMsg); //PLC来信号,切换计划后,IsSame == "0"时插入
if (saveRst == false)
{
LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod());
@@ -902,7 +902,7 @@ namespace InjectionPC
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, mould, false, IsOne, IsSupply, ManufacturerName,"", ref errMsg);//PLC来信号,IsSame == "1"时插入
+ bool saveRst = SaveInfo(md, true, mould, false, 0, IsOne, IsSupply, ManufacturerName,"", ref errMsg);//PLC来信号,IsSame == "1"时插入
if (saveRst == false)
{
LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod());
@@ -1045,7 +1045,7 @@ namespace InjectionPC
}
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, mould, false, IsOne, IsSupply, ManufacturerName, filename214, ref errMsg);//PLC来信号,IsSame == "0"时插入
+ bool saveRst = SaveInfo(md, true, mould, false, 0, IsOne, IsSupply, ManufacturerName, filename214, ref errMsg);//PLC来信号,IsSame == "0"时插入
if (saveRst == false)
{
LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod());
@@ -1140,7 +1140,7 @@ namespace InjectionPC
{
string filename = "";
string printName = "";
- if (IsOne != "1")
+ if (IsOne == "1")
{
if(isSupply != "1")
{
@@ -1395,7 +1395,7 @@ namespace InjectionPC
}
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, same[j].ToString(), false, IsOne, "0", "","", ref errMsg);
+ bool saveRst = SaveInfo(md, true, same[j].ToString(), false,0, IsOne, "0", "","", ref errMsg);
if (saveRst == false)
{
LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod());
@@ -1499,7 +1499,7 @@ namespace InjectionPC
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, true, same[j].ToString(), false, IsOne, "0", "","", ref errMsg);
+ bool saveRst = SaveInfo(md, true, same[j].ToString(), false,0, IsOne, "0", "","", ref errMsg);
if (saveRst == false)
{
LogErrBLL.AddInfo($"自动打印[{partNo[j].ToString()}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod());
@@ -2010,7 +2010,7 @@ namespace InjectionPC
}
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, false, "0", i == printCount, IsOne, IsSupply, ManufacturerName,"", ref errMsg);//手工打印条码 非直供件
+ bool saveRst = SaveInfo(md, false, "0", i == printCount,4, IsOne, IsSupply, ManufacturerName,"", ref errMsg);//手工打印条码 非直供件
if (saveRst == false)
{
LogErrBLL.AddInfo($"手工打印[{partNo}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod());
@@ -2099,7 +2099,7 @@ namespace InjectionPC
}
string errMsg = string.Empty;
- bool saveRst = SaveInfo(md, false, "0", false, IsOne, IsSupply, ManufacturerName,"", ref errMsg); //手工打印条码 非直供件
+ bool saveRst = SaveInfo(md, false, "0", false,4, IsOne, IsSupply, ManufacturerName,"", ref errMsg); //手工打印条码 非直供件
if (saveRst == false)
{
LogErrBLL.AddInfo($"手工打印[{partNo}],条码" + md.OneBarCode + "报错:" + errMsg, MethodBase.GetCurrentMethod());
@@ -3258,7 +3258,7 @@ namespace InjectionPC
- bool SaveBarCode(BarCodeModel bcm,string tableName, bool isAutoPrint,string mould, ref string errorMsg, bool handPrint = false)
+ bool SaveBarCode(BarCodeModel bcm,string tableName, bool isAutoPrint,string mould, int isHandPrint, ref string errorMsg, bool handPrint = false)
{
Label lbPackageCode = lbPackageCodeL;
Label lbCurrentlQty = lbCurrentlQtyL;
@@ -3373,7 +3373,7 @@ namespace InjectionPC
_lastBoxNoR = lbPackageCodeR.Text;
//打印箱码
- PrintBoxCode(dt.Rows[0], realCount, mould);
+ PrintBoxCode(dt.Rows[0], realCount, mould, isHandPrint);
// _lastBoxNo = lbPackageCodeL.Text;
lbPackageCodeL.Text = "";
}
@@ -3468,7 +3468,8 @@ namespace InjectionPC
///
///
///
- private void PrintBoxCode(DataRow boxRow,int realCount,string mould)
+ /// 0:自动打印 1:手动点左侧打印,2:切换计划打印 3:切换模式打印 4:操作页面手动打印 5:查询页面手动打印
+ private void PrintBoxCode(DataRow boxRow,int realCount,string mould, int isHandPrint)
{
SaveLog3(Program.station + "箱单打印mould="+ mould);
string filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf";
@@ -3495,7 +3496,7 @@ namespace InjectionPC
row["PackCount"] = realCount;
row["Line"] = boxRow["StationNo"].ToString()+"注塑机";
}
- UpdateBoxRecordPrintState(boxCode);
+ UpdateBoxRecordPrintState(boxCode, isHandPrint);
string printBoxName = string.Empty;
if (mould == "1")
{
@@ -3517,9 +3518,9 @@ namespace InjectionPC
}
- private void UpdateBoxRecordPrintState(string UpdatePrinted)
+ private void UpdateBoxRecordPrintState(string UpdatePrinted,int isHandPrint)
{
- _injectionBoxBLL.UpdatePrinted(UpdatePrinted);
+ _injectionBoxBLL.UpdatePrinted(UpdatePrinted, isHandPrint);
}
@@ -3528,7 +3529,7 @@ namespace InjectionPC
///
///
///
- private void CheckPackageCode(string partCode, bool autoPrint,string mould, string partName)
+ private void CheckPackageCode(string partCode, bool autoPrint,string mould, string partName, int isHandPrint)
{
if (autoPrint == true || (autoPrint == false && cboxHandBox.Checked == true))
{
@@ -3577,7 +3578,7 @@ namespace InjectionPC
{
DataTable dt = _injectionBoxBLL.SearchBox(pkgCode);
MessageBox.Show($"箱码[{pkgCode}]产品与当前产品[{partCode}]不匹配,将会打印上一箱码,请知悉!");
- CompleteBoxAndPrint(dt.Rows[0], mould, lbPackageCode, lbCurrentlQty);
+ CompleteBoxAndPrint(dt.Rows[0], mould, lbPackageCode, lbCurrentlQty, isHandPrint);
string packageCode = GetPackageCode(partCode, autoPrint);
InjectionBoxModel boxmd = new InjectionBoxModel();
@@ -3606,7 +3607,7 @@ namespace InjectionPC
if(boxRow["IsPrint"].ToString() == "1")
{
lbPackageCode.Text = "";
- CheckPackageCode(partCode, autoPrint, mould, partName);
+ CheckPackageCode(partCode, autoPrint, mould, partName, isHandPrint);
}
else
{
@@ -3615,7 +3616,7 @@ namespace InjectionPC
if(boxCount>= standCount)
{
lbPackageCode.Text = "";
- CheckPackageCode(partCode, autoPrint, mould, partName);
+ CheckPackageCode(partCode, autoPrint, mould, partName, isHandPrint);
}
}
@@ -3639,7 +3640,12 @@ namespace InjectionPC
///
void GetSjBarCode(string stockNo,string partNo, bool autoPrint,string mould,string partName,string printTest, ref string newOneCode,ref string newCode)
{
- CheckPackageCode(partNo, autoPrint, mould, partName);
+ int kkk = 0;
+ if(autoPrint == false)
+ {
+ kkk = 1;
+ }
+ CheckPackageCode(partNo, autoPrint, mould, partName, kkk);
string batch = GetBatch(autoPrint);
GetBarCode(stockNo, batch, partNo, ref newOneCode, ref newCode);
@@ -3857,6 +3863,7 @@ namespace InjectionPC
///
void GetSupplyCode(string stockNo, string partNo,string qLevel, bool autoPrint,string mould,string partName, ref string newOneCode, ref string newCode)
{
+ int k = 0;
string batch = string.Empty;
if (autoPrint)
{
@@ -3865,12 +3872,13 @@ namespace InjectionPC
}
else
{
+ k = 1;
batch = textBox1.Text.Trim();
}
newCode = _uniqueBll.GetSupplySerialNo(partNo, qLevel, batch);
newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
- CheckPackageCode(partNo, autoPrint, mould, partName);
+ CheckPackageCode(partNo, autoPrint, mould, partName,k);
}
private void btnHandPrintL_Click(object sender, EventArgs e)
@@ -4034,8 +4042,8 @@ namespace InjectionPC
return false;
}
}
-
- CompleteBoxAndPrint(dt.Rows[0], "0", lbPackageCodeL, lbCurrentlQtyL);
+
+ CompleteBoxAndPrint(dt.Rows[0], "0", lbPackageCodeL, lbCurrentlQtyL, 1);
lbPackageCodeL.Text = "";
comBoxSizeL.SelectedIndex = -1;
lbNeedQtyL.Text = "0";
@@ -4057,7 +4065,7 @@ namespace InjectionPC
}
}
- CompleteBoxAndPrint(dt.Rows[0], "1", lbPackageCodeR, lbCurrentlQtyR);
+ CompleteBoxAndPrint(dt.Rows[0], "1", lbPackageCodeR, lbCurrentlQtyR,1);
lbPackageCodeR.Text = "";
comBoxSizeR.SelectedIndex = -1;
lbNeedQtyR.Text = "0";
@@ -4070,7 +4078,7 @@ namespace InjectionPC
///
/// 完成箱单并打印箱单
///
- bool CompleteBoxAndPrint( DataRow boxRow,string mould, Label lbPackageCode, Label lbCurrentlQty)
+ bool CompleteBoxAndPrint( DataRow boxRow,string mould, Label lbPackageCode, Label lbCurrentlQty , int isHandPrint)
{
try
{
@@ -4080,7 +4088,7 @@ namespace InjectionPC
string rst = _wmsBll.SaveInterface(boxRow["BoxNo"].ToString(), "", "", MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工, Program.station);
if (string.IsNullOrEmpty(rst))
{
- PrintBoxCode(boxRow, int.Parse(boxRow["BoxCount"].ToString()), mould);
+ PrintBoxCode(boxRow, int.Parse(boxRow["BoxCount"].ToString()), mould, isHandPrint);
}
else
{
@@ -4313,7 +4321,7 @@ namespace InjectionPC
MessageBox.Show("没找到上一个箱码");
return;
}
- PrintBoxCode(dr, int.Parse(dr["BoxCount"].ToString()), "0");
+ PrintBoxCode(dr, int.Parse(dr["BoxCount"].ToString()), "0",6);
}
@@ -4327,7 +4335,7 @@ namespace InjectionPC
MessageBox.Show("没找到上一个箱码");
return;
}
- PrintBoxCode(dr, int.Parse(dr["StandardQty"].ToString()), "1");
+ PrintBoxCode(dr, int.Parse(dr["StandardQty"].ToString()), "1",6);
}
List GetProductBoxSize(string productCode,ref string currentSize)
@@ -4517,7 +4525,7 @@ namespace InjectionPC
private BarCodeModel _lastFailedModelL = null;
private BarCodeModel _lastFailedModelR = null;
- bool SaveInfo(BarCodeModel md, bool isAutoPrint, string mould, bool handPrint,string isOne,string IsSupply,string ManufacturerName,string fileName214, ref string errMsg)
+ bool SaveInfo(BarCodeModel md, bool isAutoPrint, string mould, bool handPrint,int isHandPrint,string isOne,string IsSupply,string ManufacturerName,string fileName214, ref string errMsg)
{
//if (_lastFailedModelL != null && mould == "0")
//{
@@ -4539,7 +4547,7 @@ namespace InjectionPC
//重发成功,更新 IsRight=1, RepeatTimes +1,UpdateTime 重发失败,更新IsRight=0, RepeatTimes +1,UpdateTime
//重发后,保存完,检查箱码数量是数量,为空或者大于等于标包,生成新箱码.
- CheckPackageCode(failRow["PartNo"].ToString(), isAutoPrint, failRow["Model"].ToString(), failRow["PartName"].ToString());
+ CheckPackageCode(failRow["PartNo"].ToString(), isAutoPrint, failRow["Model"].ToString(), failRow["PartName"].ToString(), isHandPrint);
BarCodeModel md1 = new BarCodeModel();
if(failRow["Model"].ToString() == "0")
{
@@ -4569,7 +4577,7 @@ namespace InjectionPC
- bool saveRst= SaveBarCode(md1, Program.tableName, isAutoPrint, failRow["Model"].ToString(), ref errMsg, handPrint);
+ bool saveRst= SaveBarCode(md1, Program.tableName, isAutoPrint, failRow["Model"].ToString(),isHandPrint, ref errMsg, handPrint);
if (saveRst == true)
{
if(handPrint == false)
@@ -4582,7 +4590,7 @@ namespace InjectionPC
}
SaveBarcodeFailInfo(null, Program.station, md1.OneBarCode, 1, md1.BoxNo, "", failRow["Model"].ToString(), "补发成功", md1.PartNo, md1.Des1);
- CheckPackageCode(failRow["PartNo"].ToString(), isAutoPrint, failRow["Model"].ToString(), failRow["PartName"].ToString());
+ CheckPackageCode(failRow["PartNo"].ToString(), isAutoPrint, failRow["Model"].ToString(), failRow["PartName"].ToString(), isHandPrint);
}
else
{
@@ -4593,8 +4601,8 @@ namespace InjectionPC
}
//发送前,检查当前箱码, 为空或者箱码数量等于标包,情况箱码,重新生成新的箱码 250420
- CheckPackageCode(md.PartNo, isAutoPrint, mould, md.Des1);
- bool rst = SaveBarCode(md, Program.tableName, isAutoPrint, mould, ref errMsg, handPrint);
+ CheckPackageCode(md.PartNo, isAutoPrint, mould, md.Des1, isHandPrint);
+ bool rst = SaveBarCode(md, Program.tableName, isAutoPrint, mould, isHandPrint, ref errMsg, handPrint);
return rst;
}
diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs
index 20675e7..6bec79a 100644
--- a/InjectionPC/FrmMain2411.Designer.cs
+++ b/InjectionPC/FrmMain2411.Designer.cs
@@ -184,9 +184,9 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1600);
+ this.panel1.Size = new System.Drawing.Size(2560, 1829);
this.panel1.TabIndex = 0;
//
// panel7
@@ -195,10 +195,10 @@
this.panel7.Controls.Add(this.panel8);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.panel7.Location = new System.Drawing.Point(0, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2347, 1453);
+ this.panel7.Size = new System.Drawing.Size(2560, 1661);
this.panel7.TabIndex = 1;
//
// panel23
@@ -206,10 +206,10 @@
this.panel23.Controls.Add(this.panel27);
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel23.Location = new System.Drawing.Point(0, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2347, 1362);
+ this.panel23.Size = new System.Drawing.Size(2560, 1557);
this.panel23.TabIndex = 1;
//
// panel27
@@ -217,10 +217,10 @@
this.panel27.Controls.Add(this.panel29);
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel27.Location = new System.Drawing.Point(0, 976);
- this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel27.Location = new System.Drawing.Point(0, 1115);
+ this.panel27.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2347, 386);
+ this.panel27.Size = new System.Drawing.Size(2560, 442);
this.panel27.TabIndex = 1;
//
// panel29
@@ -228,10 +228,10 @@
this.panel29.Controls.Add(this.panel31);
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel29.Location = new System.Drawing.Point(311, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel29.Location = new System.Drawing.Point(339, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2036, 386);
+ this.panel29.Size = new System.Drawing.Size(2221, 442);
this.panel29.TabIndex = 1;
//
// panel31
@@ -239,10 +239,10 @@
this.panel31.Controls.Add(this.panel33);
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel31.Location = new System.Drawing.Point(122, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel31.Location = new System.Drawing.Point(133, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(1914, 386);
+ this.panel31.Size = new System.Drawing.Size(2088, 442);
this.panel31.TabIndex = 1;
//
// panel33
@@ -250,10 +250,10 @@
this.panel33.Controls.Add(this.panel35);
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel33.Location = new System.Drawing.Point(122, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel33.Location = new System.Drawing.Point(133, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1792, 386);
+ this.panel33.Size = new System.Drawing.Size(1955, 442);
this.panel33.TabIndex = 1;
//
// panel35
@@ -261,9 +261,9 @@
this.panel35.Controls.Add(this.panel37);
this.panel35.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel35.Location = new System.Drawing.Point(0, 0);
- this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel35.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1670, 386);
+ this.panel35.Size = new System.Drawing.Size(1822, 442);
this.panel35.TabIndex = 1;
//
// panel37
@@ -271,9 +271,9 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel37.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1670, 386);
+ this.panel37.Size = new System.Drawing.Size(1822, 442);
this.panel37.TabIndex = 1;
//
// panel40
@@ -282,9 +282,9 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel40.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1670, 386);
+ this.panel40.Size = new System.Drawing.Size(1822, 442);
this.panel40.TabIndex = 1;
//
// panel42
@@ -293,9 +293,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1548, 386);
+ this.panel42.Size = new System.Drawing.Size(1689, 442);
this.panel42.TabIndex = 1;
//
// panel39
@@ -312,19 +312,19 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel39.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1426, 386);
+ this.panel39.Size = new System.Drawing.Size(1556, 442);
this.panel39.TabIndex = 1;
//
// lbDevState
//
this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbDevState.Location = new System.Drawing.Point(556, 291);
+ this.lbDevState.Location = new System.Drawing.Point(607, 333);
this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbDevState.Name = "lbDevState";
- this.lbDevState.Size = new System.Drawing.Size(347, 58);
+ this.lbDevState.Size = new System.Drawing.Size(378, 66);
this.lbDevState.TabIndex = 16;
this.lbDevState.Text = "设备已连接";
this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -333,20 +333,20 @@
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(220, 291);
- this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox2.Location = new System.Drawing.Point(240, 333);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(302, 65);
+ this.textBox2.Size = new System.Drawing.Size(329, 74);
this.textBox2.TabIndex = 13;
//
// label18
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.Location = new System.Drawing.Point(40, 304);
+ this.label18.Location = new System.Drawing.Point(44, 347);
this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -354,10 +354,10 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.Location = new System.Drawing.Point(606, 178);
+ this.label19.Location = new System.Drawing.Point(661, 203);
this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -365,20 +365,20 @@
//
this.textBox1.Enabled = false;
this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(223, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox1.Location = new System.Drawing.Point(243, 197);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
this.textBox1.TabIndex = 10;
//
// label20
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label20.Location = new System.Drawing.Point(41, 186);
+ this.label20.Location = new System.Drawing.Point(45, 213);
this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -387,10 +387,10 @@
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(223, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox2.Location = new System.Drawing.Point(243, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(851, 50);
+ this.comboBox2.Size = new System.Drawing.Size(928, 56);
this.comboBox2.TabIndex = 8;
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
//
@@ -398,10 +398,10 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(41, 70);
+ this.label21.Location = new System.Drawing.Point(45, 80);
this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -409,10 +409,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1426, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel43.Location = new System.Drawing.Point(1556, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(122, 386);
+ this.panel43.Size = new System.Drawing.Size(133, 442);
this.panel43.TabIndex = 0;
//
// label23
@@ -423,7 +423,7 @@
this.label23.Location = new System.Drawing.Point(0, 0);
this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(122, 386);
+ this.label23.Size = new System.Drawing.Size(133, 442);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -433,10 +433,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1548, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel41.Location = new System.Drawing.Point(1689, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(122, 386);
+ this.panel41.Size = new System.Drawing.Size(133, 442);
this.panel41.TabIndex = 0;
//
// label22
@@ -447,7 +447,7 @@
this.label22.Location = new System.Drawing.Point(0, 0);
this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(122, 386);
+ this.label22.Size = new System.Drawing.Size(133, 442);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -457,10 +457,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1670, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel34.Location = new System.Drawing.Point(1822, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(122, 386);
+ this.panel34.Size = new System.Drawing.Size(133, 442);
this.panel34.TabIndex = 0;
//
// label15
@@ -471,7 +471,7 @@
this.label15.Location = new System.Drawing.Point(0, 0);
this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(122, 386);
+ this.label15.Size = new System.Drawing.Size(133, 442);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -482,9 +482,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(122, 386);
+ this.panel32.Size = new System.Drawing.Size(133, 442);
this.panel32.TabIndex = 0;
//
// label14
@@ -495,7 +495,7 @@
this.label14.Location = new System.Drawing.Point(0, 0);
this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(122, 386);
+ this.label14.Size = new System.Drawing.Size(133, 442);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -506,9 +506,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(122, 386);
+ this.panel30.Size = new System.Drawing.Size(133, 442);
this.panel30.TabIndex = 0;
//
// label13
@@ -519,7 +519,7 @@
this.label13.Location = new System.Drawing.Point(0, 0);
this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(122, 386);
+ this.label13.Size = new System.Drawing.Size(133, 442);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -530,9 +530,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(311, 386);
+ this.panel28.Size = new System.Drawing.Size(339, 442);
this.panel28.TabIndex = 0;
//
// label12
@@ -544,7 +544,7 @@
this.label12.Location = new System.Drawing.Point(0, 0);
this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(311, 386);
+ this.label12.Size = new System.Drawing.Size(339, 442);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -555,9 +555,9 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel24.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2347, 976);
+ this.panel24.Size = new System.Drawing.Size(2560, 1115);
this.panel24.TabIndex = 0;
//
// panel26
@@ -566,10 +566,10 @@
this.panel26.Controls.Add(this.panel44);
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel26.Location = new System.Drawing.Point(380, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel26.Location = new System.Drawing.Point(415, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(1967, 976);
+ this.panel26.Size = new System.Drawing.Size(2145, 1115);
this.panel26.TabIndex = 1;
//
// panel45
@@ -579,19 +579,19 @@
this.panel45.Controls.Add(this.button4);
this.panel45.Controls.Add(this.textBox4);
this.panel45.Controls.Add(this.label25);
- this.panel45.Location = new System.Drawing.Point(296, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel45.Location = new System.Drawing.Point(323, 677);
+ this.panel45.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1281, 132);
+ this.panel45.Size = new System.Drawing.Size(1397, 151);
this.panel45.TabIndex = 2;
//
// button3
//
this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1129, 38);
- this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button3.Location = new System.Drawing.Point(1232, 43);
+ this.button3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 59);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -600,10 +600,10 @@
// button4
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(951, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button4.Location = new System.Drawing.Point(1037, 43);
+ this.button4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 59);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -612,20 +612,20 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(308, 39);
- this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox4.Location = new System.Drawing.Point(336, 45);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
this.textBox4.TabIndex = 3;
//
// label25
//
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.Location = new System.Drawing.Point(26, 46);
+ this.label25.Location = new System.Drawing.Point(28, 53);
this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -637,19 +637,19 @@
this.panel44.Controls.Add(this.button1);
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
- this.panel44.Location = new System.Drawing.Point(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel44.Location = new System.Drawing.Point(360, 363);
+ this.panel44.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1281, 132);
+ this.panel44.Size = new System.Drawing.Size(1397, 151);
this.panel44.TabIndex = 1;
//
// button2
//
this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(1097, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button2.Location = new System.Drawing.Point(1197, 43);
+ this.button2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 59);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -658,10 +658,10 @@
// button1
//
this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(941, 35);
- this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button1.Location = new System.Drawing.Point(1027, 40);
+ this.button1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 52);
+ this.button1.Size = new System.Drawing.Size(160, 59);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -670,20 +670,20 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox3.Location = new System.Drawing.Point(208, 43);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(676, 49);
+ this.textBox3.Size = new System.Drawing.Size(737, 55);
this.textBox3.TabIndex = 1;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label24.Location = new System.Drawing.Point(25, 46);
+ this.label24.Location = new System.Drawing.Point(27, 53);
this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -754,14 +754,14 @@
this.glacialList1.ItemHeight = 57;
this.glacialList1.ItemWordWrap = false;
this.glacialList1.Location = new System.Drawing.Point(0, 0);
- this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.glacialList1.Name = "glacialList1";
this.glacialList1.Selectable = true;
this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue;
this.glacialList1.ShowBorder = true;
this.glacialList1.ShowFocusRect = false;
- this.glacialList1.Size = new System.Drawing.Size(1967, 976);
+ this.glacialList1.Size = new System.Drawing.Size(2145, 1115);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -774,9 +774,9 @@
this.panel25.Controls.Add(this.panel36);
this.panel25.Dock = System.Windows.Forms.DockStyle.Left;
this.panel25.Location = new System.Drawing.Point(0, 0);
- this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel25.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(380, 976);
+ this.panel25.Size = new System.Drawing.Size(415, 1115);
this.panel25.TabIndex = 0;
//
// tableLayoutPanel2
@@ -785,13 +785,13 @@
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406);
- this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1;
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F));
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570);
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F));
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F));
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651);
this.tableLayoutPanel2.TabIndex = 1;
//
// panel38
@@ -801,19 +801,19 @@
this.panel38.Controls.Add(this.label26);
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
- this.panel38.Location = new System.Drawing.Point(5, 4);
- this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel38.Location = new System.Drawing.Point(5, 5);
+ this.panel38.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(370, 561);
+ this.panel38.Size = new System.Drawing.Size(404, 641);
this.panel38.TabIndex = 1;
//
// label27
//
this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label27.Location = new System.Drawing.Point(-3, 171);
+ this.label27.Location = new System.Drawing.Point(-3, 195);
this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(291, 73);
+ this.label27.Size = new System.Drawing.Size(317, 83);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -822,20 +822,20 @@
//
this.label26.AutoSize = true;
this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label26.Location = new System.Drawing.Point(0, 136);
+ this.label26.Location = new System.Drawing.Point(0, 155);
this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(151, 33);
+ this.label26.Size = new System.Drawing.Size(169, 37);
this.label26.TabIndex = 2;
this.label26.Text = "完成数量";
//
// label17
//
this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label17.Location = new System.Drawing.Point(-3, 49);
+ this.label17.Location = new System.Drawing.Point(-3, 56);
this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(291, 74);
+ this.label17.Size = new System.Drawing.Size(317, 85);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -844,10 +844,10 @@
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label16.Location = new System.Drawing.Point(0, 10);
+ this.label16.Location = new System.Drawing.Point(0, 11);
this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(151, 33);
+ this.label16.Size = new System.Drawing.Size(169, 37);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
@@ -856,9 +856,9 @@
this.panel36.Controls.Add(this.tableLayoutPanel1);
this.panel36.Dock = System.Windows.Forms.DockStyle.Top;
this.panel36.Location = new System.Drawing.Point(0, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel36.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(380, 406);
+ this.panel36.Size = new System.Drawing.Size(415, 464);
this.panel36.TabIndex = 0;
//
// tableLayoutPanel1
@@ -868,12 +868,12 @@
this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 406F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406);
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 464F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464);
this.tableLayoutPanel1.TabIndex = 1;
//
// label11
@@ -884,7 +884,7 @@
this.label11.Location = new System.Drawing.Point(5, 0);
this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(370, 406);
+ this.label11.Size = new System.Drawing.Size(403, 464);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -895,9 +895,9 @@
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel8.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2347, 91);
+ this.panel8.Size = new System.Drawing.Size(2560, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -905,10 +905,10 @@
this.panel10.Controls.Add(this.panel12);
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(380, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel10.Location = new System.Drawing.Point(415, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(1967, 91);
+ this.panel10.Size = new System.Drawing.Size(2145, 104);
this.panel10.TabIndex = 2;
//
// panel12
@@ -916,10 +916,10 @@
this.panel12.Controls.Add(this.panel16);
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1516, 91);
+ this.panel12.Size = new System.Drawing.Size(1653, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -927,10 +927,10 @@
this.panel16.Controls.Add(this.panel20);
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(467, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel16.Location = new System.Drawing.Point(509, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1049, 91);
+ this.panel16.Size = new System.Drawing.Size(1144, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -938,10 +938,10 @@
this.panel20.Controls.Add(this.label10);
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel20.Location = new System.Drawing.Point(428, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel20.Location = new System.Drawing.Point(467, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(621, 91);
+ this.panel20.Size = new System.Drawing.Size(677, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -949,10 +949,10 @@
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Location = new System.Drawing.Point(341, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(280, 91);
+ this.label10.Size = new System.Drawing.Size(305, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -963,9 +963,9 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel22.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -977,7 +977,7 @@
this.label9.Location = new System.Drawing.Point(0, 0);
this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -989,9 +989,9 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel19.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(428, 91);
+ this.panel19.Size = new System.Drawing.Size(467, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -999,10 +999,10 @@
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.label8.Location = new System.Drawing.Point(202, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(226, 91);
+ this.label8.Size = new System.Drawing.Size(247, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1012,9 +1012,9 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel21.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -1026,7 +1026,7 @@
this.label7.Location = new System.Drawing.Point(0, 0);
this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1038,19 +1038,19 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel15.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(467, 91);
+ this.panel15.Size = new System.Drawing.Size(509, 104);
this.panel15.TabIndex = 0;
//
// panel18
//
this.panel18.Controls.Add(this.label6);
this.panel18.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel18.Location = new System.Drawing.Point(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(265, 91);
+ this.panel18.Size = new System.Drawing.Size(289, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -1061,7 +1061,7 @@
this.label6.Location = new System.Drawing.Point(0, 0);
this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(265, 91);
+ this.label6.Size = new System.Drawing.Size(289, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1071,9 +1071,9 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel17.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -1085,7 +1085,7 @@
this.label5.Location = new System.Drawing.Point(0, 0);
this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1097,19 +1097,19 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel11.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
this.panel11.TabIndex = 0;
//
// panel14
//
this.panel14.Controls.Add(this.comboBox1);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel14.Location = new System.Drawing.Point(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1122,9 +1122,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
//
// panel13
@@ -1132,9 +1132,9 @@
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel13.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1146,7 +1146,7 @@
this.label4.Location = new System.Drawing.Point(0, 0);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1156,9 +1156,9 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel9.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(380, 91);
+ this.panel9.Size = new System.Drawing.Size(415, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1170,7 +1170,7 @@
this.label3.Location = new System.Drawing.Point(0, 0);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(380, 91);
+ this.label3.Size = new System.Drawing.Size(415, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1181,9 +1181,9 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2347, 147);
+ this.panel2.Size = new System.Drawing.Size(2560, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1191,10 +1191,10 @@
this.panel4.Controls.Add(this.panel6);
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(311, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel4.Location = new System.Drawing.Point(339, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2036, 147);
+ this.panel4.Size = new System.Drawing.Size(2221, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1203,9 +1203,9 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel6.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1684, 147);
+ this.panel6.Size = new System.Drawing.Size(1837, 168);
this.panel6.TabIndex = 1;
//
// btnBarCodeWithBox
@@ -1214,7 +1214,7 @@
this.btnBarCodeWithBox.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBarCodeWithBox.Location = new System.Drawing.Point(0, 1);
this.btnBarCodeWithBox.Name = "btnBarCodeWithBox";
- this.btnBarCodeWithBox.Size = new System.Drawing.Size(217, 143);
+ this.btnBarCodeWithBox.Size = new System.Drawing.Size(237, 163);
this.btnBarCodeWithBox.TabIndex = 2;
this.btnBarCodeWithBox.Text = "箱码模式";
this.btnBarCodeWithBox.UseVisualStyleBackColor = false;
@@ -1228,7 +1228,7 @@
this.label1.Location = new System.Drawing.Point(0, 0);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1684, 147);
+ this.label1.Size = new System.Drawing.Size(1837, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1237,10 +1237,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1684, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel5.Location = new System.Drawing.Point(1837, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1251,7 +1251,7 @@
this.label2.Location = new System.Drawing.Point(0, 0);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1262,19 +1262,19 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(311, 147);
+ this.panel3.Size = new System.Drawing.Size(339, 168);
this.panel3.TabIndex = 0;
//
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(5, 4);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.pictureBox1.Location = new System.Drawing.Point(5, 5);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(307, 139);
+ this.pictureBox1.Size = new System.Drawing.Size(335, 159);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1315,12 +1315,12 @@
//
// FrmMain2411
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1600);
+ this.ClientSize = new System.Drawing.Size(2560, 1829);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.Name = "FrmMain2411";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionPC/FrmMainNew.Designer.cs b/InjectionPC/FrmMainNew.Designer.cs
index d460853..d82e488 100644
--- a/InjectionPC/FrmMainNew.Designer.cs
+++ b/InjectionPC/FrmMainNew.Designer.cs
@@ -170,9 +170,9 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1533);
+ this.panel1.Size = new System.Drawing.Size(2560, 1752);
this.panel1.TabIndex = 0;
//
// panel7
@@ -181,10 +181,10 @@
this.panel7.Controls.Add(this.panel8);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.panel7.Location = new System.Drawing.Point(0, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2347, 1386);
+ this.panel7.Size = new System.Drawing.Size(2560, 1584);
this.panel7.TabIndex = 1;
//
// panel23
@@ -192,10 +192,10 @@
this.panel23.Controls.Add(this.panel27);
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel23.Location = new System.Drawing.Point(0, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2347, 1295);
+ this.panel23.Size = new System.Drawing.Size(2560, 1480);
this.panel23.TabIndex = 1;
//
// panel27
@@ -203,10 +203,10 @@
this.panel27.Controls.Add(this.panel29);
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel27.Location = new System.Drawing.Point(0, 1088);
- this.panel27.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel27.Location = new System.Drawing.Point(0, 1243);
+ this.panel27.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2347, 207);
+ this.panel27.Size = new System.Drawing.Size(2560, 237);
this.panel27.TabIndex = 1;
//
// panel29
@@ -214,10 +214,10 @@
this.panel29.Controls.Add(this.panel31);
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel29.Location = new System.Drawing.Point(310, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel29.Location = new System.Drawing.Point(338, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2037, 207);
+ this.panel29.Size = new System.Drawing.Size(2222, 237);
this.panel29.TabIndex = 1;
//
// panel31
@@ -225,10 +225,10 @@
this.panel31.Controls.Add(this.panel33);
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel31.Location = new System.Drawing.Point(134, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel31.Location = new System.Drawing.Point(146, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(1903, 207);
+ this.panel31.Size = new System.Drawing.Size(2076, 237);
this.panel31.TabIndex = 1;
//
// panel33
@@ -236,10 +236,10 @@
this.panel33.Controls.Add(this.panel35);
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel33.Location = new System.Drawing.Point(134, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel33.Location = new System.Drawing.Point(146, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1769, 207);
+ this.panel33.Size = new System.Drawing.Size(1930, 237);
this.panel33.TabIndex = 1;
//
// panel35
@@ -248,9 +248,9 @@
this.panel35.Controls.Add(this.panel36);
this.panel35.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel35.Location = new System.Drawing.Point(0, 0);
- this.panel35.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel35.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1635, 207);
+ this.panel35.Size = new System.Drawing.Size(1784, 237);
this.panel35.TabIndex = 1;
//
// panel37
@@ -258,9 +258,9 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel37.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1501, 207);
+ this.panel37.Size = new System.Drawing.Size(1638, 237);
this.panel37.TabIndex = 1;
//
// panel40
@@ -269,9 +269,9 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel40.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1501, 207);
+ this.panel40.Size = new System.Drawing.Size(1638, 237);
this.panel40.TabIndex = 1;
//
// panel42
@@ -280,9 +280,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel42.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1367, 207);
+ this.panel42.Size = new System.Drawing.Size(1492, 237);
this.panel42.TabIndex = 1;
//
// panel39
@@ -298,28 +298,28 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel39.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1233, 207);
+ this.panel39.Size = new System.Drawing.Size(1346, 237);
this.panel39.TabIndex = 1;
//
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(220, 292);
- this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox2.Location = new System.Drawing.Point(240, 334);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(303, 65);
+ this.textBox2.Size = new System.Drawing.Size(330, 74);
this.textBox2.TabIndex = 13;
//
// label18
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.Location = new System.Drawing.Point(40, 303);
- this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label18.Location = new System.Drawing.Point(44, 346);
+ this.label18.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -327,30 +327,30 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.Location = new System.Drawing.Point(607, 177);
- this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label19.Location = new System.Drawing.Point(662, 202);
+ this.label19.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(222, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox1.Location = new System.Drawing.Point(242, 197);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
this.textBox1.TabIndex = 10;
//
// label20
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label20.Location = new System.Drawing.Point(42, 186);
- this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label20.Location = new System.Drawing.Point(46, 213);
+ this.label20.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -359,20 +359,20 @@
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(222, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.comboBox2.Location = new System.Drawing.Point(242, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(923, 59);
+ this.comboBox2.Size = new System.Drawing.Size(1007, 66);
this.comboBox2.TabIndex = 8;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(42, 70);
- this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label21.Location = new System.Drawing.Point(46, 80);
+ this.label21.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -380,10 +380,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1233, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel43.Location = new System.Drawing.Point(1346, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(134, 207);
+ this.panel43.Size = new System.Drawing.Size(146, 237);
this.panel43.TabIndex = 0;
//
// label23
@@ -392,9 +392,9 @@
this.label23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label23.Dock = System.Windows.Forms.DockStyle.Fill;
this.label23.Location = new System.Drawing.Point(0, 0);
- this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label23.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(134, 207);
+ this.label23.Size = new System.Drawing.Size(146, 237);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -404,10 +404,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1367, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel41.Location = new System.Drawing.Point(1492, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(134, 207);
+ this.panel41.Size = new System.Drawing.Size(146, 237);
this.panel41.TabIndex = 0;
//
// label22
@@ -416,9 +416,9 @@
this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label22.Dock = System.Windows.Forms.DockStyle.Fill;
this.label22.Location = new System.Drawing.Point(0, 0);
- this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label22.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(134, 207);
+ this.label22.Size = new System.Drawing.Size(146, 237);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -428,10 +428,10 @@
//
this.panel36.Controls.Add(this.label16);
this.panel36.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel36.Location = new System.Drawing.Point(1501, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel36.Location = new System.Drawing.Point(1638, 0);
+ this.panel36.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(134, 207);
+ this.panel36.Size = new System.Drawing.Size(146, 237);
this.panel36.TabIndex = 0;
//
// label16
@@ -440,9 +440,9 @@
this.label16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label16.Dock = System.Windows.Forms.DockStyle.Fill;
this.label16.Location = new System.Drawing.Point(0, 0);
- this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label16.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(134, 207);
+ this.label16.Size = new System.Drawing.Size(146, 237);
this.label16.TabIndex = 0;
this.label16.Text = "装箱校验";
this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -452,10 +452,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1635, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel34.Location = new System.Drawing.Point(1784, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(134, 207);
+ this.panel34.Size = new System.Drawing.Size(146, 237);
this.panel34.TabIndex = 0;
//
// label15
@@ -464,9 +464,9 @@
this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label15.Dock = System.Windows.Forms.DockStyle.Fill;
this.label15.Location = new System.Drawing.Point(0, 0);
- this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label15.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(134, 207);
+ this.label15.Size = new System.Drawing.Size(146, 237);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -477,9 +477,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel32.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(134, 207);
+ this.panel32.Size = new System.Drawing.Size(146, 237);
this.panel32.TabIndex = 0;
//
// label14
@@ -488,9 +488,9 @@
this.label14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label14.Dock = System.Windows.Forms.DockStyle.Fill;
this.label14.Location = new System.Drawing.Point(0, 0);
- this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label14.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(134, 207);
+ this.label14.Size = new System.Drawing.Size(146, 237);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -501,9 +501,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel30.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(134, 207);
+ this.panel30.Size = new System.Drawing.Size(146, 237);
this.panel30.TabIndex = 0;
//
// label13
@@ -512,9 +512,9 @@
this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label13.Dock = System.Windows.Forms.DockStyle.Fill;
this.label13.Location = new System.Drawing.Point(0, 0);
- this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label13.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(134, 207);
+ this.label13.Size = new System.Drawing.Size(146, 237);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -525,9 +525,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel28.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(310, 207);
+ this.panel28.Size = new System.Drawing.Size(338, 237);
this.panel28.TabIndex = 0;
//
// label12
@@ -537,9 +537,9 @@
this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
this.label12.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label12.Location = new System.Drawing.Point(0, 0);
- this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label12.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(310, 207);
+ this.label12.Size = new System.Drawing.Size(338, 237);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -550,9 +550,9 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel24.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2347, 1088);
+ this.panel24.Size = new System.Drawing.Size(2560, 1243);
this.panel24.TabIndex = 0;
//
// panel26
@@ -561,10 +561,10 @@
this.panel26.Controls.Add(this.panel44);
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel26.Location = new System.Drawing.Point(310, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel26.Location = new System.Drawing.Point(338, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(2037, 1088);
+ this.panel26.Size = new System.Drawing.Size(2222, 1243);
this.panel26.TabIndex = 1;
//
// panel45
@@ -573,19 +573,19 @@
this.panel45.Controls.Add(this.button4);
this.panel45.Controls.Add(this.textBox4);
this.panel45.Controls.Add(this.label25);
- this.panel45.Location = new System.Drawing.Point(319, 850);
- this.panel45.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel45.Location = new System.Drawing.Point(348, 971);
+ this.panel45.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1282, 133);
+ this.panel45.Size = new System.Drawing.Size(1399, 152);
this.panel45.TabIndex = 2;
//
// button3
//
this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1129, 37);
- this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button3.Location = new System.Drawing.Point(1232, 42);
+ this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 59);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -594,10 +594,10 @@
// button4
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(952, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button4.Location = new System.Drawing.Point(1039, 43);
+ this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 59);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -606,20 +606,20 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(308, 40);
- this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox4.Location = new System.Drawing.Point(336, 46);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
this.textBox4.TabIndex = 3;
//
// label25
//
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.Location = new System.Drawing.Point(26, 46);
- this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label25.Location = new System.Drawing.Point(28, 53);
+ this.label25.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -632,19 +632,19 @@
this.panel44.Controls.Add(this.button2);
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
- this.panel44.Location = new System.Drawing.Point(319, 586);
- this.panel44.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel44.Location = new System.Drawing.Point(348, 670);
+ this.panel44.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1280, 208);
+ this.panel44.Size = new System.Drawing.Size(1396, 237);
this.panel44.TabIndex = 1;
//
// textBox5
//
this.textBox5.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox5.Location = new System.Drawing.Point(218, 121);
- this.textBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox5.Location = new System.Drawing.Point(238, 138);
+ this.textBox5.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(677, 49);
+ this.textBox5.Size = new System.Drawing.Size(738, 55);
this.textBox5.TabIndex = 5;
this.textBox5.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox5_KeyDown);
//
@@ -652,10 +652,10 @@
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label17.Location = new System.Drawing.Point(24, 128);
- this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label17.Location = new System.Drawing.Point(26, 146);
+ this.label17.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(207, 37);
+ this.label17.Size = new System.Drawing.Size(233, 42);
this.label17.TabIndex = 4;
this.label17.Text = "塑件条码：";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -663,10 +663,10 @@
// button2
//
this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(1067, 46);
- this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button2.Location = new System.Drawing.Point(1164, 53);
+ this.button2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 59);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -675,20 +675,20 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(216, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox3.Location = new System.Drawing.Point(236, 43);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(677, 49);
+ this.textBox3.Size = new System.Drawing.Size(738, 55);
this.textBox3.TabIndex = 1;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label24.Location = new System.Drawing.Point(24, 46);
- this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label24.Location = new System.Drawing.Point(26, 53);
+ this.label24.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -759,14 +759,14 @@
this.glacialList1.ItemHeight = 30;
this.glacialList1.ItemWordWrap = false;
this.glacialList1.Location = new System.Drawing.Point(0, 0);
- this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.glacialList1.Name = "glacialList1";
this.glacialList1.Selectable = true;
this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue;
this.glacialList1.ShowBorder = true;
this.glacialList1.ShowFocusRect = false;
- this.glacialList1.Size = new System.Drawing.Size(2037, 1088);
+ this.glacialList1.Size = new System.Drawing.Size(2222, 1243);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -777,9 +777,9 @@
this.panel25.Controls.Add(this.label11);
this.panel25.Dock = System.Windows.Forms.DockStyle.Left;
this.panel25.Location = new System.Drawing.Point(0, 0);
- this.panel25.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel25.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(310, 1088);
+ this.panel25.Size = new System.Drawing.Size(338, 1243);
this.panel25.TabIndex = 0;
//
// label11
@@ -788,9 +788,9 @@
this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label11.Dock = System.Windows.Forms.DockStyle.Fill;
this.label11.Location = new System.Drawing.Point(0, 0);
- this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label11.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(310, 1088);
+ this.label11.Size = new System.Drawing.Size(338, 1243);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -801,9 +801,9 @@
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel8.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2347, 91);
+ this.panel8.Size = new System.Drawing.Size(2560, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -811,10 +811,10 @@
this.panel10.Controls.Add(this.panel12);
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(310, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel10.Location = new System.Drawing.Point(338, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(2037, 91);
+ this.panel10.Size = new System.Drawing.Size(2222, 104);
this.panel10.TabIndex = 1;
//
// panel12
@@ -822,10 +822,10 @@
this.panel12.Controls.Add(this.panel16);
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1586, 91);
+ this.panel12.Size = new System.Drawing.Size(1730, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -833,10 +833,10 @@
this.panel16.Controls.Add(this.panel20);
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(468, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel16.Location = new System.Drawing.Point(511, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1118, 91);
+ this.panel16.Size = new System.Drawing.Size(1219, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -844,10 +844,10 @@
this.panel20.Controls.Add(this.label10);
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel20.Location = new System.Drawing.Point(427, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel20.Location = new System.Drawing.Point(466, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(691, 91);
+ this.panel20.Size = new System.Drawing.Size(753, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -855,10 +855,10 @@
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Location = new System.Drawing.Point(341, 0);
- this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
+ this.label10.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(350, 91);
+ this.label10.Size = new System.Drawing.Size(381, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -869,9 +869,9 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel22.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -881,9 +881,9 @@
this.label9.Dock = System.Windows.Forms.DockStyle.Fill;
this.label9.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label9.Location = new System.Drawing.Point(0, 0);
- this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label9.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -895,9 +895,9 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel19.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(427, 91);
+ this.panel19.Size = new System.Drawing.Size(466, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -905,10 +905,10 @@
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.label8.Location = new System.Drawing.Point(202, 0);
- this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
+ this.label8.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(225, 91);
+ this.label8.Size = new System.Drawing.Size(246, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -918,9 +918,9 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel21.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -930,9 +930,9 @@
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label7.Location = new System.Drawing.Point(0, 0);
- this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label7.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -943,19 +943,19 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel15.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(468, 91);
+ this.panel15.Size = new System.Drawing.Size(511, 104);
this.panel15.TabIndex = 0;
//
// panel18
//
this.panel18.Controls.Add(this.label6);
this.panel18.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel18.Location = new System.Drawing.Point(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(266, 91);
+ this.panel18.Size = new System.Drawing.Size(291, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -964,9 +964,9 @@
this.label6.Dock = System.Windows.Forms.DockStyle.Fill;
this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label6.Location = new System.Drawing.Point(0, 0);
- this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label6.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(266, 91);
+ this.label6.Size = new System.Drawing.Size(291, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -976,9 +976,9 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel17.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -988,9 +988,9 @@
this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label5.Location = new System.Drawing.Point(0, 0);
- this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1001,19 +1001,19 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel11.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
this.panel11.TabIndex = 0;
//
// panel14
//
this.panel14.Controls.Add(this.comboBox1);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel14.Location = new System.Drawing.Point(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1026,9 +1026,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
//
// panel13
@@ -1036,9 +1036,9 @@
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel13.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1048,9 +1048,9 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label4.Location = new System.Drawing.Point(0, 0);
- this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1060,9 +1060,9 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel9.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(310, 91);
+ this.panel9.Size = new System.Drawing.Size(338, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1072,9 +1072,9 @@
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label3.Location = new System.Drawing.Point(0, 0);
- this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(310, 91);
+ this.label3.Size = new System.Drawing.Size(338, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1085,9 +1085,9 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2347, 147);
+ this.panel2.Size = new System.Drawing.Size(2560, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1095,10 +1095,10 @@
this.panel4.Controls.Add(this.panel6);
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(310, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel4.Location = new System.Drawing.Point(338, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2037, 147);
+ this.panel4.Size = new System.Drawing.Size(2222, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1106,9 +1106,9 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel6.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1685, 147);
+ this.panel6.Size = new System.Drawing.Size(1838, 168);
this.panel6.TabIndex = 1;
//
// label1
@@ -1117,9 +1117,9 @@
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold);
this.label1.Location = new System.Drawing.Point(0, 0);
- this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1685, 147);
+ this.label1.Size = new System.Drawing.Size(1838, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1128,10 +1128,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1685, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel5.Location = new System.Drawing.Point(1838, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1140,9 +1140,9 @@
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold);
this.label2.Location = new System.Drawing.Point(0, 0);
- this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1153,19 +1153,19 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(310, 147);
+ this.panel3.Size = new System.Drawing.Size(338, 168);
this.panel3.TabIndex = 0;
//
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(6, 5);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.pictureBox1.Location = new System.Drawing.Point(7, 6);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(308, 140);
+ this.pictureBox1.Size = new System.Drawing.Size(336, 160);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1180,12 +1180,12 @@
//
// FrmMainNew
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1533);
+ this.ClientSize = new System.Drawing.Size(2560, 1752);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.Name = "FrmMainNew";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionSearch/FrmBarCodeSearch2408.cs b/InjectionSearch/FrmBarCodeSearch2408.cs
index c6cdf57..614eafa 100644
--- a/InjectionSearch/FrmBarCodeSearch2408.cs
+++ b/InjectionSearch/FrmBarCodeSearch2408.cs
@@ -802,7 +802,7 @@ namespace InjectionSearch
}
private void UpdateBoxRecordPrintState(string boxCode)
{
- _injectionBoxBLL.UpdatePrinted(boxCode);
+ _injectionBoxBLL.UpdatePrinted(boxCode,5);
}
private void button1_Click(object sender, EventArgs e)
diff --git a/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs b/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
index e224e93..c741453 100644
--- a/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
+++ b/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
@@ -43,11 +43,11 @@ namespace MESClassLibrary.BLL.Inspection
{
return db.UpdateInfo(localDB,packageCode, addCount, isFinish);
}
- public bool UpdatePrinted(string packageCode)
+ public bool UpdatePrinted(string packageCode,int isHandPrint)
{
try
{
- return db.UpdatePrinted(packageCode);
+ return db.UpdatePrinted(packageCode, isHandPrint);
}
catch (Exception ex)
{
diff --git a/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs b/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
index ca94732..74d8d73 100644
--- a/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
+++ b/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
@@ -153,14 +153,20 @@ namespace MESClassLibrary.DAL.Injection
return true;
}
- public bool UpdatePrinted(string packageCode)
+ ///
+ ///
+ ///
+ ///
+ /// 0:自动打印 1:手动点左侧打印,2:切换计划打印 3:切换模式打印 4:操作页面手动打印 5:查询页面手动打印 6:补打上一箱单
+ ///
+ public bool UpdatePrinted(string packageCode,int isHandPrint)
{
try
{
#region 添加数据
string sql = "";
SqlParameter[] param = null;
- sql = "update " + TableName + " set IsPrint = 1, PrintTime=getdate() ";
+ sql = "update " + TableName + $" set IsPrint = 1, PrintTime=getdate(),IsHandPrint='{isHandPrint}' ";
sql += " where ";
sql += "BoxNo=@BoxNo";