From 65df1122dc69d250e402c1ebe2cb68ed65b66b5e Mon Sep 17 00:00:00 2001
From: "ruoxing.wang" <88384874@qq.com>
Date: Sat, 9 Nov 2024 22:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E8=B4=A8=E6=A3=80=E6=8A=A5?=
=?UTF-8?q?=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FacOneZPStation/FrmZP.Designer.cs | 90 ++--
InjectionPC/FrmMain.Designer.cs | 428 +++++++++---------
InjectionPC/FrmMain2408.Designer.cs | 17 +-
InjectionPC/FrmMain2408.cs | 62 ++-
InjectionPC/FrmMain2411.Designer.cs | 15 +
InjectionPC/FrmMain2411.cs | 69 ++-
InjectionPC/FrmQuality.cs | 175 +++++--
.../BLL/BasicInfo/BadInjectionBLL.cs | 133 ++++++
MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs | 21 +-
.../BLL/Inspection/InjectionBoxBLL.cs | 5 +
MESClassLibrary/BLL/Wms/WmsBLL.cs | 32 +-
.../DAL/BasicInfo/BadInjectionDAL.cs | 10 +-
MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs | 40 +-
.../DAL/Injection/InjectionBoxDAL.cs | 33 ++
MESClassLibrary/DAL/Wms/WmsDAL.cs | 49 +-
MESClassLibrary/Model/BadInjectionModel.cs | 1 +
16 files changed, 802 insertions(+), 378 deletions(-)
diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs
index 1c6f65d..f4eee3f 100644
--- a/FacOneZPStation/FrmZP.Designer.cs
+++ b/FacOneZPStation/FrmZP.Designer.cs
@@ -77,7 +77,7 @@
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.51529F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.62445F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.86026F));
- this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 653F));
+ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 659F));
this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0);
this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1);
@@ -102,10 +102,10 @@
this.button6.Dock = System.Windows.Forms.DockStyle.Fill;
this.button6.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button6.ForeColor = System.Drawing.Color.Black;
- this.button6.Location = new System.Drawing.Point(1693, 12);
+ this.button6.Location = new System.Drawing.Point(1687, 12);
this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(629, 161);
+ this.button6.Size = new System.Drawing.Size(635, 161);
this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false;
@@ -119,7 +119,7 @@
this.button1.Location = new System.Drawing.Point(6, 190);
this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(551, 176);
+ this.button1.Size = new System.Drawing.Size(549, 176);
this.button1.TabIndex = 6;
this.button1.Text = "打印标签";
this.button1.UseVisualStyleBackColor = false;
@@ -131,10 +131,10 @@
this.button5.Dock = System.Windows.Forms.DockStyle.Fill;
this.button5.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.ForeColor = System.Drawing.Color.Black;
- this.button5.Location = new System.Drawing.Point(1141, 197);
+ this.button5.Location = new System.Drawing.Point(1137, 197);
this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(526, 162);
+ this.button5.Size = new System.Drawing.Size(524, 162);
this.button5.TabIndex = 5;
this.button5.Text = "不合格";
this.button5.UseVisualStyleBackColor = false;
@@ -145,10 +145,10 @@
this.button4.BackColor = System.Drawing.Color.RoyalBlue;
this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
this.button4.Font = new System.Drawing.Font("黑体", 16F);
- this.button4.Location = new System.Drawing.Point(569, 5);
+ this.button4.Location = new System.Drawing.Point(567, 5);
this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(553, 175);
+ this.button4.Size = new System.Drawing.Size(551, 175);
this.button4.TabIndex = 4;
this.button4.Text = "下一计划";
this.button4.UseVisualStyleBackColor = false;
@@ -162,7 +162,7 @@
this.button3.Location = new System.Drawing.Point(6, 5);
this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(551, 175);
+ this.button3.Size = new System.Drawing.Size(549, 175);
this.button3.TabIndex = 3;
this.button3.Text = "上一计划";
this.button3.UseVisualStyleBackColor = false;
@@ -174,10 +174,10 @@
this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
this.button2.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.ForeColor = System.Drawing.Color.Black;
- this.button2.Location = new System.Drawing.Point(576, 197);
+ this.button2.Location = new System.Drawing.Point(574, 197);
this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(539, 162);
+ this.button2.Size = new System.Drawing.Size(537, 162);
this.button2.TabIndex = 2;
this.button2.Text = "补打标签";
this.button2.UseVisualStyleBackColor = false;
@@ -188,10 +188,10 @@
this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.button7.Dock = System.Windows.Forms.DockStyle.Fill;
this.button7.Font = new System.Drawing.Font("黑体", 16F);
- this.button7.Location = new System.Drawing.Point(1686, 190);
+ this.button7.Location = new System.Drawing.Point(1680, 190);
this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(643, 176);
+ this.button7.Size = new System.Drawing.Size(649, 176);
this.button7.TabIndex = 8;
this.button7.Text = "补打箱单";
this.button7.UseVisualStyleBackColor = false;
@@ -203,7 +203,7 @@
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.White;
- this.label7.Location = new System.Drawing.Point(1386, 3);
+ this.label7.Location = new System.Drawing.Point(1378, 3);
this.label7.Margin = new System.Windows.Forms.Padding(2);
this.label7.Name = "label7";
this.tableLayoutPanel4.SetRowSpan(this.label7, 2);
@@ -215,10 +215,10 @@
//
this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox2.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(400, 111);
+ this.textBox2.Location = new System.Drawing.Point(397, 111);
this.textBox2.Margin = new System.Windows.Forms.Padding(4);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(979, 77);
+ this.textBox2.Size = new System.Drawing.Size(974, 77);
this.textBox2.TabIndex = 30;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
//
@@ -230,7 +230,7 @@
this.label3.Location = new System.Drawing.Point(5, 107);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(386, 109);
+ this.label3.Size = new System.Drawing.Size(383, 109);
this.label3.TabIndex = 29;
this.label3.Text = "扫描物料条码";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -240,10 +240,10 @@
this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labOrderNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labOrderNo.ForeColor = System.Drawing.Color.White;
- this.labOrderNo.Location = new System.Drawing.Point(1640, 219);
+ this.labOrderNo.Location = new System.Drawing.Point(1632, 219);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo";
- this.labOrderNo.Size = new System.Drawing.Size(696, 152);
+ this.labOrderNo.Size = new System.Drawing.Size(704, 152);
this.labOrderNo.TabIndex = 28;
this.labOrderNo.Text = "A64654646464";
this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -254,7 +254,7 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.White;
- this.label4.Location = new System.Drawing.Point(1386, 219);
+ this.label4.Location = new System.Drawing.Point(1378, 219);
this.label4.Margin = new System.Windows.Forms.Padding(2);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(249, 152);
@@ -268,10 +268,10 @@
this.labStationNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labStationNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labStationNo.ForeColor = System.Drawing.Color.White;
- this.labStationNo.Location = new System.Drawing.Point(398, 219);
+ this.labStationNo.Location = new System.Drawing.Point(395, 219);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo";
- this.labStationNo.Size = new System.Drawing.Size(983, 152);
+ this.labStationNo.Size = new System.Drawing.Size(978, 152);
this.labStationNo.TabIndex = 26;
this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -285,7 +285,7 @@
this.label2.Location = new System.Drawing.Point(3, 219);
this.label2.Margin = new System.Windows.Forms.Padding(2);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(390, 152);
+ this.label2.Size = new System.Drawing.Size(387, 152);
this.label2.TabIndex = 25;
this.label2.Text = "工位名称";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -295,10 +295,10 @@
this.labPName.Dock = System.Windows.Forms.DockStyle.Fill;
this.labPName.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labPName.ForeColor = System.Drawing.Color.White;
- this.labPName.Location = new System.Drawing.Point(1640, 376);
+ this.labPName.Location = new System.Drawing.Point(1632, 376);
this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName";
- this.labPName.Size = new System.Drawing.Size(696, 249);
+ this.labPName.Size = new System.Drawing.Size(704, 249);
this.labPName.TabIndex = 24;
this.labPName.Text = "MF253 MF S后保";
this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -309,7 +309,7 @@
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.White;
- this.label8.Location = new System.Drawing.Point(1386, 376);
+ this.label8.Location = new System.Drawing.Point(1378, 376);
this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(249, 249);
@@ -323,10 +323,10 @@
this.labPartNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labPartNo.Font = new System.Drawing.Font("黑体", 42F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labPartNo.ForeColor = System.Drawing.Color.White;
- this.labPartNo.Location = new System.Drawing.Point(398, 376);
+ this.labPartNo.Location = new System.Drawing.Point(395, 376);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo";
- this.labPartNo.Size = new System.Drawing.Size(983, 249);
+ this.labPartNo.Size = new System.Drawing.Size(978, 249);
this.labPartNo.TabIndex = 22;
this.labPartNo.Text = "A2530822665";
this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -345,7 +345,7 @@
this.label6.Location = new System.Drawing.Point(3, 376);
this.label6.Margin = new System.Windows.Forms.Padding(2);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(390, 249);
+ this.label6.Size = new System.Drawing.Size(387, 249);
this.label6.TabIndex = 21;
this.label6.Text = "产品代码";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -356,10 +356,10 @@
this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill;
this.labBadCount.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labBadCount.ForeColor = System.Drawing.Color.Lime;
- this.labBadCount.Location = new System.Drawing.Point(1640, 630);
+ this.labBadCount.Location = new System.Drawing.Point(1632, 630);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount";
- this.labBadCount.Size = new System.Drawing.Size(696, 449);
+ this.labBadCount.Size = new System.Drawing.Size(704, 449);
this.labBadCount.TabIndex = 20;
this.labBadCount.Text = "0";
this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -370,10 +370,10 @@
this.labNum.Dock = System.Windows.Forms.DockStyle.Fill;
this.labNum.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labNum.ForeColor = System.Drawing.Color.Lime;
- this.labNum.Location = new System.Drawing.Point(398, 630);
+ this.labNum.Location = new System.Drawing.Point(395, 630);
this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum";
- this.labNum.Size = new System.Drawing.Size(983, 449);
+ this.labNum.Size = new System.Drawing.Size(978, 449);
this.labNum.TabIndex = 18;
this.labNum.Text = "152/210";
this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -387,7 +387,7 @@
this.label10.Location = new System.Drawing.Point(3, 630);
this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(390, 449);
+ this.label10.Size = new System.Drawing.Size(387, 449);
this.label10.TabIndex = 17;
this.label10.Text = "计划/完成数";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -400,7 +400,7 @@
this.label14.Location = new System.Drawing.Point(5, 1);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(386, 105);
+ this.label14.Size = new System.Drawing.Size(383, 105);
this.label14.TabIndex = 12;
this.label14.Text = "扫描本体条码";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -409,10 +409,10 @@
//
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(400, 5);
+ this.textBox1.Location = new System.Drawing.Point(397, 5);
this.textBox1.Margin = new System.Windows.Forms.Padding(4);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(979, 77);
+ this.textBox1.Size = new System.Drawing.Size(974, 77);
this.textBox1.TabIndex = 13;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
@@ -421,11 +421,11 @@
this.labErrMessage.Dock = System.Windows.Forms.DockStyle.Fill;
this.labErrMessage.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labErrMessage.ForeColor = System.Drawing.Color.Red;
- this.labErrMessage.Location = new System.Drawing.Point(1642, 1);
+ this.labErrMessage.Location = new System.Drawing.Point(1634, 1);
this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labErrMessage.Name = "labErrMessage";
this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2);
- this.labErrMessage.Size = new System.Drawing.Size(692, 215);
+ this.labErrMessage.Size = new System.Drawing.Size(700, 215);
this.labErrMessage.TabIndex = 16;
this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -438,7 +438,7 @@
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 28.52292F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 71.47708F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 253F));
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 699F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 707F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0);
this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1);
@@ -478,7 +478,7 @@
this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
this.label12.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.White;
- this.label12.Location = new System.Drawing.Point(1386, 630);
+ this.label12.Location = new System.Drawing.Point(1378, 630);
this.label12.Margin = new System.Windows.Forms.Padding(2);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(249, 449);
@@ -491,10 +491,10 @@
this.labTime.BackColor = System.Drawing.Color.Transparent;
this.labTime.Dock = System.Windows.Forms.DockStyle.Fill;
this.labTime.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labTime.Location = new System.Drawing.Point(1798, 0);
+ this.labTime.Location = new System.Drawing.Point(1794, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime";
- this.labTime.Size = new System.Drawing.Size(549, 130);
+ this.labTime.Size = new System.Drawing.Size(553, 130);
this.labTime.TabIndex = 7;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -521,7 +521,7 @@
this.label1.Location = new System.Drawing.Point(325, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1473, 130);
+ this.label1.Size = new System.Drawing.Size(1469, 130);
this.label1.TabIndex = 1;
this.label1.Text = "装配工位信息看板";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -532,7 +532,7 @@
this.tableLayoutPanel2.ColumnCount = 3;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.10651F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 81.89349F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 548F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 552F));
this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);
diff --git a/InjectionPC/FrmMain.Designer.cs b/InjectionPC/FrmMain.Designer.cs
index 6f343bb..e87b0d6 100644
--- a/InjectionPC/FrmMain.Designer.cs
+++ b/InjectionPC/FrmMain.Designer.cs
@@ -176,9 +176,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(7, 6, 7, 6);
+ this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2560, 1759);
+ this.panel1.Size = new System.Drawing.Size(2347, 1539);
this.panel1.TabIndex = 0;
//
// panel7
@@ -187,10 +187,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, 168);
- this.panel7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel7.Location = new System.Drawing.Point(0, 147);
+ this.panel7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2560, 1591);
+ this.panel7.Size = new System.Drawing.Size(2347, 1392);
this.panel7.TabIndex = 1;
//
// panel23
@@ -198,10 +198,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, 104);
- this.panel23.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel23.Location = new System.Drawing.Point(0, 91);
+ this.panel23.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2560, 1487);
+ this.panel23.Size = new System.Drawing.Size(2347, 1301);
this.panel23.TabIndex = 1;
//
// panel27
@@ -209,10 +209,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, 1114);
- this.panel27.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel27.Location = new System.Drawing.Point(0, 975);
+ this.panel27.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2560, 373);
+ this.panel27.Size = new System.Drawing.Size(2347, 326);
this.panel27.TabIndex = 1;
//
// panel29
@@ -220,10 +220,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(338, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel29.Location = new System.Drawing.Point(310, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2222, 373);
+ this.panel29.Size = new System.Drawing.Size(2037, 326);
this.panel29.TabIndex = 1;
//
// panel31
@@ -231,10 +231,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(7, 6, 7, 6);
+ this.panel31.Location = new System.Drawing.Point(123, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(2088, 373);
+ this.panel31.Size = new System.Drawing.Size(1914, 326);
this.panel31.TabIndex = 1;
//
// panel33
@@ -242,10 +242,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(7, 6, 7, 6);
+ this.panel33.Location = new System.Drawing.Point(123, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1954, 373);
+ this.panel33.Size = new System.Drawing.Size(1791, 326);
this.panel33.TabIndex = 1;
//
// panel35
@@ -253,9 +253,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(7, 6, 7, 6);
+ this.panel35.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1820, 373);
+ this.panel35.Size = new System.Drawing.Size(1668, 326);
this.panel35.TabIndex = 1;
//
// panel37
@@ -263,9 +263,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(7, 6, 7, 6);
+ this.panel37.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1820, 373);
+ this.panel37.Size = new System.Drawing.Size(1668, 326);
this.panel37.TabIndex = 1;
//
// panel40
@@ -274,9 +274,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(7, 6, 7, 6);
+ this.panel40.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1820, 373);
+ this.panel40.Size = new System.Drawing.Size(1668, 326);
this.panel40.TabIndex = 1;
//
// panel42
@@ -285,9 +285,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(7, 6, 7, 6);
+ this.panel42.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1686, 373);
+ this.panel42.Size = new System.Drawing.Size(1545, 326);
this.panel42.TabIndex = 1;
//
// panel39
@@ -303,28 +303,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(7, 6, 7, 6);
+ this.panel39.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1552, 373);
+ this.panel39.Size = new System.Drawing.Size(1422, 326);
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(240, 334);
- this.textBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.textBox2.Location = new System.Drawing.Point(220, 292);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(330, 74);
+ this.textBox2.Size = new System.Drawing.Size(303, 65);
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(44, 346);
- this.label18.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label18.Location = new System.Drawing.Point(40, 303);
+ this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(202, 58);
+ this.label18.Size = new System.Drawing.Size(178, 51);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -332,10 +332,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(662, 202);
- this.label19.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label19.Location = new System.Drawing.Point(607, 177);
+ this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(265, 58);
+ this.label19.Size = new System.Drawing.Size(238, 51);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -343,20 +343,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(242, 197);
- this.textBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.textBox1.Location = new System.Drawing.Point(222, 172);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(328, 74);
+ this.textBox1.Size = new System.Drawing.Size(301, 65);
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(46, 213);
- this.label20.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label20.Location = new System.Drawing.Point(42, 186);
+ this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(202, 58);
+ this.label20.Size = new System.Drawing.Size(178, 51);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -365,10 +365,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(242, 72);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.comboBox2.Location = new System.Drawing.Point(222, 63);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(928, 56);
+ this.comboBox2.Size = new System.Drawing.Size(851, 50);
this.comboBox2.TabIndex = 8;
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
//
@@ -376,10 +376,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(46, 80);
- this.label21.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label21.Location = new System.Drawing.Point(42, 70);
+ this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(202, 58);
+ this.label21.Size = new System.Drawing.Size(178, 51);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -387,10 +387,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1552, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel43.Location = new System.Drawing.Point(1422, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(134, 373);
+ this.panel43.Size = new System.Drawing.Size(123, 326);
this.panel43.TabIndex = 0;
//
// label23
@@ -399,9 +399,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(7, 0, 7, 0);
+ this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(134, 373);
+ this.label23.Size = new System.Drawing.Size(123, 326);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -411,10 +411,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1686, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel41.Location = new System.Drawing.Point(1545, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(134, 373);
+ this.panel41.Size = new System.Drawing.Size(123, 326);
this.panel41.TabIndex = 0;
//
// label22
@@ -423,9 +423,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(7, 0, 7, 0);
+ this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(134, 373);
+ this.label22.Size = new System.Drawing.Size(123, 326);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -435,10 +435,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1820, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel34.Location = new System.Drawing.Point(1668, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(134, 373);
+ this.panel34.Size = new System.Drawing.Size(123, 326);
this.panel34.TabIndex = 0;
//
// label15
@@ -447,9 +447,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(7, 0, 7, 0);
+ this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(134, 373);
+ this.label15.Size = new System.Drawing.Size(123, 326);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -460,9 +460,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(7, 6, 7, 6);
+ this.panel32.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(134, 373);
+ this.panel32.Size = new System.Drawing.Size(123, 326);
this.panel32.TabIndex = 0;
//
// label14
@@ -471,9 +471,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(7, 0, 7, 0);
+ this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(134, 373);
+ this.label14.Size = new System.Drawing.Size(123, 326);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -484,9 +484,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(7, 6, 7, 6);
+ this.panel30.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(134, 373);
+ this.panel30.Size = new System.Drawing.Size(123, 326);
this.panel30.TabIndex = 0;
//
// label13
@@ -495,9 +495,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(7, 0, 7, 0);
+ this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(134, 373);
+ this.label13.Size = new System.Drawing.Size(123, 326);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -508,9 +508,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(7, 6, 7, 6);
+ this.panel28.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(338, 373);
+ this.panel28.Size = new System.Drawing.Size(310, 326);
this.panel28.TabIndex = 0;
//
// label12
@@ -520,9 +520,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(7, 0, 7, 0);
+ this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(338, 373);
+ this.label12.Size = new System.Drawing.Size(310, 326);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -533,9 +533,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(7, 6, 7, 6);
+ this.panel24.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2560, 1114);
+ this.panel24.Size = new System.Drawing.Size(2347, 975);
this.panel24.TabIndex = 0;
//
// panel26
@@ -544,10 +544,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(338, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel26.Location = new System.Drawing.Point(310, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(2222, 1114);
+ this.panel26.Size = new System.Drawing.Size(2037, 975);
this.panel26.TabIndex = 1;
//
// panel45
@@ -557,19 +557,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(322, 677);
- this.panel45.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel45.Location = new System.Drawing.Point(295, 592);
+ this.panel45.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1396, 151);
+ this.panel45.Size = new System.Drawing.Size(1280, 132);
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(1232, 42);
- this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.button3.Location = new System.Drawing.Point(1129, 37);
+ this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(160, 59);
+ this.button3.Size = new System.Drawing.Size(147, 52);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -578,10 +578,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(1039, 43);
- this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.button4.Location = new System.Drawing.Point(952, 38);
+ this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(160, 59);
+ this.button4.Size = new System.Drawing.Size(147, 52);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -590,20 +590,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(336, 46);
- this.textBox4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.textBox4.Location = new System.Drawing.Point(308, 40);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(660, 55);
+ this.textBox4.Size = new System.Drawing.Size(605, 49);
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(28, 53);
- this.label25.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label25.Location = new System.Drawing.Point(26, 46);
+ this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(319, 42);
+ this.label25.Size = new System.Drawing.Size(283, 37);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -615,19 +615,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(360, 363);
- this.panel44.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel44.Location = new System.Drawing.Point(330, 318);
+ this.panel44.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1396, 151);
+ this.panel44.Size = new System.Drawing.Size(1280, 132);
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(1198, 43);
- this.button2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.button2.Location = new System.Drawing.Point(1098, 38);
+ this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(160, 59);
+ this.button2.Size = new System.Drawing.Size(147, 52);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -636,10 +636,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(1027, 53);
- this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.button1.Location = new System.Drawing.Point(941, 46);
+ this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(160, 59);
+ this.button1.Size = new System.Drawing.Size(147, 52);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -648,20 +648,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(208, 43);
- this.textBox3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.textBox3.Location = new System.Drawing.Point(191, 38);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(738, 55);
+ this.textBox3.Size = new System.Drawing.Size(677, 49);
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(26, 53);
- this.label24.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label24.Location = new System.Drawing.Point(24, 46);
+ this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(190, 42);
+ this.label24.Size = new System.Drawing.Size(169, 37);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -732,14 +732,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(7, 6, 7, 6);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 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(2222, 1114);
+ this.glacialList1.Size = new System.Drawing.Size(2037, 975);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -752,9 +752,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(7, 6, 7, 6);
+ this.panel25.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(338, 1114);
+ this.panel25.Size = new System.Drawing.Size(310, 975);
this.panel25.TabIndex = 0;
//
// panel38
@@ -765,19 +765,19 @@
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
this.panel38.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel38.Location = new System.Drawing.Point(0, 464);
- this.panel38.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel38.Location = new System.Drawing.Point(0, 406);
+ this.panel38.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(338, 650);
+ this.panel38.Size = new System.Drawing.Size(310, 569);
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(2, 458);
- this.label27.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label27.Location = new System.Drawing.Point(2, 401);
+ this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(334, 155);
+ this.label27.Size = new System.Drawing.Size(306, 136);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -785,20 +785,20 @@
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(24, 374);
- this.label26.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label26.Location = new System.Drawing.Point(22, 327);
+ this.label26.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(261, 58);
+ this.label26.Size = new System.Drawing.Size(230, 51);
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(2, 136);
- this.label17.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label17.Location = new System.Drawing.Point(2, 119);
+ this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(334, 155);
+ this.label17.Size = new System.Drawing.Size(306, 136);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -806,10 +806,10 @@
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(24, 53);
- this.label16.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label16.Location = new System.Drawing.Point(22, 46);
+ this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(261, 58);
+ this.label16.Size = new System.Drawing.Size(230, 51);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
@@ -818,9 +818,9 @@
this.panel36.Controls.Add(this.label11);
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(7, 6, 7, 6);
+ this.panel36.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(338, 464);
+ this.panel36.Size = new System.Drawing.Size(310, 406);
this.panel36.TabIndex = 0;
//
// label11
@@ -829,9 +829,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(7, 0, 7, 0);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(338, 464);
+ this.label11.Size = new System.Drawing.Size(310, 406);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -842,9 +842,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(7, 6, 7, 6);
+ this.panel8.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2560, 104);
+ this.panel8.Size = new System.Drawing.Size(2347, 91);
this.panel8.TabIndex = 0;
//
// panel10
@@ -852,10 +852,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(338, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel10.Location = new System.Drawing.Point(310, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(2222, 104);
+ this.panel10.Size = new System.Drawing.Size(2037, 91);
this.panel10.TabIndex = 1;
//
// panel12
@@ -863,10 +863,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(492, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel12.Location = new System.Drawing.Point(451, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1730, 104);
+ this.panel12.Size = new System.Drawing.Size(1586, 91);
this.panel12.TabIndex = 1;
//
// panel16
@@ -874,10 +874,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(511, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel16.Location = new System.Drawing.Point(468, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1219, 104);
+ this.panel16.Size = new System.Drawing.Size(1118, 91);
this.panel16.TabIndex = 1;
//
// panel20
@@ -885,10 +885,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(466, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel20.Location = new System.Drawing.Point(427, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(753, 104);
+ this.panel20.Size = new System.Drawing.Size(691, 91);
this.panel20.TabIndex = 1;
//
// label10
@@ -896,10 +896,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(372, 0);
- this.label10.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label10.Location = new System.Drawing.Point(341, 0);
+ this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(381, 104);
+ this.label10.Size = new System.Drawing.Size(350, 91);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -910,9 +910,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(7, 6, 7, 6);
+ this.panel22.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(372, 104);
+ this.panel22.Size = new System.Drawing.Size(341, 91);
this.panel22.TabIndex = 0;
//
// label9
@@ -922,9 +922,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(7, 0, 7, 0);
+ this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(372, 104);
+ this.label9.Size = new System.Drawing.Size(341, 91);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -936,9 +936,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(7, 6, 7, 6);
+ this.panel19.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(466, 104);
+ this.panel19.Size = new System.Drawing.Size(427, 91);
this.panel19.TabIndex = 0;
//
// label8
@@ -946,10 +946,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(220, 0);
- this.label8.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+ this.label8.Location = new System.Drawing.Point(202, 0);
+ this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(246, 104);
+ this.label8.Size = new System.Drawing.Size(225, 91);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -959,9 +959,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(7, 6, 7, 6);
+ this.panel21.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(220, 104);
+ this.panel21.Size = new System.Drawing.Size(202, 91);
this.panel21.TabIndex = 0;
//
// label7
@@ -971,9 +971,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(7, 0, 7, 0);
+ this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(220, 104);
+ this.label7.Size = new System.Drawing.Size(202, 91);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -984,19 +984,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(7, 6, 7, 6);
+ this.panel15.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(511, 104);
+ this.panel15.Size = new System.Drawing.Size(468, 91);
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(220, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel18.Location = new System.Drawing.Point(202, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(291, 104);
+ this.panel18.Size = new System.Drawing.Size(266, 91);
this.panel18.TabIndex = 1;
//
// label6
@@ -1005,9 +1005,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(7, 0, 7, 0);
+ this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(291, 104);
+ this.label6.Size = new System.Drawing.Size(266, 91);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1017,9 +1017,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(7, 6, 7, 6);
+ this.panel17.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(220, 104);
+ this.panel17.Size = new System.Drawing.Size(202, 91);
this.panel17.TabIndex = 0;
//
// label5
@@ -1029,9 +1029,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(7, 0, 7, 0);
+ this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(220, 104);
+ this.label5.Size = new System.Drawing.Size(202, 91);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1042,19 +1042,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(7, 6, 7, 6);
+ this.panel11.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(492, 104);
+ this.panel11.Size = new System.Drawing.Size(451, 91);
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(220, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel14.Location = new System.Drawing.Point(202, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(272, 104);
+ this.panel14.Size = new System.Drawing.Size(249, 91);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1067,9 +1067,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(272, 93);
+ this.comboBox1.Size = new System.Drawing.Size(249, 83);
this.comboBox1.TabIndex = 0;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
@@ -1078,9 +1078,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(7, 6, 7, 6);
+ this.panel13.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(220, 104);
+ this.panel13.Size = new System.Drawing.Size(202, 91);
this.panel13.TabIndex = 0;
//
// label4
@@ -1090,9 +1090,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(7, 0, 7, 0);
+ this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(220, 104);
+ this.label4.Size = new System.Drawing.Size(202, 91);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1102,9 +1102,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(7, 6, 7, 6);
+ this.panel9.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(338, 104);
+ this.panel9.Size = new System.Drawing.Size(310, 91);
this.panel9.TabIndex = 0;
//
// label3
@@ -1114,9 +1114,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(7, 0, 7, 0);
+ this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(338, 104);
+ this.label3.Size = new System.Drawing.Size(310, 91);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1127,9 +1127,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(7, 6, 7, 6);
+ this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2560, 168);
+ this.panel2.Size = new System.Drawing.Size(2347, 147);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1137,10 +1137,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(338, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel4.Location = new System.Drawing.Point(310, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2222, 168);
+ this.panel4.Size = new System.Drawing.Size(2037, 147);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1148,9 +1148,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(7, 6, 7, 6);
+ this.panel6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1838, 168);
+ this.panel6.Size = new System.Drawing.Size(1685, 147);
this.panel6.TabIndex = 1;
//
// label1
@@ -1159,9 +1159,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(7, 0, 7, 0);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1838, 168);
+ this.label1.Size = new System.Drawing.Size(1685, 147);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1170,10 +1170,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1838, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.panel5.Location = new System.Drawing.Point(1685, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(384, 168);
+ this.panel5.Size = new System.Drawing.Size(352, 147);
this.panel5.TabIndex = 0;
//
// label2
@@ -1182,9 +1182,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(7, 0, 7, 0);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(384, 168);
+ this.label2.Size = new System.Drawing.Size(352, 147);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1195,19 +1195,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(7, 6, 7, 6);
+ this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(338, 168);
+ this.panel3.Size = new System.Drawing.Size(310, 147);
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(7, 6);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.pictureBox1.Location = new System.Drawing.Point(6, 5);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(336, 160);
+ this.pictureBox1.Size = new System.Drawing.Size(308, 140);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1233,12 +1233,12 @@
//
// FrmMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2560, 1759);
+ this.ClientSize = new System.Drawing.Size(2347, 1539);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.Name = "FrmMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs
index f43c6ba..f0448fb 100644
--- a/InjectionPC/FrmMain2408.Designer.cs
+++ b/InjectionPC/FrmMain2408.Designer.cs
@@ -140,6 +140,7 @@
this.panel2 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.panel6 = new System.Windows.Forms.Panel();
+ this.btnOnlyBarCode = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.panel5 = new System.Windows.Forms.Panel();
this.label2 = new System.Windows.Forms.Label();
@@ -1562,6 +1563,7 @@
//
// panel6
//
+ this.panel6.Controls.Add(this.btnOnlyBarCode);
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
@@ -1570,6 +1572,18 @@
this.panel6.Size = new System.Drawing.Size(1684, 147);
this.panel6.TabIndex = 1;
//
+ // btnOnlyBarCode
+ //
+ 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(1467, 0);
+ this.btnOnlyBarCode.Name = "btnOnlyBarCode";
+ this.btnOnlyBarCode.Size = new System.Drawing.Size(217, 143);
+ this.btnOnlyBarCode.TabIndex = 1;
+ this.btnOnlyBarCode.Text = "条码模式";
+ this.btnOnlyBarCode.UseVisualStyleBackColor = false;
+ this.btnOnlyBarCode.Click += new System.EventHandler(this.btnOnlyBarCode_Click);
+ //
// label1
//
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -1580,7 +1594,7 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(1684, 147);
this.label1.TabIndex = 0;
- this.label1.Text = "注塑车间条码打印";
+ this.label1.Text = "注塑车间箱码条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel5
@@ -1865,5 +1879,6 @@
private System.Windows.Forms.Button btnChangeSizeL;
private System.Windows.Forms.Panel panel49;
private System.Windows.Forms.Button btnChangeSizeR;
+ private System.Windows.Forms.Button btnOnlyBarCode;
}
}
\ No newline at end of file
diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs
index dd361b2..f32e888 100644
--- a/InjectionPC/FrmMain2408.cs
+++ b/InjectionPC/FrmMain2408.cs
@@ -595,7 +595,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001"+"#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
}
#endregion
@@ -611,7 +611,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
//DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
//if (pdt != null && pdt.Rows.Count > 0)
//{
@@ -632,7 +632,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
// if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == true)
{
break;
}
@@ -786,7 +786,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
#endregion
}
@@ -801,7 +801,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -822,7 +822,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == true)
{
break;
}
@@ -1074,7 +1074,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
}
catch (Exception ex)
{
@@ -1097,7 +1097,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -1118,7 +1118,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == true)
{
break;
}
@@ -1289,7 +1289,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
}
catch (Exception ex)
{
@@ -1312,7 +1312,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -1333,7 +1333,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == true)
{
break;
}
@@ -1599,7 +1599,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -1620,7 +1620,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
+ if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == true)
{
break;
}
@@ -1826,7 +1826,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -1847,7 +1847,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
+ if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == true)
{
break;
}
@@ -2452,7 +2452,7 @@ namespace InjectionPC
md.PlanID = planID;
md.ProductNature = "正常件"; //第一次没有这个
-
+ md.Des1 = PartName;
DataTable dt2 = pbll.SearchIsImportByPartNo(partNo);
if (dt2 != null && dt2.Rows.Count > 0)
{
@@ -2709,7 +2709,7 @@ namespace InjectionPC
// (Convert.ToInt32(code.Substring(23, 3)) +
// i).ToString()
// .PadLeft(3, '0') + "#";
- GetSupplyCode(partNo, QLevel,false, "0", PartName, ref newcode);
+ GetSupplyCode(stockNo, partNo, QLevel,false, "0", PartName, ref NewOneCode, ref newcode);
#region 插入数据tb_barCode
@@ -3807,7 +3807,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -3878,7 +3878,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -4571,7 +4571,7 @@ namespace InjectionPC
///
///
///
- void GetSupplyCode(string partNo,string qLevel, bool autoPrint,string mould,string partName, ref string newCode)
+ void GetSupplyCode(string stockNo, string partNo,string qLevel, bool autoPrint,string mould,string partName, ref string newOneCode, ref string newCode)
{
string batch = string.Empty;
if (autoPrint)
@@ -4583,6 +4583,7 @@ namespace InjectionPC
batch = textBox1.Text.Trim();
}
newCode = _uniqueBll.GetSupplySerialNo(partNo, qLevel, batch);
+ newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
CheckPackageCode(partNo, autoPrint, mould, partName);
}
@@ -4814,6 +4815,25 @@ namespace InjectionPC
frm.ShowDialog();
+ }
+
+ private void btnOnlyBarCode_Click(object sender, EventArgs e)
+ {
+ if (MessageBox.Show("确定切换为单条码模式?", "切换确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+ try
+ {
+ this.FormClosed += (arg1, arg2) => {
+ FrmMain2411 frm = new FrmMain2411();
+ frm.Show();
+ };
+ this.Close();
+ }
+ catch(Exception ex)
+ {
+
+ }
+
+
}
string PrintMoudleName()
diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs
index 1ed9a2d..fbac697 100644
--- a/InjectionPC/FrmMain2411.Designer.cs
+++ b/InjectionPC/FrmMain2411.Designer.cs
@@ -115,6 +115,7 @@
this.panel2 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.panel6 = new System.Windows.Forms.Panel();
+ this.btnBarCodeWithBox = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.panel5 = new System.Windows.Forms.Panel();
this.label2 = new System.Windows.Forms.Label();
@@ -1184,6 +1185,7 @@
//
// panel6
//
+ this.panel6.Controls.Add(this.btnBarCodeWithBox);
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
@@ -1192,6 +1194,18 @@
this.panel6.Size = new System.Drawing.Size(1684, 147);
this.panel6.TabIndex = 1;
//
+ // btnBarCodeWithBox
+ //
+ this.btnBarCodeWithBox.BackColor = System.Drawing.Color.DeepSkyBlue;
+ 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(1464, 1);
+ this.btnBarCodeWithBox.Name = "btnBarCodeWithBox";
+ this.btnBarCodeWithBox.Size = new System.Drawing.Size(217, 143);
+ this.btnBarCodeWithBox.TabIndex = 2;
+ this.btnBarCodeWithBox.Text = "箱码模式";
+ this.btnBarCodeWithBox.UseVisualStyleBackColor = false;
+ this.btnBarCodeWithBox.Click += new System.EventHandler(this.btnBarCodeWithBox_Click);
+ //
// label1
//
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -1450,5 +1464,6 @@
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label35;
private System.Windows.Forms.Label label39;
+ private System.Windows.Forms.Button btnBarCodeWithBox;
}
}
\ No newline at end of file
diff --git a/InjectionPC/FrmMain2411.cs b/InjectionPC/FrmMain2411.cs
index 1501464..222b8b3 100644
--- a/InjectionPC/FrmMain2411.cs
+++ b/InjectionPC/FrmMain2411.cs
@@ -364,6 +364,7 @@ namespace InjectionPC
if (status == false)
{
+
MessageBox.Show("连接服务器失败!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
@@ -539,7 +540,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001"+"#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
}
#endregion
@@ -555,7 +556,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
//DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
//if (pdt != null && pdt.Rows.Count > 0)
//{
@@ -576,7 +577,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
// if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == true)
{
break;
}
@@ -730,7 +731,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
#endregion
}
@@ -745,7 +746,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -766,7 +767,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == true)
{
break;
}
@@ -1018,7 +1019,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
}
catch (Exception ex)
{
@@ -1041,7 +1042,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -1062,7 +1063,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == true)
{
break;
}
@@ -1233,7 +1234,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
+ GetSupplyCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref NewOneCode, ref newcode);
}
catch (Exception ex)
{
@@ -1256,7 +1257,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -1277,7 +1278,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == true)
{
break;
}
@@ -1543,7 +1544,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -1564,7 +1565,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
+ if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == true)
{
break;
}
@@ -1770,7 +1771,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -1791,7 +1792,7 @@ namespace InjectionPC
for (int l = 0; l < 5; l++)
{
//if (brbll.Add_Info_New(md, Program.tableName))
- if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
+ if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == true)
{
break;
}
@@ -2395,7 +2396,7 @@ namespace InjectionPC
md.PlanID = planID;
md.ProductNature = "正常件"; //第一次没有这个
-
+ md.Des1 = PartName;
DataTable dt2 = pbll.SearchIsImportByPartNo(partNo);
if (dt2 != null && dt2.Rows.Count > 0)
{
@@ -2652,7 +2653,7 @@ namespace InjectionPC
// (Convert.ToInt32(code.Substring(23, 3)) +
// i).ToString()
// .PadLeft(3, '0') + "#";
- GetSupplyCode(partNo, QLevel,false, "0", PartName, ref newcode);
+ GetSupplyCode(stockNo,partNo, QLevel,false, "0", PartName, ref NewOneCode, ref newcode);
#region 插入数据tb_barCode
@@ -2664,7 +2665,7 @@ namespace InjectionPC
md.PartNo = partNo;
md.PrintType = 1;
md.PlanID = planID;
-
+ md.Des1 = PartName;
DataTable dt2 = pbll.SearchIsImportByPartNo(partNo);
if (dt2 != null && dt2.Rows.Count > 0)
{
@@ -3725,7 +3726,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -3796,7 +3797,7 @@ namespace InjectionPC
md.PrintType = 0;
md.PlanID = planID;
md.ProductNature = ProductNature;
-
+ md.Des1 = PartName;
DataTable pdt = productBll.SearchIsImportByPartNo(partNo[j].ToString());
if (pdt != null && pdt.Rows.Count > 0)
{
@@ -4062,7 +4063,7 @@ namespace InjectionPC
bool SaveBarCode(BarCodeModel bcm,string tableName, bool isAutoPrint,string mould,bool handPrint = false)
{
- string rst = _wmsBll.SaveRecordAndInterface(bcm, Program.tableName);
+ string rst = _wmsBll.SaveRecordAndInterface(bcm, Program.tableName,"");
if (string.IsNullOrEmpty(rst))
{
return true;
@@ -4179,7 +4180,7 @@ namespace InjectionPC
///
///
///
- void GetSupplyCode(string partNo,string qLevel, bool autoPrint,string mould,string partName, ref string newCode)
+ void GetSupplyCode(string stockNo,string partNo,string qLevel, bool autoPrint,string mould,string partName, ref string newOneCode, ref string newCode)
{
string batch = string.Empty;
if (autoPrint)
@@ -4191,7 +4192,8 @@ namespace InjectionPC
batch = textBox1.Text.Trim();
}
newCode = _uniqueBll.GetSupplySerialNo(partNo, qLevel, batch);
-
+ newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
+
}
@@ -4236,7 +4238,24 @@ namespace InjectionPC
{
timer3.Enabled = false;
}
-
+
+ private void btnBarCodeWithBox_Click(object sender, EventArgs e)
+ {
+
+ if (MessageBox.Show("确定切换为箱码绑定模式?", "切换确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+ try
+ {
+ this.FormClosed += (arg1, arg2) => {
+ FrmMain2408 frm = new FrmMain2408();
+ frm.Show();
+ };
+ this.Close();
+ }
+ catch (Exception ex)
+ {
+
+ }
+ }
string PrintMoudleName()
{
diff --git a/InjectionPC/FrmQuality.cs b/InjectionPC/FrmQuality.cs
index 2a06e95..c3aebb8 100644
--- a/InjectionPC/FrmQuality.cs
+++ b/InjectionPC/FrmQuality.cs
@@ -39,10 +39,15 @@ namespace InjectionPC
private DataTable _boxDetailTable = null;
private List _boxDelList = new List();
internal event Action> QualityViewClosed = null;
- public FrmQuality()
+ public FrmQuality(bool isSingle = false)
{
InitializeComponent();
this.Size = new Size(1280, 1024);
+ if(isSingle == true)
+ {
+ txtBoxCode.Enabled = false;
+ txtBoxCode.KeyDown -= textBox1_KeyDown;
+ }
}
private void label9_Click(object sender, EventArgs e)
@@ -302,13 +307,13 @@ namespace InjectionPC
}
///
- /// 保存缺陷
+ /// 保存缺陷 1.tb_Bad_Injection 增加记录 2.tb_Injection_BoxRecord表减一条数据 3. tb_BarCode1表 IsBad=1 4.[tb_Injectionn_Interface]表增加一条QaRst=1的数据
///
///
///
private void button1_Click(object sender, EventArgs e)
{
- string stockNo = "",batchNo="",partNo="",isbox="";
+ //string stockNo = "",batchNo="",partNo="",isbox="";
foreach (Control c in pictureBox2.Controls)
{
@@ -422,6 +427,11 @@ namespace InjectionPC
#region 保存报废详细信息和是否装过箱，装过箱子的不允许报废
badmd.ID = Guid.NewGuid().ToString();
+ badmd.StationID = stationId;
+ badmd.BadPosition = position;
+ badmd.BadReason = reason.Trim();
+ badmd.code = _scanPartNo;
+ badmd.Desc = textBox4.Text?.Trim();
//直供件条码
if (txtScanBarCode.Text.Trim().Contains("#"))
{
@@ -433,9 +443,18 @@ namespace InjectionPC
badmd.OneBarCode = dt1.Rows[0]["OneBarCode"].ToString();
isbox = dt1.Rows[0]["BoxNo"].ToString();
//扣减装箱表boxRecord中箱码对应的数量
- if (SubtrBoxCount(isbox) == false)
+ //if (SubtrBoxCount(isbox) == false)
+ // return;
+
+ if (SaveBad(badmd,isbox) == false)
+ {
return;
-
+ }
+ }
+ else
+ {
+ MessageBox.Show("条码不存在!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
}
}
else
@@ -451,9 +470,10 @@ namespace InjectionPC
badmd.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
isbox = dt.Rows[0]["BoxNo"].ToString();
- //扣减装箱表boxRecord中箱码对应的数量
- if (SubtrBoxCount(isbox) == false)
+ if (SaveBad(badmd, isbox) == false)
+ {
return;
+ }
}
else
@@ -473,65 +493,144 @@ namespace InjectionPC
badmd.BarCode = dt1.Rows[0]["BarCode"].ToString();
isbox = dt1.Rows[0]["BoxNo"].ToString();
- if (SubtrBoxCount(isbox) == false)
+ if (SaveBad(badmd, isbox) == false)
+ {
return;
+ }
}
+ else
+ {
+ MessageBox.Show("条码不存在!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
}
}
- badmd.StationID = stationId;
- badmd.BadPosition = position;
- badmd.BadReason = reason.Trim();
- badBLL.Add_Info(badmd);
+
+ //badBLL.Add_Info(badmd);
#endregion
#region 更新BarCode表标志位
- barbll.UpdateIsBad(Program.tableName, badmd.OneBarCode, badmd.BarCode);
+ //barbll.UpdateIsBad(Program.tableName, badmd.OneBarCode, badmd.BarCode);
#endregion
GetBadCount();
}
+
+ bool SaveBad(BadInjectionModel badmd ,string boxCode)
+ {
+ if (!string.IsNullOrEmpty(boxCode))
+ {
+ DataTable boxTable = _injectionBoxBLL.SearchBox(boxCode);
+ if (boxTable.Rows.Count > 0)
+ {
+ if (boxTable.Rows[0]["IsPrint"].ToString() == "1")
+ {
+ MessageBox.Show("请产品已做装箱，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ reason = "";
+ txtScanBarCode.Text = "";
+ txtScanBarCode.TabIndex = 0;
+ txtScanBarCode.Focus();
+
+ textBox4.Text = "";
+ pictureBox2.Image = null;
+
+ pictureBox2.Controls.Clear();
+
+ panel2.Controls.Clear();
+ return false;
+ }
+ else
+ {
+ bool exsitInWms = _wmsBll.IsReadBarCodeInWms(badmd.BarCode);
+ if(exsitInWms == true)
+ {
+ MessageBox.Show($"条码[{badmd.BarCode}]在WMS已处理,无法在MES进行报废操作.");
+ return false;
+ }
+
+ string msg = badBLL.SaveBad(badmd,boxCode, Program.tableName);
+ if (!string.IsNullOrEmpty(msg))
+ {
+ MessageBox.Show("报废操作失败,失败原因:" + msg);
+ return false;
+ }
+ else
+ {
+ MessageBox.Show(badmd.OneBarCode +"报废操作成功");
+ }
+ }
+
+ }
+
+ }
+ return true;
+
+ }
+
+ bool SaveBadByBatch(DataTable boxDetailTable, string boxCode)
+ {
+ if (!string.IsNullOrEmpty(boxCode))
+ {
+ badmd.Desc = textBox4.Text?.Trim();
+ string msg = badBLL.SaveBadByBatch(boxDetailTable, stationId, position, reason, boxCode, Program.tableName, textBox4.Text?.Trim());
+
+ if (!string.IsNullOrEmpty(msg))
+ {
+ MessageBox.Show($"整箱报废失败:" + msg);
+ return false;
+ }
+
+ }
+ return true;
+ }
///
/// 按箱码报废
///
private void FullBoxBadSave(DataTable boxDetailTable)
{
- string isbox = "";
- if (MessageBox.Show($"确认对箱码[{txtBoxCode.Text}]所含[{boxDetailTable.Rows.Count}]条数据做报废处理?", "", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+
+ if (MessageBox.Show($"确认对箱码[{txtBoxCode.Text}]所含[{boxDetailTable.Rows.Count}]条数据做报废处理?", "", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
return;
string boxCode = boxDetailTable.Rows[0]["BoxNo"].ToString();
- foreach(DataRow dr in boxDetailTable.Rows)
- {
- string barCode = dr["BarCode"].ToString();
- string oneBarCode = dr["OneBarCode"].ToString();
- badmd = new BadInjectionModel();
- badmd.ID = Guid.NewGuid().ToString();
- badmd.BarCode = barCode;
- badmd.OneBarCode = oneBarCode;
- isbox = boxCode;
-
- badmd.StationID = stationId;
- badmd.BadPosition = position;
- badmd.BadReason = reason.Trim();
- badBLL.Add_Info(badmd);
-
- }
+ if (string.IsNullOrEmpty(boxCode))
+ return;
+
#region 扣减箱码数量
- ClearBoxCount(isbox);
- #endregion
+
+ bool isRead = _wmsBll.IsReadBoxInWms(boxCode);
+ if (isRead == true)
+ {
- #region 更新tb_BarCode表标志位
+ MessageBox.Show($"箱码[{boxCode}]已报工，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ reason = "";
+ txtScanBarCode.Text = "";
+ txtScanBarCode.TabIndex = 0;
+ txtScanBarCode.Focus();
- barbll.UpdateIsBadByBoxCode(Program.tableName, boxCode);
+ textBox4.Text = "";
+ pictureBox2.Image = null;
+
+ pictureBox2.Controls.Clear();
+ panel2.Controls.Clear();
+ return;
+ }
+ else
+ {
+ SaveBadByBatch(boxDetailTable, boxCode);
+ }
+
#endregion
+
+
GetBadCount();
}
///
@@ -633,6 +732,7 @@ namespace InjectionPC
BarCodeScan(txtScanBarCode.Text.Trim());
}
}
+ private string _scanPartNo = string.Empty;
///
/// 扫描标签质检
///
@@ -655,6 +755,8 @@ namespace InjectionPC
if (xdt != null && xdt.Rows.Count > 0)
{
code = xdt.Rows[0]["BarCode"].ToString();
+ _scanPartNo = xdt.Rows[0]["PartNo"].ToString();
+
}
else
{
@@ -662,7 +764,7 @@ namespace InjectionPC
return;
}
- barcode = code.Split('.');
+ barcode = code.Split('.');
DataTable dt = bll.SearchInfoByPartNo(barcode[0]);
if (dt != null && dt.Rows.Count > 0)
{
@@ -678,6 +780,7 @@ namespace InjectionPC
if (xdt != null && xdt.Rows.Count > 0)
{
code = xdt.Rows[0]["BarCode"].ToString();
+ _scanPartNo = xdt.Rows[0]["PartNo"].ToString();
}
else
{
diff --git a/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs b/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
index b1d1771..bd22a97 100644
--- a/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
+++ b/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
@@ -5,7 +5,10 @@ using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using MESClassLibrary.BLL.Injection;
+using MESClassLibrary.BLL.Inspection;
using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL;
using MESClassLibrary.DAL.BasicInfo;
using MESClassLibrary.EFModel;
using MESClassLibrary.Model;
@@ -19,6 +22,9 @@ namespace MESClassLibrary.BLL.BasicInfo
BadInjectionDAL db=new BadInjectionDAL();
BasicBLL da=new BasicBLL();
+ private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL();
+ private BarCodeBLL barCodeBll = new BarCodeBLL();
+ private WmsBLL _wmsBll = new WmsBLL();
public bool Add_Info(BadInjectionModel md)
{
try
@@ -230,5 +236,132 @@ namespace MESClassLibrary.BLL.BasicInfo
return "0";
}
}
+ ///
+ /// 单根报废
+ ///
+ ///
+ ///
+ ///
+ ///
+ public string SaveBad(BadInjectionModel md, string boxCode, string tableName)
+ {
+ LocalDBService localDB = new LocalDBService(SqlHelper.GetConnSting());
+
+ try
+ {
+ localDB.BeginTrans();
+ db.AddInfo(localDB, md);
+ _injectionBoxBLL.UpdateBoxCount(localDB, boxCode, -1);
+ barCodeBll.UpdateIsBad(localDB, tableName, md.OneBarCode, md.BarCode);
+ BarCodeModel bcm = new BarCodeModel();
+ bcm.IsBad = 1;
+ bcm.OneBarCode = md.OneBarCode;
+ bcm.BarCode = md.BarCode;
+ bcm.BoxNo = boxCode;
+ bcm.Des1 = md.Desc;
+ bcm.PartNo = md.code;
+ bcm.StationID = md.StationID;
+ _wmsBll.SaveInterface(localDB, bcm, md.BadReason);
+ localDB.Commit();
+ return "";
+ }
+ catch (Exception ex)
+ {
+ if (localDB != null)
+ {
+ localDB.Rollback();
+ }
+ return ex.Message;
+ }
+ finally
+ {
+ if (localDB != null)
+ {
+ localDB.EndTrans();
+ }
+ }
+
+ }
+ ///
+ /// 整箱报废
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public string SaveBadByBatch(DataTable boxDetailTable,string stationId,string position,string reason, string boxCode,string tableName,string partName)
+ {
+ LocalDBService localDB = new LocalDBService(SqlHelper.GetConnSting());
+
+ try
+ {
+ localDB.BeginTrans();
+ bool isDel = _wmsBll.DelRecordByBox(localDB,boxCode);
+ if (isDel)
+ {
+ _injectionBoxBLL.UpdateBoxCount(localDB, boxCode, 100, true);
+ }
+ else
+ {
+ localDB.Rollback();
+ return $"整箱报废失败,可能箱码[{boxCode}]在操作时已被wms接收";
+ }
+
+ foreach (DataRow dr in boxDetailTable.Rows)
+ {
+ string barCode = dr["BarCode"].ToString();
+ string oneBarCode = dr["OneBarCode"].ToString();
+ BadInjectionModel badmd = new BadInjectionModel();
+ badmd.ID = Guid.NewGuid().ToString();
+ badmd.BarCode = barCode;
+ badmd.OneBarCode = oneBarCode;
+
+
+ badmd.StationID = stationId;
+ badmd.BadPosition = position;
+ badmd.BadReason = reason.Trim();
+
+ db.AddInfo(localDB, badmd);
+
+ BarCodeModel bcm = new BarCodeModel();
+ bcm.IsBad = 1;
+ bcm.OneBarCode = oneBarCode;
+ bcm.BarCode = barCode;
+ bcm.BoxNo = boxCode;
+ bcm.Des1 = partName ;
+ bcm.PartNo = dr["PartNo"].ToString();
+ bcm.StationID = stationId;
+
+ _wmsBll.SaveInterface(localDB, bcm, reason);
+ }
+ barCodeBll.UpdateIsBadByBoxCode(localDB,tableName, boxCode);
+
+ localDB.Commit();
+ return "";
+ }
+ catch (Exception ex)
+ {
+ if (localDB != null)
+ {
+ localDB.Rollback();
+ }
+ return ex.Message;
+ }
+ finally
+ {
+ if (localDB != null)
+ {
+ localDB.EndTrans();
+ }
+ }
+
+
+
+ return "";
+ }
}
}
diff --git a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
index 2953027..5e0b241 100644
--- a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
+++ b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
@@ -325,8 +325,10 @@ namespace MESClassLibrary.BLL.BasicInfo
db.UpdateBoxNoByID(localDB, newtableName, boxCode, newID);
db.UpdateBoxNoNull(localDB, oldtableName, oldID);
badDb.AddInfo(localDB, model);
+ //删除旧的条码
wmsDal.DeleteRecord(localDB, boxCode, model.OneBarCode, model.BarCode);
- wmsDal.AddRecord(localDB, boxCode, newOneBarCode, newBarCode);
+ //保存新条码
+ wmsDal.AddRecord(localDB, boxCode, newOneBarCode, newBarCode,"0", model.Desc,"");
localDB.Commit();
return true;
}
@@ -387,6 +389,11 @@ namespace MESClassLibrary.BLL.BasicInfo
return false;
}
}
+ public bool UpdateIsBad(LocalDBService localDB, string tableName, string onebarcode, string barcode)
+ {
+ return db.UpdateIsBad(localDB,tableName, onebarcode, barcode);
+
+ }
public bool UpdateIsBadByBoxCode(string tableName, string boxNo)
{
try
@@ -399,6 +406,18 @@ namespace MESClassLibrary.BLL.BasicInfo
return false;
}
}
+ public bool UpdateIsBadByBoxCode(LocalDBService localDB, string tableName, string boxNo)
+ {
+ try
+ {
+ return db.UpdateIsBadByBoxCode(localDB,tableName, boxNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
public DataTable SearchBarCode(string boxNo, string tableName, string row)
{
try
diff --git a/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs b/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
index b9ff286..97da25f 100644
--- a/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
+++ b/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
@@ -5,6 +5,7 @@ using System.Linq;
using System.Reflection;
using System.Text;
using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL;
using MESClassLibrary.DAL.Injection;
using MESClassLibrary.Model;
@@ -38,6 +39,10 @@ namespace MESClassLibrary.BLL.Inspection
return false;
}
}
+ public bool UpdateBoxCount(LocalDBService localDB, string packageCode, int addCount, bool isFinish = false)
+ {
+ return db.UpdateInfo(localDB,packageCode, addCount, isFinish);
+ }
public bool UpdatePrinted(string packageCode)
{
try
diff --git a/MESClassLibrary/BLL/Wms/WmsBLL.cs b/MESClassLibrary/BLL/Wms/WmsBLL.cs
index 935bf83..eba3be3 100644
--- a/MESClassLibrary/BLL/Wms/WmsBLL.cs
+++ b/MESClassLibrary/BLL/Wms/WmsBLL.cs
@@ -18,7 +18,7 @@ namespace MESClassLibrary.BLL.Injection
private WmsDAL da=new WmsDAL();
private BarCodeDAl barCodeDal = new BarCodeDAl();
- public string SaveRecordAndInterface(BarCodeModel bcm,string tableName)
+ public string SaveRecordAndInterface(BarCodeModel bcm,string tableName,string badReason)
{
LocalDBService local = new LocalDBService(SqlHelper.GetConnSting());
try
@@ -26,7 +26,7 @@ namespace MESClassLibrary.BLL.Injection
local.BeginTrans();
barCodeDal.AddInfoNew(local, bcm, tableName);
- da.SaveInterface(local, bcm);
+ da.SaveInterface(local, bcm, badReason);
local.Commit();
}
catch (Exception ex)
@@ -48,7 +48,18 @@ namespace MESClassLibrary.BLL.Injection
}
-
+ public void SaveInterface(LocalDBService local ,BarCodeModel bcm,string badReason)
+ {
+ da.SaveInterface(local, bcm, badReason);
+ }
+ ///
+ /// 合格保存接口
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
public string SaveInterface(string boxNo,string lastBoxNo1,string lastBoxNo2, WmsInterfaceEnum interfaceType)
{
//上一个是否传递成功,没成功重新传 左侧
@@ -57,7 +68,7 @@ namespace MESClassLibrary.BLL.Injection
bool exsit = da.IsSendPackageCode(lastBoxNo1);
if(exsit == false)
{
- SendToInterface(lastBoxNo1);
+ SendToInterface(lastBoxNo1,"");
}
}
//上一个是否传递成功,没成功重新传 右侧侧
@@ -66,10 +77,10 @@ namespace MESClassLibrary.BLL.Injection
bool exsit = da.IsSendPackageCode(lastBoxNo2);
if (exsit == false)
{
- SendToInterface(lastBoxNo2);
+ SendToInterface(lastBoxNo2, "");
}
}
- string rst = SendToInterface(boxNo);
+ string rst = SendToInterface(boxNo,"");
if (!string.IsNullOrEmpty(rst))
{
LogErrBLL.AddInfo(rst, MethodBase.GetCurrentMethod());
@@ -80,12 +91,11 @@ namespace MESClassLibrary.BLL.Injection
}
- private string SendToInterface(string boxNo)
+ private string SendToInterface(string boxNo, string badReason)
{
DataTable barCodeTable = barCodeDal.SearchInfoByBox(boxNo);
-
- string rst = da.SaveInterface(barCodeTable);
+ string rst = da.SaveInterface(barCodeTable, badReason);
return rst;
}
///
@@ -125,5 +135,9 @@ namespace MESClassLibrary.BLL.Injection
{
return da.DelRecordByBox(boxNo);
}
+ public bool DelRecordByBox(LocalDBService localDB , string boxNo)
+ {
+ return da.DelRecordByBox(localDB, boxNo);
+ }
}
}
diff --git a/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs b/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs
index 238120c..0316fae 100644
--- a/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs
+++ b/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs
@@ -66,8 +66,7 @@ namespace MESClassLibrary.DAL.BasicInfo
}
public bool AddInfo(LocalDBService localDB, BadInjectionModel md)
{
- try
- {
+
#region 添加数据
string sql = "";
sql = $"INSERT INTO tb_Bad_Injection (ID,OneBarCode,[BarCode],[BadPosition],[BadReason],StationID)" +
@@ -77,12 +76,7 @@ namespace MESClassLibrary.DAL.BasicInfo
#endregion
return true;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
+
}
public DataTable SearchByCode(string code)
{
diff --git a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
index 6d0f058..3d426f0 100644
--- a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
+++ b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
@@ -371,7 +371,7 @@ namespace MESClassLibrary.DAL.BasicInfo
string sql = "";
SqlParameter[] param = null;
sql = "INSERT INTO " + tableName + " (ID,StationID,OneBarCode,[BarCode],[StockNo],[PartNo],[PrintType],[CreateTime],[IsImport],StationID2,PlanID,ProductNature,Des1,Des2,Des3,Des4,Des5,BoxNo,Weight";
- sql += $") VALUES ('{md.ID}','{md.StationID}','{md.OneBarCode}','{md.BarCode}','{md.StockNo}','{md.PartNo}','{md.PrintType}','{md.Import}'," +
+ sql += $") VALUES ('{md.ID}','{md.StationID}','{md.OneBarCode}','{md.BarCode}','{md.StockNo}','{md.PartNo}','{md.PrintType}',getdate(),'{md.Import}'," +
$"'{md.StationID2}','{md.PlanID}','{md.ProductNature}','{md.Des1}','{md.Des2}','{md.Des3}','{md.Des4}','{md.Des5}','{md.BoxNo}','{ md.Weight}')";
@@ -1001,6 +1001,31 @@ namespace MESClassLibrary.DAL.BasicInfo
return false;
}
}
+ public bool UpdateIsBad(LocalDBService localDB, string tableName, string onebarcode, string barcode)
+ {
+ string sql = "";
+ SqlParameter[] param = null;
+
+ param = new SqlParameter[1];
+
+ if (onebarcode != "")
+ {
+ //sql = @"update " + tableName + " set IsBad=1 where OneBarCode=@OneBarCode and BoxNo is null";
+ sql = @"update " + tableName + $" set IsBad=1 where OneBarCode='{onebarcode}'";
+
+
+ }
+
+ else if (barcode != "")
+ {
+ //sql = @"update " + tableName + " set IsBad=1 where BarCode=@BarCode and BoxNo is null";
+ sql = @"update " + tableName + $" set IsBad=1 where BarCode='{barcode}'";
+ }
+ localDB.Exec_NonQuery(sql);
+
+ return true;
+
+ }
///
/// 根据箱码更新IsBad=1
///
@@ -1041,6 +1066,19 @@ namespace MESClassLibrary.DAL.BasicInfo
return false;
}
}
+ public bool UpdateIsBadByBoxCode(LocalDBService localDB, string tableName, string boxCode)
+ {
+ string sql = "";
+ SqlParameter[] param = null;
+
+ param = new SqlParameter[1];
+
+
+ sql = @"update " + tableName + $" set IsBad=1 where BoxNo='{boxCode}'";
+ localDB.Exec_NonQuery(sql);
+ //SqlHelper.ExecuteNonQuery(SqlHelper.GetConnSting(), CommandType.Text, sql, param);
+ return true;
+ }
public DataTable SearchCountByBox(string boxNo,string tableName)
{
try
diff --git a/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs b/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
index 65faf10..921c1f0 100644
--- a/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
+++ b/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
@@ -120,6 +120,39 @@ namespace MESClassLibrary.DAL.Injection
return false;
}
}
+
+ public bool UpdateInfo(LocalDBService localDB, string packageCode, int addCount, bool isFinish = false)
+ {
+ int i = 0;
+ if (addCount > 0)
+ {
+ i = 0;
+ }
+ else
+ {
+ i = 1;
+ }
+
+ string sql = "";
+ SqlParameter[] param = null;
+ if (isFinish == false)
+ {
+ sql = "update " + TableName + $" set BoxCount = BoxCount+ {addCount} ";
+ sql += $" where BoxCount >={i} and BoxNo='{packageCode}'";
+
+ }
+ else
+ {
+ sql = "update " + TableName + $" set BoxCount = 0, IsPrint=1 ,remark='整箱报废'";
+ sql += $" where (1=1) and BoxNo='{packageCode}'";
+ }
+
+ localDB.Exec_NonQuery(sql);
+
+
+ return true;
+
+ }
public bool UpdatePrinted(string packageCode)
{
try
diff --git a/MESClassLibrary/DAL/Wms/WmsDAL.cs b/MESClassLibrary/DAL/Wms/WmsDAL.cs
index 43c37da..98f7afd 100644
--- a/MESClassLibrary/DAL/Wms/WmsDAL.cs
+++ b/MESClassLibrary/DAL/Wms/WmsDAL.cs
@@ -22,7 +22,7 @@ namespace MESClassLibrary.DAL.Injection
///
///
///
- public string SaveInterface(DataTable barCodeTable)
+ public string SaveInterface(DataTable barCodeTable,string badReason)
{
LocalDBService local = new LocalDBService(SqlHelper.GetConnSting());
try
@@ -30,8 +30,8 @@ namespace MESClassLibrary.DAL.Injection
local.BeginTrans();
foreach (DataRow dr in barCodeTable.Rows)
{
- string sql = $" insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark)" +
- $" values ('{dr["BoxNo"]}','{dr["OneBarCode"]}','{dr["BarCode"]}','')";
+ string sql = $" insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark,QaRst,Describe,BadReason)" +
+ $" values ('{dr["BoxNo"]}','{dr["OneBarCode"]}','{dr["BarCode"]}','','0','{dr["PartName"]}','{badReason}')";
local.Exec_NonQuery(sql);
}
local.Commit();
@@ -54,19 +54,13 @@ namespace MESClassLibrary.DAL.Injection
return null;
}
- public bool SaveInterface(LocalDBService local, BarCodeModel bcm)
+ public bool SaveInterface(LocalDBService local, BarCodeModel bcm,string badReason)
{
- try
- {
- string sql = $" insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark)" +
- $" values ('{bcm.BoxNo}','{bcm.OneBarCode}','{bcm.BarCode}','')";
- return local.Exec_NonQuery(sql);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
+
+ string sql = $" insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark,QaRst,Describe,BadReason)" +
+ $" values ('{bcm.BoxNo}','{bcm.OneBarCode}','{bcm.BarCode}','','{bcm.IsBad}','{bcm.Des1}','{badReason}')";
+ return local.Exec_NonQuery(sql);
+
}
///
/// wms注塑中间表tb_Injectionn_Interface 单条插入箱码,注塑码数据
@@ -76,11 +70,12 @@ namespace MESClassLibrary.DAL.Injection
///
///
///
- public bool AddRecord(LocalDBService localDB, string boxNo, string oneBarCode, string barCode)
+ public bool AddRecord(LocalDBService localDB, string boxNo, string oneBarCode, string barCode,string isBad,string desc,string badReason)
{
try
{
- string sql = $"insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark) values ('{boxNo}','{oneBarCode}','{barCode}','')";
+ string sql = $"insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark,QaRst,Describe,BadReason) " +
+ $"values ('{boxNo}','{oneBarCode}','{barCode}','','{isBad}','{desc}','{badReason}')";
localDB.Exec_NonQuery(sql);
return true;
}
@@ -205,6 +200,26 @@ namespace MESClassLibrary.DAL.Injection
return true;
}
+ }
+ public bool DelRecordByBox(LocalDBService localDB, string boxNo)
+ {
+
+ string sql = $" select * from tb_Injectionn_Interface where PackageCode='{boxNo}' and WmsRead =1";
+ DataTable dt = SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, null).Tables[0];
+
+ if (dt.Rows.Count > 0)
+ {
+ return false;
+ }
+ else
+ {
+ string sql2 = $"delete from tb_Injectionn_Interface where PackageCode='{boxNo}' and WmsRead =0";
+ localDB.Exec_NonQuery(sql2);
+ // SqlHelper.ExecuteNonQuery(SqlHelper.GetConnSting(), CommandType.Text, sql2, null);
+ return true;
+ }
+
+
}
#endregion
diff --git a/MESClassLibrary/Model/BadInjectionModel.cs b/MESClassLibrary/Model/BadInjectionModel.cs
index 95dbca0..e243aad 100644
--- a/MESClassLibrary/Model/BadInjectionModel.cs
+++ b/MESClassLibrary/Model/BadInjectionModel.cs
@@ -16,5 +16,6 @@ namespace MESClassLibrary.Model
//public string BadReason { get; set; }
public string code { get; set; }
+ public string Desc { get; set; }
}
}