From 6eb55fe9ad69446ad0abff5d0697a69c64f76895 Mon Sep 17 00:00:00 2001
From: "ruoxing.wang" <88384874@qq.com>
Date: Fri, 9 May 2025 13:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
InjectionPC/FrmMain2408.Designer.cs | 246 +++++++++---------
InjectionPC/FrmMain2408.cs | 150 ++++++++---
MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs | 4 +-
.../BLL/Inspection/InjectionBoxBLL.cs | 12 +
MESClassLibrary/BLL/Wms/WmsBLL.cs | 1 +
MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs | 18 +-
.../DAL/Injection/InjectionBoxDAL.cs | 36 +++
7 files changed, 303 insertions(+), 164 deletions(-)
diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs
index 816421a..fb257ac 100644
--- a/InjectionPC/FrmMain2408.Designer.cs
+++ b/InjectionPC/FrmMain2408.Designer.cs
@@ -223,7 +223,7 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(2666, 1566);
this.panel1.TabIndex = 0;
@@ -235,7 +235,7 @@
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.panel7.Location = new System.Drawing.Point(0, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel7.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(2666, 1419);
this.panel7.TabIndex = 1;
@@ -246,7 +246,7 @@
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel23.Location = new System.Drawing.Point(0, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel23.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel23.Name = "panel23";
this.panel23.Size = new System.Drawing.Size(2666, 1328);
this.panel23.TabIndex = 1;
@@ -257,7 +257,7 @@
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel27.Location = new System.Drawing.Point(0, 976);
- this.panel27.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel27.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel27.Name = "panel27";
this.panel27.Size = new System.Drawing.Size(2666, 352);
this.panel27.TabIndex = 1;
@@ -268,7 +268,7 @@
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel29.Location = new System.Drawing.Point(312, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel29.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel29.Name = "panel29";
this.panel29.Size = new System.Drawing.Size(2354, 352);
this.panel29.TabIndex = 1;
@@ -279,7 +279,7 @@
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel31.Location = new System.Drawing.Point(123, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel31.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel31.Name = "panel31";
this.panel31.Size = new System.Drawing.Size(2231, 352);
this.panel31.TabIndex = 1;
@@ -290,7 +290,7 @@
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel33.Location = new System.Drawing.Point(123, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel33.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel33.Name = "panel33";
this.panel33.Size = new System.Drawing.Size(2108, 352);
this.panel33.TabIndex = 1;
@@ -300,7 +300,7 @@
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(6, 4, 6, 4);
+ this.panel35.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel35.Name = "panel35";
this.panel35.Size = new System.Drawing.Size(1985, 352);
this.panel35.TabIndex = 1;
@@ -310,7 +310,7 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel37.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel37.Name = "panel37";
this.panel37.Size = new System.Drawing.Size(1985, 352);
this.panel37.TabIndex = 1;
@@ -321,7 +321,7 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel40.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel40.Name = "panel40";
this.panel40.Size = new System.Drawing.Size(1985, 352);
this.panel40.TabIndex = 1;
@@ -332,7 +332,7 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel42.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel42.Name = "panel42";
this.panel42.Size = new System.Drawing.Size(1862, 352);
this.panel42.TabIndex = 1;
@@ -354,7 +354,7 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel39.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel39.Name = "panel39";
this.panel39.Size = new System.Drawing.Size(1739, 352);
this.panel39.TabIndex = 1;
@@ -376,7 +376,7 @@
//
this.lbAddPrintR.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbAddPrintR.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbAddPrintR.Location = new System.Drawing.Point(532, 298);
+ this.lbAddPrintR.Location = new System.Drawing.Point(532, 297);
this.lbAddPrintR.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.lbAddPrintR.Name = "lbAddPrintR";
this.lbAddPrintR.Size = new System.Drawing.Size(314, 58);
@@ -404,8 +404,8 @@
this.cboxHandBox.Checked = true;
this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked;
this.cboxHandBox.Enabled = false;
- this.cboxHandBox.Location = new System.Drawing.Point(924, 172);
- this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4);
+ this.cboxHandBox.Location = new System.Drawing.Point(924, 171);
+ this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.cboxHandBox.Name = "cboxHandBox";
this.cboxHandBox.Size = new System.Drawing.Size(256, 55);
this.cboxHandBox.TabIndex = 14;
@@ -418,7 +418,7 @@
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox2.Location = new System.Drawing.Point(220, 290);
- this.textBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(303, 65);
this.textBox2.TabIndex = 13;
@@ -449,8 +449,8 @@
//
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(224, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.textBox1.Location = new System.Drawing.Point(224, 171);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(301, 65);
this.textBox1.TabIndex = 10;
@@ -459,7 +459,7 @@
//
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(40, 186);
+ this.label20.Location = new System.Drawing.Point(40, 185);
this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(178, 51);
@@ -473,7 +473,7 @@
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(224, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.comboBox2.Name = "comboBox2";
this.comboBox2.Size = new System.Drawing.Size(851, 50);
this.comboBox2.TabIndex = 8;
@@ -496,7 +496,7 @@
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
this.panel43.Location = new System.Drawing.Point(1739, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel43.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel43.Name = "panel43";
this.panel43.Size = new System.Drawing.Size(123, 352);
this.panel43.TabIndex = 0;
@@ -520,7 +520,7 @@
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
this.panel41.Location = new System.Drawing.Point(1862, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel41.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel41.Name = "panel41";
this.panel41.Size = new System.Drawing.Size(123, 352);
this.panel41.TabIndex = 0;
@@ -544,7 +544,7 @@
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
this.panel34.Location = new System.Drawing.Point(1985, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel34.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel34.Name = "panel34";
this.panel34.Size = new System.Drawing.Size(123, 352);
this.panel34.TabIndex = 0;
@@ -568,7 +568,7 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel32.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel32.Name = "panel32";
this.panel32.Size = new System.Drawing.Size(123, 352);
this.panel32.TabIndex = 0;
@@ -592,7 +592,7 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel30.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel30.Name = "panel30";
this.panel30.Size = new System.Drawing.Size(123, 352);
this.panel30.TabIndex = 0;
@@ -616,7 +616,7 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel28.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel28.Name = "panel28";
this.panel28.Size = new System.Drawing.Size(312, 352);
this.panel28.TabIndex = 0;
@@ -641,7 +641,7 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel24.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel24.Name = "panel24";
this.panel24.Size = new System.Drawing.Size(2666, 976);
this.panel24.TabIndex = 0;
@@ -653,7 +653,7 @@
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel26.Location = new System.Drawing.Point(380, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel26.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel26.Name = "panel26";
this.panel26.Size = new System.Drawing.Size(2286, 976);
this.panel26.TabIndex = 1;
@@ -665,17 +665,17 @@
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(295, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel45.Location = new System.Drawing.Point(295, 591);
+ this.panel45.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1282, 132);
+ this.panel45.Size = new System.Drawing.Size(1282, 131);
this.panel45.TabIndex = 2;
//
// button3
//
this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button3.Location = new System.Drawing.Point(1129, 38);
- this.button3.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.button3.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(147, 52);
this.button3.TabIndex = 5;
@@ -687,7 +687,7 @@
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(952, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.button4.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(147, 52);
this.button4.TabIndex = 4;
@@ -699,7 +699,7 @@
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox4.Location = new System.Drawing.Point(308, 38);
- this.textBox4.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(605, 49);
this.textBox4.TabIndex = 3;
@@ -708,7 +708,7 @@
//
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.Location = new System.Drawing.Point(26, 46);
+ this.label25.Location = new System.Drawing.Point(26, 45);
this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(283, 37);
@@ -724,16 +724,16 @@
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
this.panel44.Location = new System.Drawing.Point(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel44.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1282, 132);
+ this.panel44.Size = new System.Drawing.Size(1282, 131);
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(1096, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.button2.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(147, 52);
this.button2.TabIndex = 3;
@@ -745,7 +745,7 @@
//
this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(941, 35);
- this.button1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.button1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(147, 52);
this.button1.TabIndex = 2;
@@ -757,7 +757,7 @@
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox3.Location = new System.Drawing.Point(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(677, 49);
this.textBox3.TabIndex = 1;
@@ -766,7 +766,7 @@
//
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, 46);
+ this.label24.Location = new System.Drawing.Point(26, 45);
this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(169, 37);
@@ -840,7 +840,7 @@
this.glacialList1.ItemHeight = 50;
this.glacialList1.ItemWordWrap = false;
this.glacialList1.Location = new System.Drawing.Point(0, 0);
- this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.glacialList1.Name = "glacialList1";
this.glacialList1.Selectable = true;
this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
@@ -860,7 +860,7 @@
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(6, 4, 6, 4);
+ this.panel25.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel25.Name = "panel25";
this.panel25.Size = new System.Drawing.Size(380, 976);
this.panel25.TabIndex = 0;
@@ -873,7 +873,7 @@
this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406);
- this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 262F));
@@ -890,8 +890,8 @@
this.panel38.Controls.Add(this.label26);
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
- this.panel38.Location = new System.Drawing.Point(6, 4);
- this.panel38.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel38.Location = new System.Drawing.Point(6, 3);
+ this.panel38.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel38.Name = "panel38";
this.panel38.Size = new System.Drawing.Size(368, 252);
this.panel38.TabIndex = 1;
@@ -900,8 +900,8 @@
//
this.btn_lastBoxPrintR.BackColor = System.Drawing.Color.Aquamarine;
this.btn_lastBoxPrintR.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_lastBoxPrintR.Location = new System.Drawing.Point(255, 130);
- this.btn_lastBoxPrintR.Margin = new System.Windows.Forms.Padding(4);
+ this.btn_lastBoxPrintR.Location = new System.Drawing.Point(255, 129);
+ this.btn_lastBoxPrintR.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btn_lastBoxPrintR.Name = "btn_lastBoxPrintR";
this.btn_lastBoxPrintR.Size = new System.Drawing.Size(116, 122);
this.btn_lastBoxPrintR.TabIndex = 4;
@@ -914,7 +914,7 @@
this.btn_lastBoxPrintL.BackColor = System.Drawing.Color.Aquamarine;
this.btn_lastBoxPrintL.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_lastBoxPrintL.Location = new System.Drawing.Point(255, 0);
- this.btn_lastBoxPrintL.Margin = new System.Windows.Forms.Padding(4);
+ this.btn_lastBoxPrintL.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btn_lastBoxPrintL.Name = "btn_lastBoxPrintL";
this.btn_lastBoxPrintL.Size = new System.Drawing.Size(116, 122);
this.btn_lastBoxPrintL.TabIndex = 2;
@@ -925,10 +925,10 @@
// label27
//
this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label27.Location = new System.Drawing.Point(-4, 172);
+ this.label27.Location = new System.Drawing.Point(-4, 171);
this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(292, 74);
+ this.label27.Size = new System.Drawing.Size(292, 73);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -950,7 +950,7 @@
this.label17.Location = new System.Drawing.Point(-4, 49);
this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(292, 74);
+ this.label17.Size = new System.Drawing.Size(292, 73);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -972,11 +972,11 @@
this.groupBox1.Controls.Add(this.tableLayoutPanel3);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox1.Location = new System.Drawing.Point(4, 266);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Location = new System.Drawing.Point(4, 265);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(372, 300);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.groupBox1.Size = new System.Drawing.Size(372, 302);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "模具2";
@@ -991,14 +991,14 @@
this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0);
this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 32);
- this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 31);
+ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 3;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 264);
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 268);
this.tableLayoutPanel3.TabIndex = 2;
//
// panel47
@@ -1009,10 +1009,10 @@
this.panel47.Controls.Add(this.lbNeedQtyR);
this.panel47.Controls.Add(this.lbCurrentlQtyR);
this.panel47.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel47.Location = new System.Drawing.Point(4, 179);
- this.panel47.Margin = new System.Windows.Forms.Padding(4);
+ this.panel47.Location = new System.Drawing.Point(4, 181);
+ this.panel47.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.panel47.Name = "panel47";
- this.panel47.Size = new System.Drawing.Size(356, 81);
+ this.panel47.Size = new System.Drawing.Size(356, 84);
this.panel47.TabIndex = 4;
//
// btnHandPrintR
@@ -1021,7 +1021,7 @@
this.btnHandPrintR.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHandPrintR.Location = new System.Drawing.Point(248, 16);
- this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4);
+ this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnHandPrintR.Name = "btnHandPrintR";
this.btnHandPrintR.Size = new System.Drawing.Size(116, 65);
this.btnHandPrintR.TabIndex = 3;
@@ -1068,10 +1068,10 @@
this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label34.BackColor = System.Drawing.Color.Transparent;
this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label34.Location = new System.Drawing.Point(6, 108);
+ this.label34.Location = new System.Drawing.Point(6, 111);
this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(106, 46);
+ this.label34.Size = new System.Drawing.Size(106, 45);
this.label34.TabIndex = 1;
this.label34.Text = "规格:";
this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1082,7 +1082,7 @@
this.lbPackageCodeR.AutoSize = true;
this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2);
this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbPackageCodeR.Location = new System.Drawing.Point(4, 27);
+ this.lbPackageCodeR.Location = new System.Drawing.Point(4, 28);
this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbPackageCodeR.Name = "lbPackageCodeR";
this.lbPackageCodeR.Size = new System.Drawing.Size(0, 33);
@@ -1093,10 +1093,10 @@
this.panel49.Controls.Add(this.btnChangeSizeR);
this.panel49.Controls.Add(this.comBoxSizeR);
this.panel49.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel49.Location = new System.Drawing.Point(125, 91);
- this.panel49.Margin = new System.Windows.Forms.Padding(4);
+ this.panel49.Location = new System.Drawing.Point(125, 92);
+ this.panel49.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.panel49.Name = "panel49";
- this.panel49.Size = new System.Drawing.Size(235, 80);
+ this.panel49.Size = new System.Drawing.Size(235, 83);
this.panel49.TabIndex = 6;
//
// btnChangeSizeR
@@ -1105,7 +1105,7 @@
this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnChangeSizeR.Location = new System.Drawing.Point(127, 16);
- this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4);
+ this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnChangeSizeR.Name = "btnChangeSizeR";
this.btnChangeSizeR.Size = new System.Drawing.Size(121, 65);
this.btnChangeSizeR.TabIndex = 4;
@@ -1120,8 +1120,8 @@
this.comBoxSizeR.Enabled = false;
this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comBoxSizeR.FormattingEnabled = true;
- this.comBoxSizeR.Location = new System.Drawing.Point(0, 17);
- this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.comBoxSizeR.Location = new System.Drawing.Point(0, 19);
+ this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.comBoxSizeR.Name = "comBoxSizeR";
this.comBoxSizeR.Size = new System.Drawing.Size(125, 64);
this.comBoxSizeR.TabIndex = 3;
@@ -1131,7 +1131,7 @@
this.panel36.Controls.Add(this.tableLayoutPanel1);
this.panel36.Dock = System.Windows.Forms.DockStyle.Top;
this.panel36.Location = new System.Drawing.Point(0, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel36.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel36.Name = "panel36";
this.panel36.Size = new System.Drawing.Size(380, 406);
this.panel36.TabIndex = 0;
@@ -1145,7 +1145,7 @@
this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00047F));
@@ -1172,11 +1172,11 @@
this.groupBox2.Controls.Add(this.tableLayoutPanel4);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold);
- this.groupBox2.Location = new System.Drawing.Point(4, 105);
- this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox2.Location = new System.Drawing.Point(4, 104);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox2.Size = new System.Drawing.Size(372, 297);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.groupBox2.Size = new System.Drawing.Size(372, 299);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "模具1&&手打";
@@ -1191,15 +1191,15 @@
this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0);
this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 32);
- this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 31);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 3;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F));
- this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 261);
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(364, 265);
this.tableLayoutPanel4.TabIndex = 3;
//
// label38
@@ -1207,10 +1207,10 @@
this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label38.BackColor = System.Drawing.Color.Transparent;
this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label38.Location = new System.Drawing.Point(6, 106);
+ this.label38.Location = new System.Drawing.Point(6, 109);
this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(106, 46);
+ this.label38.Size = new System.Drawing.Size(106, 45);
this.label38.TabIndex = 1;
this.label38.Text = "规格:";
this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1223,10 +1223,10 @@
this.panel46.Controls.Add(this.lbNeedQtyL);
this.panel46.Controls.Add(this.lbCurrentlQtyL);
this.panel46.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel46.Location = new System.Drawing.Point(4, 177);
- this.panel46.Margin = new System.Windows.Forms.Padding(4);
+ this.panel46.Location = new System.Drawing.Point(4, 179);
+ this.panel46.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.panel46.Name = "panel46";
- this.panel46.Size = new System.Drawing.Size(356, 80);
+ this.panel46.Size = new System.Drawing.Size(356, 83);
this.panel46.TabIndex = 4;
//
// btnHandPrintL
@@ -1235,7 +1235,7 @@
this.btnHandPrintL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHandPrintL.Location = new System.Drawing.Point(246, 12);
- this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4);
+ this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnHandPrintL.Name = "btnHandPrintL";
this.btnHandPrintL.Size = new System.Drawing.Size(116, 65);
this.btnHandPrintL.TabIndex = 3;
@@ -1283,7 +1283,7 @@
this.lbPackageCodeL.AutoSize = true;
this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2);
this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbPackageCodeL.Location = new System.Drawing.Point(4, 26);
+ this.lbPackageCodeL.Location = new System.Drawing.Point(4, 27);
this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbPackageCodeL.Name = "lbPackageCodeL";
this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33);
@@ -1294,10 +1294,10 @@
this.panel48.Controls.Add(this.btnChangeSizeL);
this.panel48.Controls.Add(this.comBoxSizeL);
this.panel48.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel48.Location = new System.Drawing.Point(125, 90);
- this.panel48.Margin = new System.Windows.Forms.Padding(4);
+ this.panel48.Location = new System.Drawing.Point(125, 91);
+ this.panel48.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.panel48.Name = "panel48";
- this.panel48.Size = new System.Drawing.Size(235, 79);
+ this.panel48.Size = new System.Drawing.Size(235, 82);
this.panel48.TabIndex = 6;
//
// btnChangeSizeL
@@ -1306,7 +1306,7 @@
this.btnChangeSizeL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnChangeSizeL.Location = new System.Drawing.Point(127, 10);
- this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4);
+ this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnChangeSizeL.Name = "btnChangeSizeL";
this.btnChangeSizeL.Size = new System.Drawing.Size(116, 65);
this.btnChangeSizeL.TabIndex = 4;
@@ -1321,8 +1321,8 @@
this.comBoxSizeL.Enabled = false;
this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comBoxSizeL.FormattingEnabled = true;
- this.comBoxSizeL.Location = new System.Drawing.Point(2, 8);
- this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.comBoxSizeL.Location = new System.Drawing.Point(2, 10);
+ this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.comBoxSizeL.Name = "comBoxSizeL";
this.comBoxSizeL.Size = new System.Drawing.Size(125, 64);
this.comBoxSizeL.TabIndex = 3;
@@ -1333,7 +1333,7 @@
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel8.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(2666, 91);
this.panel8.TabIndex = 0;
@@ -1344,7 +1344,7 @@
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel10.Location = new System.Drawing.Point(380, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel10.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel10.Name = "panel10";
this.panel10.Size = new System.Drawing.Size(2286, 91);
this.panel10.TabIndex = 2;
@@ -1355,7 +1355,7 @@
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel12.Location = new System.Drawing.Point(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel12.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel12.Name = "panel12";
this.panel12.Size = new System.Drawing.Size(1835, 91);
this.panel12.TabIndex = 1;
@@ -1366,7 +1366,7 @@
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel16.Location = new System.Drawing.Point(468, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel16.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel16.Name = "panel16";
this.panel16.Size = new System.Drawing.Size(1367, 91);
this.panel16.TabIndex = 1;
@@ -1377,7 +1377,7 @@
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel20.Location = new System.Drawing.Point(427, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel20.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel20.Name = "panel20";
this.panel20.Size = new System.Drawing.Size(940, 91);
this.panel20.TabIndex = 1;
@@ -1401,7 +1401,7 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel22.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel22.Name = "panel22";
this.panel22.Size = new System.Drawing.Size(341, 91);
this.panel22.TabIndex = 0;
@@ -1427,7 +1427,7 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel19.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel19.Name = "panel19";
this.panel19.Size = new System.Drawing.Size(427, 91);
this.panel19.TabIndex = 0;
@@ -1450,7 +1450,7 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel21.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel21.Name = "panel21";
this.panel21.Size = new System.Drawing.Size(202, 91);
this.panel21.TabIndex = 0;
@@ -1476,7 +1476,7 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel15.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel15.Name = "panel15";
this.panel15.Size = new System.Drawing.Size(468, 91);
this.panel15.TabIndex = 0;
@@ -1486,7 +1486,7 @@
this.panel18.Controls.Add(this.label6);
this.panel18.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel18.Location = new System.Drawing.Point(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel18.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel18.Name = "panel18";
this.panel18.Size = new System.Drawing.Size(266, 91);
this.panel18.TabIndex = 1;
@@ -1509,7 +1509,7 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel17.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel17.Name = "panel17";
this.panel17.Size = new System.Drawing.Size(202, 91);
this.panel17.TabIndex = 0;
@@ -1536,7 +1536,7 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel11.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel11.Name = "panel11";
this.panel11.Size = new System.Drawing.Size(451, 91);
this.panel11.TabIndex = 0;
@@ -1546,7 +1546,7 @@
this.panel14.Controls.Add(this.comboBox1);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel14.Location = new System.Drawing.Point(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel14.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel14.Name = "panel14";
this.panel14.Size = new System.Drawing.Size(249, 91);
this.panel14.TabIndex = 1;
@@ -1561,7 +1561,7 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(249, 83);
this.comboBox1.TabIndex = 0;
@@ -1571,7 +1571,7 @@
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel13.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel13.Name = "panel13";
this.panel13.Size = new System.Drawing.Size(202, 91);
this.panel13.TabIndex = 0;
@@ -1595,7 +1595,7 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel9.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel9.Name = "panel9";
this.panel9.Size = new System.Drawing.Size(380, 91);
this.panel9.TabIndex = 0;
@@ -1620,7 +1620,7 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(2666, 147);
this.panel2.TabIndex = 0;
@@ -1631,7 +1631,7 @@
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(312, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel4.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(2354, 147);
this.panel4.TabIndex = 1;
@@ -1643,7 +1643,7 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel6.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(2002, 147);
this.panel6.TabIndex = 1;
@@ -1651,8 +1651,8 @@
// checkBox1
//
this.checkBox1.AutoSize = true;
- this.checkBox1.Location = new System.Drawing.Point(1602, 60);
- this.checkBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.checkBox1.Location = new System.Drawing.Point(1602, 59);
+ this.checkBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(120, 25);
this.checkBox1.TabIndex = 2;
@@ -1665,9 +1665,9 @@
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(4, 2);
- this.btnOnlyBarCode.Margin = new System.Windows.Forms.Padding(4);
+ this.btnOnlyBarCode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.btnOnlyBarCode.Name = "btnOnlyBarCode";
- this.btnOnlyBarCode.Size = new System.Drawing.Size(216, 144);
+ this.btnOnlyBarCode.Size = new System.Drawing.Size(216, 143);
this.btnOnlyBarCode.TabIndex = 1;
this.btnOnlyBarCode.Text = "条码模式";
this.btnOnlyBarCode.UseVisualStyleBackColor = false;
@@ -1691,7 +1691,7 @@
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
this.panel5.Location = new System.Drawing.Point(2002, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel5.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(352, 147);
this.panel5.TabIndex = 0;
@@ -1716,7 +1716,7 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel3.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(312, 147);
this.panel3.TabIndex = 0;
@@ -1737,8 +1737,8 @@
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(6, 4);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.pictureBox1.Location = new System.Drawing.Point(6, 3);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(306, 138);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1786,7 +1786,7 @@
this.ClientSize = new System.Drawing.Size(2666, 1566);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
this.Name = "FrmMain2408";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs
index 74c5d2f..6f7b40a 100644
--- a/InjectionPC/FrmMain2408.cs
+++ b/InjectionPC/FrmMain2408.cs
@@ -73,6 +73,7 @@ namespace InjectionPC
private PlasticBLL _plasticBLL = new PlasticBLL();
private int _plcRate = 100; //500
+ //允许修改箱码标包的已打码最小数量
private int _allowChangeBoxSizeMaxPrint = 5;
#endregion
@@ -3556,7 +3557,7 @@ namespace InjectionPC
if (string.IsNullOrEmpty(pkgCode))
{
- string packageCode = GetPackageCode(partCode, autoPrint);
+ string packageCode = GetPackageCode(partCode, autoPrint,mould);
InjectionBoxModel boxmd = new InjectionBoxModel();
boxmd.ID = Guid.NewGuid().ToString();
boxmd.BoxNo = packageCode;
@@ -3575,6 +3576,21 @@ namespace InjectionPC
}
else
{
+ int ii = 0;
+ int.TryParse(lbCurrentlQty.Text, out ii);
+ if(ii>= _allowChangeBoxSizeMaxPrint)
+ {
+ if(mould == "0")
+ {
+ comBoxSizeL.Enabled = false;
+ }
+ else
+ {
+ comBoxSizeR.Enabled = false;
+ }
+ }
+
+
#region 如果零件号和箱码不匹配,重新生成箱码,打印前一箱并关闭
if (!string.IsNullOrEmpty(pkgCode) && pkgCode.Contains(partCode) == false)
{
@@ -3582,7 +3598,7 @@ namespace InjectionPC
MessageBox.Show($"箱码[{pkgCode}]产品与当前产品[{partCode}]不匹配,将会打印上一箱码,请知悉!");
CompleteBoxAndPrint(dt.Rows[0], mould, lbPackageCode, lbCurrentlQty, isHandPrint);
- string packageCode = GetPackageCode(partCode, autoPrint);
+ string packageCode = GetPackageCode(partCode, autoPrint, mould);
InjectionBoxModel boxmd = new InjectionBoxModel();
boxmd.ID = Guid.NewGuid().ToString();
boxmd.BoxNo = packageCode;
@@ -3665,10 +3681,14 @@ namespace InjectionPC
newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
}
- string GetPackageCode(string partNo,bool autoPrint )
+ string GetPackageCode(string partNo,bool autoPrint, string mould)
{
string batch = GetBatch(autoPrint);
string packageSize = lbNeedQtyL.Text.Trim();
+ if(mould == "1")
+ {
+ packageSize = lbNeedQtyR.Text.Trim();
+ }
if (string.IsNullOrEmpty(packageSize))
{
packageSize = "1";
@@ -3714,6 +3734,8 @@ namespace InjectionPC
MessageBoxIcon.Information);
if (result == DialogResult.OK)
{
+
+ //
if (UnCompletePrintBox("切换包装规格","left") == false)
{
_isShowHintL = false;
@@ -3753,6 +3775,32 @@ namespace InjectionPC
lbNeedQtyL.Text = i.ToString();
}
_selectItemL = comBoxSizeL.SelectedItem;
+ _isLoad = true;
+
+ //过滤掉现有的已打验证
+ //更新箱码,更新tb_Injection_BoxRecord,更新tb_BarCode3中绑定的箱码. wms中间表还没写入,不用更新
+ if(comBoxSizeL.Tag!=null && comBoxSizeL.Tag.ToString() == "update")
+ {
+ string boxCode = lbPackageCodeL.Text?.Trim();
+ if(!string.IsNullOrEmpty(boxCode))
+ {
+ //创建新箱码
+ string[] boxCodeArry = boxCode.Split('.');
+ string newboxCode = GetPackageCode(boxCodeArry[0], true, "0");
+
+ //更新箱码
+ bool rst =_injectionBoxBLL.UpdateBoxCode(newboxCode, boxCode,Program.tableName, val);
+ if(rst == true)
+ {
+ lbPackageCodeL.Text = newboxCode;
+ }
+
+ }
+
+ }
+
+
+
}
comBoxSizeL.Enabled = false;
}
@@ -3807,6 +3855,29 @@ namespace InjectionPC
lbNeedQtyR.Text = i.ToString();
}
_selectItemR = comBoxSizeR.SelectedItem;
+ _isLoad = true;
+
+ //过滤掉现有的已打验证
+ //更新箱码,更新tb_Injection_BoxRecord,更新tb_BarCode3中绑定的箱码. wms中间表还没写入,不用更新
+ if (comBoxSizeR.Tag != null && comBoxSizeR.Tag.ToString() == "update")
+ {
+ string boxCode = lbPackageCodeR.Text?.Trim();
+ if (!string.IsNullOrEmpty(boxCode))
+ {
+ //创建新箱码
+ string[] boxCodeArry = boxCode.Split('.');
+ string newboxCode = GetPackageCode(boxCodeArry[0], true, "1");
+
+ //更新箱码
+ bool rst = _injectionBoxBLL.UpdateBoxCode(newboxCode, boxCode, Program.tableName, val);
+ if (rst == true)
+ {
+ lbPackageCodeR.Text = newboxCode;
+ }
+
+ }
+
+ }
}
comBoxSizeR.Enabled = false;
@@ -4122,48 +4193,50 @@ namespace InjectionPC
if(moudel == "0")
{
string pcd = lbPackageCodeL.Text?.Trim();
- //string printQtyLStr = lbCurrentlQtyL.Text;
- //int printQtyL = 0;
- //if (int.TryParse(printQtyLStr, out printQtyL))
- //{
- // if(printQtyL > _allowChangeBoxSizeMaxPrint)
- // {
- // MessageBox.Show($"左箱码[{pcd}]装箱数量超过限定值,请先手动打印左箱码,再进行切换.");
- // return;
- // }
- //}
+ string printQtyLStr = lbCurrentlQtyL.Text;
+ int printQtyL = 0;
+ if (int.TryParse(printQtyLStr, out printQtyL))
+ {
+ if (printQtyL > _allowChangeBoxSizeMaxPrint)
+ {
+ MessageBox.Show($"左箱码[{pcd}]装箱数量超过限定值,请先手动打印左箱码,再进行切换.");
+ return;
+ }
+ }
- if (!string.IsNullOrEmpty(pcd))
- {
- MessageBox.Show($"请先完成左箱码[{pcd}]装箱后,再进行切换.");
- return;
- }
+ //if (!string.IsNullOrEmpty(pcd))
+ //{
+ // MessageBox.Show($"请先完成左箱码[{pcd}]装箱后,再进行切换.");
+ // return;
+ //}
}
else
{
- //string pcd = lbPackageCodeR.Text?.Trim();
- //string printQtyRStr = lbCurrentlQtyR.Text;
- //int printQtyR = 0;
- //if (int.TryParse(printQtyRStr, out printQtyR))
- //{
- // if (printQtyR > _allowChangeBoxSizeMaxPrint)
- // {
- // MessageBox.Show($"右箱码[{pcd}]装箱数量超过限定值,请先手动打印右箱码,再进行切换.");
- // return;
- // }
- //}
-
-
-
string pcd = lbPackageCodeR.Text?.Trim();
- if (!string.IsNullOrEmpty(pcd))
+ string printQtyRStr = lbCurrentlQtyR.Text;
+ int printQtyR = 0;
+ if (int.TryParse(printQtyRStr, out printQtyR))
{
- MessageBox.Show($"请先完成右箱码[{pcd}]装箱后,再进行切换.");
- return;
+ if (printQtyR > _allowChangeBoxSizeMaxPrint)
+ {
+ MessageBox.Show($"右箱码[{pcd}]装箱数量超过限定值,请先手动打印右箱码,再进行切换.");
+ return;
+ }
}
+
+
+
+ //if (!string.IsNullOrEmpty(pcd))
+ //{
+ // MessageBox.Show($"请先完成右箱码[{pcd}]装箱后,再进行切换.");
+ // return;
+ //}
}
+ if (MessageBox.Show("确认对现有箱码的标包数量进行调整?", "调整标包提醒", MessageBoxButtons.YesNo) == DialogResult.No)
+ return;
+
string pass = _basicBLL1.GetInjectionChangedSizePass();
Form frm = new Form();
frm.Size = new Size(400, 300);
@@ -4182,12 +4255,15 @@ namespace InjectionPC
string s = tb.Text;
if(s == pass)
{
- if(moudel == "0")
+ _isLoad = false;
+ if (moudel == "0")
{
+ comBoxSizeL.Tag = "update";
comBoxSizeL.Enabled = true;
}
else
{
+ comBoxSizeR.Tag = "update";
comBoxSizeR.Enabled = true;
}
}
@@ -4660,7 +4736,7 @@ namespace InjectionPC
{
local = new LocalDBService(SqlHelper.GetConnSting());
}
- return _barCodeBLL.GetFailedBarCode(local, model, _repeatSentTimes);
+ return _barCodeBLL.GetFailedBarCode(local, model, _repeatSentTimes,Program.station);
}
}
diff --git a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
index 2d75cf9..f02b047 100644
--- a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
+++ b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
@@ -137,9 +137,9 @@ namespace MESClassLibrary.BLL.BasicInfo
///
///
///
- public DataTable GetFailedBarCode(LocalDBService local,string model,int repeatSendTimes)
+ public DataTable GetFailedBarCode(LocalDBService local,string model,int repeatSendTimes, string stationNo)
{
- return db.GetFailedBarCode(local, model, repeatSendTimes);
+ return db.GetFailedBarCode(local, model, repeatSendTimes,stationNo);
}
//public bool Add_Info_New(LocalDBService local, BarCodeModel md, string tableName)
//{
diff --git a/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs b/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
index c741453..bf11534 100644
--- a/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
+++ b/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
@@ -39,6 +39,18 @@ namespace MESClassLibrary.BLL.Inspection
return false;
}
}
+ public bool UpdateBoxCode(string newBoxCode, string oldBoxCode,string tableName, string standCount)
+ {
+ try
+ {
+ return db.UpdateBoxCode(newBoxCode, oldBoxCode,tableName, standCount);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
public bool UpdateBoxCount(LocalDBService localDB, string packageCode, int addCount, bool isFinish = false)
{
return db.UpdateInfo(localDB,packageCode, addCount, isFinish);
diff --git a/MESClassLibrary/BLL/Wms/WmsBLL.cs b/MESClassLibrary/BLL/Wms/WmsBLL.cs
index 2cb2d5c..b1e1701 100644
--- a/MESClassLibrary/BLL/Wms/WmsBLL.cs
+++ b/MESClassLibrary/BLL/Wms/WmsBLL.cs
@@ -68,6 +68,7 @@ namespace MESClassLibrary.BLL.Injection
string rst = da.SaveInterface(local,barCodeTable, badReason, station);
return rst;
}
+
public DataTable SearchInfoByBoxNoLock(string boxNo)
{
DataTable barCodeTable = barCodeDal.SearchInfoByBoxNoLock(boxNo);
diff --git a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
index 81b1d7e..6b85e1e 100644
--- a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
+++ b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
@@ -410,11 +410,11 @@ namespace MESClassLibrary.DAL.BasicInfo
return;
}
}
- public DataTable GetFailedBarCode(LocalDBService local,string model, int repeatSendTimes)
+ public DataTable GetFailedBarCode(LocalDBService local,string model, int repeatSendTimes,string stationNo)
{
try
{
- string sql = $" select * from tb_BarCodeFails where IsRight=0 and RepeatTimes<={repeatSendTimes} and Model='{model}' order by id";
+ string sql = $" select * from tb_BarCodeFails where StationNo='{stationNo}' and IsRight=0 and RepeatTimes<={repeatSendTimes} and Model='{model}' order by id";
DataTable failTable = local.Exec_DataSet(sql).Tables[0];
return failTable;
@@ -1134,6 +1134,20 @@ namespace MESClassLibrary.DAL.BasicInfo
//SqlHelper.ExecuteNonQuery(SqlHelper.GetConnSting(), CommandType.Text, sql, param);
return true;
}
+ public bool UpdateBoxCode(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 74d8d73..bdd51d3 100644
--- a/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
+++ b/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
@@ -120,6 +120,42 @@ namespace MESClassLibrary.DAL.Injection
return false;
}
}
+ public bool UpdateBoxCode(string newBoxCode, string oldBoxCode,string barCodeTable,string standCount)
+ {
+ LocalDBService localDB = new LocalDBService(SqlHelper.GetConnSting());
+ try
+ {
+ localDB.BeginTrans();
+ string sql = "update " + barCodeTable + $" set BoxNo = '{newBoxCode}',Des4='旧:{oldBoxCode}新:{newBoxCode}' where BoxNo='{oldBoxCode}' ";
+
+
+
+ localDB.Exec_NonQuery(sql);
+
+ string sql2 = $"update tb_Injection_BoxRecord set BoxNo='{newBoxCode}' ,StandardQty='{standCount}', Remark='旧:{oldBoxCode}新:{newBoxCode}' where BoxNo='{oldBoxCode}'";
+ localDB.Exec_NonQuery(sql2);
+
+ localDB.Commit();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ if (localDB != null)
+ {
+ localDB.Rollback();
+ }
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+
+ return false;
+ }
+ finally
+ {
+ if (localDB != null)
+ {
+ localDB.EndTrans();
+ }
+ }
+ }
public bool UpdateInfo(LocalDBService localDB, string packageCode, int addCount, bool isFinish = false)
{