新增卡通箱转移

UAS-MES/CustomControl/RichText/RichTextAutoBottom.cs

@@ -38,6 +38,7 @@ namespace UAS_MES.CustomControl.RichText
             {
                 FileName = Application.StartupPath + @"\Resources\Sound\5185.wav";
                 thread.Start();
+                thread = new Thread(PlaySound);
 
             }
             else if (color == Color.Green && Entity.SystemInf.CheckAudioEnable)
@@ -45,6 +46,7 @@ namespace UAS_MES.CustomControl.RichText
                 //颜色是绿色，进行正确提示音
                 FileName = Application.StartupPath + @"\Resources\Sound\8378.wav";
                 thread.Start();
+                thread = new Thread(PlaySound);
             }
         }
 

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.Designer.cs

@@ -78,10 +78,9 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(41, 302);
-            this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_code_label.Location = new System.Drawing.Point(31, 242);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_code_label.Size = new System.Drawing.Size(92, 27);
             this.ma_code_label.TabIndex = 97;
             this.ma_code_label.Text = "制造单号";
             // 
@@ -92,10 +91,9 @@
             this.panel6.Controls.Add(this.pr_code);
             this.panel6.Controls.Add(this.pr_cartongw_label);
             this.panel6.Controls.Add(this.pr_code_label);
-            this.panel6.Location = new System.Drawing.Point(563, 95);
-            this.panel6.Margin = new System.Windows.Forms.Padding(4);
+            this.panel6.Location = new System.Drawing.Point(422, 76);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(537, 156);
+            this.panel6.Size = new System.Drawing.Size(403, 125);
             this.panel6.TabIndex = 90;
             // 
             // pr_cartongw
@@ -103,11 +101,10 @@
             this.pr_cartongw.AutoSize = true;
             this.pr_cartongw.CutLength = null;
             this.pr_cartongw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartongw.Location = new System.Drawing.Point(205, 91);
-            this.pr_cartongw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_cartongw.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_cartongw.Location = new System.Drawing.Point(154, 73);
+            this.pr_cartongw.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_cartongw.Name = "pr_cartongw";
-            this.pr_cartongw.Size = new System.Drawing.Size(0, 32);
+            this.pr_cartongw.Size = new System.Drawing.Size(0, 27);
             this.pr_cartongw.TabIndex = 80;
             this.pr_cartongw.Tag = "1";
             // 
@@ -116,11 +113,10 @@
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(205, 28);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_code.Location = new System.Drawing.Point(154, 22);
+            this.pr_code.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 32);
+            this.pr_code.Size = new System.Drawing.Size(0, 27);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
@@ -129,10 +125,9 @@
             // 
             this.pr_cartongw_label.AutoSize = true;
             this.pr_cartongw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartongw_label.Location = new System.Drawing.Point(37, 91);
-            this.pr_cartongw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_cartongw_label.Location = new System.Drawing.Point(28, 73);
             this.pr_cartongw_label.Name = "pr_cartongw_label";
-            this.pr_cartongw_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_cartongw_label.Size = new System.Drawing.Size(92, 27);
             this.pr_cartongw_label.TabIndex = 42;
             this.pr_cartongw_label.Text = "标准重量";
             // 
@@ -140,10 +135,9 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(36, 28);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(27, 22);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -153,10 +147,9 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(33, 95);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4);
+            this.panel4.Location = new System.Drawing.Point(25, 76);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(495, 156);
+            this.panel4.Size = new System.Drawing.Size(372, 125);
             this.panel4.TabIndex = 91;
             // 
             // pr_cartonunit
@@ -165,10 +158,9 @@
             this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(409, 64);
-            this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_cartonunit.Location = new System.Drawing.Point(307, 51);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
+            this.pr_cartonunit.Size = new System.Drawing.Size(31, 25);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -178,10 +170,9 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(20, 64);
-            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label22.Location = new System.Drawing.Point(15, 51);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
+            this.label22.Size = new System.Drawing.Size(50, 25);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -193,20 +184,18 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 22.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(139, 54);
-            this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight.Location = new System.Drawing.Point(104, 43);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 50);
+            this.weight.Size = new System.Drawing.Size(0, 39);
             this.weight.TabIndex = 41;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(35, 30);
-            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Location = new System.Drawing.Point(26, 24);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(77, 39);
+            this.label15.Size = new System.Drawing.Size(62, 31);
             this.label15.TabIndex = 85;
             this.label15.Text = "箱号";
             // 
@@ -214,10 +203,9 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(41, 502);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(31, 402);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 82;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -225,10 +213,9 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(41, 606);
-            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty_label.Location = new System.Drawing.Point(31, 485);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
             this.ma_qty_label.TabIndex = 84;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -236,10 +223,9 @@
             // 
             this.ma_salecode_label.AutoSize = true;
             this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode_label.Location = new System.Drawing.Point(41, 401);
-            this.ma_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_salecode_label.Location = new System.Drawing.Point(31, 321);
             this.ma_salecode_label.Name = "ma_salecode_label";
-            this.ma_salecode_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_salecode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_salecode_label.TabIndex = 83;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -247,20 +233,18 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1248, 181);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintLabel.Location = new System.Drawing.Point(936, 145);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(160, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(121, 20);
             this.PrintLabel.TabIndex = 157;
             // 
             // Printer_label
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(1119, 139);
-            this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Printer_label.Location = new System.Drawing.Point(839, 111);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(107, 25);
+            this.Printer_label.Size = new System.Drawing.Size(84, 20);
             this.Printer_label.TabIndex = 159;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -268,19 +252,17 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1119, 181);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(839, 145);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(88, 25);
+            this.label1.Size = new System.Drawing.Size(69, 20);
             this.label1.TabIndex = 161;
             this.label1.Text = "打印标签";
             // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(1249, 95);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintNum.Location = new System.Drawing.Point(937, 76);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(160, 25);
+            this.PrintNum.Size = new System.Drawing.Size(120, 21);
             this.PrintNum.TabIndex = 170;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -292,10 +274,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1119, 96);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(839, 77);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(88, 25);
+            this.label2.Size = new System.Drawing.Size(69, 20);
             this.label2.TabIndex = 171;
             this.label2.Text = "打印张数";
             // 
@@ -303,11 +284,10 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(1249, 69);
-            this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ComList.Location = new System.Drawing.Point(937, 55);
+            this.ComList.MaximumSize = new System.Drawing.Size(150, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(63, 15);
+            this.ComList.Size = new System.Drawing.Size(47, 12);
             this.ComList.TabIndex = 173;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -316,21 +296,20 @@
             // 
             this.BaudRate.AutoSize = true;
             this.BaudRate.CutLength = null;
-            this.BaudRate.Location = new System.Drawing.Point(1249, 49);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.BaudRate.MaximumSize = new System.Drawing.Size(200, 0);
+            this.BaudRate.Location = new System.Drawing.Point(937, 39);
+            this.BaudRate.MaximumSize = new System.Drawing.Size(150, 0);
             this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Size = new System.Drawing.Size(71, 15);
+            this.BaudRate.Size = new System.Drawing.Size(53, 12);
             this.BaudRate.TabIndex = 172;
             this.BaudRate.Text = "BaudRate";
             this.BaudRate.Visible = false;
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(1248, 139);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
+            this.PrinterList.Location = new System.Drawing.Point(936, 111);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(160, 28);
+            this.PrinterList.Size = new System.Drawing.Size(120, 22);
             this.PrinterList.TabIndex = 158;
             // 
             // StartWeight
@@ -340,13 +319,12 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(877, 31);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(4);
+            this.StartWeight.Location = new System.Drawing.Point(658, 25);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
             this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
             this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(100, 30);
+            this.StartWeight.Size = new System.Drawing.Size(75, 24);
             this.StartWeight.TabIndex = 156;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -359,13 +337,12 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(1225, 222);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4);
+            this.Confirm.Location = new System.Drawing.Point(919, 178);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(100, 29);
+            this.Confirm.Size = new System.Drawing.Size(75, 23);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -375,11 +352,10 @@
             // 
             this.pd_barcode.AutoSize = true;
             this.pd_barcode.CutLength = null;
-            this.pd_barcode.Location = new System.Drawing.Point(1249, 26);
-            this.pd_barcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pd_barcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pd_barcode.Location = new System.Drawing.Point(937, 21);
+            this.pd_barcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pd_barcode.Name = "pd_barcode";
-            this.pd_barcode.Size = new System.Drawing.Size(87, 15);
+            this.pd_barcode.Size = new System.Drawing.Size(65, 12);
             this.pd_barcode.TabIndex = 107;
             this.pd_barcode.Text = "pd_barcode";
             this.pd_barcode.Visible = false;
@@ -391,13 +367,12 @@
             this.StopWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.DownImage")));
             this.StopWeight.Image = ((System.Drawing.Image)(resources.GetObject("StopWeight.Image")));
             this.StopWeight.IsShowBorder = true;
-            this.StopWeight.Location = new System.Drawing.Point(1004, 31);
-            this.StopWeight.Margin = new System.Windows.Forms.Padding(4);
+            this.StopWeight.Location = new System.Drawing.Point(753, 25);
             this.StopWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.MoveImage")));
             this.StopWeight.Name = "StopWeight";
             this.StopWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.NormalImage")));
             this.StopWeight.Power = null;
-            this.StopWeight.Size = new System.Drawing.Size(100, 30);
+            this.StopWeight.Size = new System.Drawing.Size(75, 24);
             this.StopWeight.TabIndex = 102;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -408,11 +383,10 @@
             this.ma_code.AutoSize = true;
             this.ma_code.CutLength = null;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(188, 302);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_code.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_code.Location = new System.Drawing.Point(141, 242);
+            this.ma_code.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 32);
+            this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 101;
             this.ma_code.Tag = "1";
             // 
@@ -421,11 +395,10 @@
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(188, 606);
-            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_qty.Location = new System.Drawing.Point(141, 485);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 32);
+            this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.TabIndex = 100;
             // 
             // pr_detail
@@ -433,11 +406,10 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(188, 503);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_detail.Location = new System.Drawing.Point(141, 402);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 32);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 99;
             // 
             // ma_salecode
@@ -445,11 +417,10 @@
             this.ma_salecode.AutoSize = true;
             this.ma_salecode.CutLength = null;
             this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode.Location = new System.Drawing.Point(188, 401);
-            this.ma_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_salecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_salecode.Location = new System.Drawing.Point(141, 321);
+            this.ma_salecode.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 32);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 27);
             this.ma_salecode.TabIndex = 98;
             // 
             // Clean
@@ -459,13 +430,12 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1236, 661);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4);
+            this.Clean.Location = new System.Drawing.Point(927, 529);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(100, 30);
+            this.Clean.Size = new System.Drawing.Size(75, 24);
             this.Clean.TabIndex = 89;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -477,8 +447,7 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = ((System.Drawing.Image)(resources.GetObject("normalButton1.Image")));
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(33, 69);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(4);
+            this.normalButton1.Location = new System.Drawing.Point(25, 55);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -494,11 +463,10 @@
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(125, 26);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.outboxcode.Location = new System.Drawing.Point(94, 21);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = null;
-            this.outboxcode.Size = new System.Drawing.Size(721, 47);
+            this.outboxcode.Size = new System.Drawing.Size(542, 39);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -508,10 +476,9 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1124, 267);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(843, 214);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(297, 376);
+            this.OperateResult.Size = new System.Drawing.Size(224, 302);
             this.OperateResult.TabIndex = 87;
             this.OperateResult.Text = "";
             // 
@@ -523,10 +490,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WeighRecord.Location = new System.Drawing.Point(563, 267);
-            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.WeighRecord.Location = new System.Drawing.Point(422, 214);
+            this.WeighRecord.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.WeighRecord.Name = "WeighRecord";
-            this.WeighRecord.Size = new System.Drawing.Size(537, 376);
+            this.WeighRecord.Size = new System.Drawing.Size(404, 302);
             this.WeighRecord.TabIndex = 174;
             this.WeighRecord.UseCompatibleStateImageBehavior = false;
             this.WeighRecord.View = System.Windows.Forms.View.Details;
@@ -554,16 +521,17 @@
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1124, 49);
+            this.AutoPrint.Location = new System.Drawing.Point(843, 39);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(118, 35);
+            this.AutoPrint.Size = new System.Drawing.Size(88, 28);
             this.AutoPrint.TabIndex = 175;
             // 
             // Make_CartonBoxWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1429, 700);
+            this.ClientSize = new System.Drawing.Size(1072, 560);
             this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.WeighRecord);
             this.Controls.Add(this.ComList);
@@ -594,19 +562,18 @@
             this.Controls.Add(this.ma_salecode_label);
             this.Controls.Add(this.OperateResult);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_CartonBoxWeigh";
             this.Tag = "Make!CartonBoxWeigh";
             this.Text = "卡通箱称重";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.卡通箱称重_FormClosing);
             this.Load += new System.EventHandler(this.卡通箱称重_Load);
             this.SizeChanged += new System.EventHandler(this.卡通箱称重_SizeChanged);
-            this.panel6.ResumeLayout(true);
+            this.panel6.ResumeLayout(false);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(true);
+            this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_CartonTransfer.Designer.cs

@@ -1,236 +0,0 @@
-namespace UAS_MES.FunctionCode.Make
-{
-    partial class 卡通箱转移
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.label1 = new System.Windows.Forms.Label();
-            this.pa_currentqty_label = new System.Windows.Forms.Label();
-            this.pr_outboxinnerqty = new System.Windows.Forms.Label();
-            this.pr_detail_label = new System.Windows.Forms.Label();
-            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode();
-            this.pa_currentqty = new System.Windows.Forms.Label();
-            this.pr_code_label = new System.Windows.Forms.Label();
-            this.pr_detail = new System.Windows.Forms.Label();
-            this.pr_outboxinnerqty_label = new System.Windows.Forms.Label();
-            this.pr_code = new System.Windows.Forms.Label();
-            this.pa_code_label = new System.Windows.Forms.Label();
-            this.groupBoxWithBorder1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBoxWithBorder2
-            // 
-            this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder2.Location = new System.Drawing.Point(607, 12);
-            this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(595, 196);
-            this.groupBoxWithBorder2.TabIndex = 174;
-            this.groupBoxWithBorder2.TabStop = false;
-            this.groupBoxWithBorder2.Text = "转移箱";
-            this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
-            // 
-            // groupBoxWithBorder1
-            // 
-            this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxWithBorder1.Controls.Add(this.label1);
-            this.groupBoxWithBorder1.Controls.Add(this.pa_currentqty_label);
-            this.groupBoxWithBorder1.Controls.Add(this.pr_outboxinnerqty);
-            this.groupBoxWithBorder1.Controls.Add(this.pr_detail_label);
-            this.groupBoxWithBorder1.Controls.Add(this.pa_outboxcode);
-            this.groupBoxWithBorder1.Controls.Add(this.pa_currentqty);
-            this.groupBoxWithBorder1.Controls.Add(this.pr_code_label);
-            this.groupBoxWithBorder1.Controls.Add(this.pr_detail);
-            this.groupBoxWithBorder1.Controls.Add(this.pr_outboxinnerqty_label);
-            this.groupBoxWithBorder1.Controls.Add(this.pr_code);
-            this.groupBoxWithBorder1.Controls.Add(this.pa_code_label);
-            this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(12, 12);
-            this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(589, 196);
-            this.groupBoxWithBorder1.TabIndex = 173;
-            this.groupBoxWithBorder1.TabStop = false;
-            this.groupBoxWithBorder1.Text = "原箱信息";
-            this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(311, 49);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
-            this.label1.TabIndex = 171;
-            this.label1.Text = "箱内数量";
-            // 
-            // pa_currentqty_label
-            // 
-            this.pa_currentqty_label.AutoSize = true;
-            this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(311, 152);
-            this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_currentqty_label.Name = "pa_currentqty_label";
-            this.pa_currentqty_label.Size = new System.Drawing.Size(132, 27);
-            this.pa_currentqty_label.TabIndex = 95;
-            this.pa_currentqty_label.Text = "最后所在资源";
-            // 
-            // pr_outboxinnerqty
-            // 
-            this.pr_outboxinnerqty.AutoSize = true;
-            this.pr_outboxinnerqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty.Location = new System.Drawing.Point(130, 152);
-            this.pr_outboxinnerqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_outboxinnerqty.Name = "pr_outboxinnerqty";
-            this.pr_outboxinnerqty.Size = new System.Drawing.Size(0, 27);
-            this.pr_outboxinnerqty.TabIndex = 170;
-            // 
-            // pr_detail_label
-            // 
-            this.pr_detail_label.AutoSize = true;
-            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(311, 100);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(101, 27);
-            this.pr_detail_label.TabIndex = 80;
-            this.pr_detail_label.Text = "工单/合同";
-            // 
-            // pa_outboxcode
-            // 
-            this.pa_outboxcode.Caller = null;
-            this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.pa_outboxcode.Location = new System.Drawing.Point(162, 49);
-            this.pa_outboxcode.MakeCode = null;
-            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
-            this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Pr_id = null;
-            this.pa_outboxcode.ProdCode = null;
-            this.pa_outboxcode.ShowClickIcon = false;
-            this.pa_outboxcode.Size = new System.Drawing.Size(137, 28);
-            this.pa_outboxcode.TabIndex = 163;
-            // 
-            // pa_currentqty
-            // 
-            this.pa_currentqty.AutoSize = true;
-            this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(421, 152);
-            this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_currentqty.Name = "pa_currentqty";
-            this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
-            this.pa_currentqty.TabIndex = 169;
-            // 
-            // pr_code_label
-            // 
-            this.pr_code_label.AutoSize = true;
-            this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(13, 100);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
-            this.pr_code_label.TabIndex = 81;
-            this.pr_code_label.Text = "产品编号";
-            // 
-            // pr_detail
-            // 
-            this.pr_detail.AutoSize = true;
-            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(421, 100);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 27);
-            this.pr_detail.TabIndex = 168;
-            // 
-            // pr_outboxinnerqty_label
-            // 
-            this.pr_outboxinnerqty_label.AutoSize = true;
-            this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(13, 152);
-            this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
-            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(132, 27);
-            this.pr_outboxinnerqty_label.TabIndex = 97;
-            this.pr_outboxinnerqty_label.Text = "最后所在工序";
-            // 
-            // pr_code
-            // 
-            this.pr_code.AutoSize = true;
-            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(130, 100);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 27);
-            this.pr_code.TabIndex = 167;
-            // 
-            // pa_code_label
-            // 
-            this.pa_code_label.AutoSize = true;
-            this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(13, 46);
-            this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_code_label.Name = "pa_code_label";
-            this.pa_code_label.Size = new System.Drawing.Size(72, 27);
-            this.pa_code_label.TabIndex = 113;
-            this.pa_code_label.Text = "原箱号";
-            // 
-            // 卡通箱转移
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1214, 677);
-            this.Controls.Add(this.groupBoxWithBorder2);
-            this.Controls.Add(this.groupBoxWithBorder1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "卡通箱转移";
-            this.Tag = "Make!CartonTransfer";
-            this.Text = "Make_CartonTransfer";
-            this.groupBoxWithBorder1.ResumeLayout(false);
-            this.groupBoxWithBorder1.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder2;
-        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder1;
-        private System.Windows.Forms.Label pa_currentqty_label;
-        private System.Windows.Forms.Label pr_outboxinnerqty;
-        private System.Windows.Forms.Label pr_detail_label;
-        private CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode pa_outboxcode;
-        private System.Windows.Forms.Label pa_currentqty;
-        private System.Windows.Forms.Label pr_code_label;
-        private System.Windows.Forms.Label pr_detail;
-        private System.Windows.Forms.Label pr_outboxinnerqty_label;
-        private System.Windows.Forms.Label pr_code;
-        private System.Windows.Forms.Label pa_code_label;
-        private System.Windows.Forms.Label label1;
-    }
-}

UAS-MES/FunctionCode/Make/Make_CartonTransfer.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace UAS_MES.FunctionCode.Make
-{
-    public partial class 卡通箱转移 : Form
-    {
-        public 卡通箱转移()
-        {
-            InitializeComponent();
-        }
-    }
-}

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -175,7 +175,7 @@ namespace UAS_MES.Make
                         }
                     }
                     // 获取工单归属工单下一工序是否正确
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? oMakeCode : ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                     {
                         //获取工单的其他信息
                         sql.Clear();

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.Designer.cs

@@ -0,0 +1,494 @@
+namespace UAS_MES.Packing
+{
+    partial class Make_CartonTransfer
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.sn_code_label = new System.Windows.Forms.Label();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.pa_standardqty = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.pa_currentqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.newpack = new System.Windows.Forms.RadioButton();
+            this.movepack = new System.Windows.Forms.RadioButton();
+            this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.pa_packtype = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_type = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_custcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_level = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.lastsccode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ms_msmakecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.laststepcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ms_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.pa_currentqty_label = new System.Windows.Forms.Label();
+            this.pr_detail_label = new System.Windows.Forms.Label();
+            this.ms_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode();
+            this.pr_code_label = new System.Windows.Forms.Label();
+            this.pr_outboxinnerqty_label = new System.Windows.Forms.Label();
+            this.pa_code_label = new System.Windows.Forms.Label();
+            this.button1 = new System.Windows.Forms.Button();
+            this.groupBoxWithBorder2.SuspendLayout();
+            this.groupBoxWithBorder1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // sn_code_label
+            // 
+            this.sn_code_label.AutoSize = true;
+            this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sn_code_label.Location = new System.Drawing.Point(19, 480);
+            this.sn_code_label.Name = "sn_code_label";
+            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
+            this.sn_code_label.TabIndex = 176;
+            this.sn_code_label.Text = "序列号";
+            // 
+            // sn_code
+            // 
+            this.sn_code.AllPower = null;
+            this.sn_code.BackColor = System.Drawing.Color.White;
+            this.sn_code.ID = null;
+            this.sn_code.Location = new System.Drawing.Point(83, 480);
+            this.sn_code.Name = "sn_code";
+            this.sn_code.Power = null;
+            this.sn_code.Size = new System.Drawing.Size(196, 21);
+            this.sn_code.Str = null;
+            this.sn_code.Str1 = null;
+            this.sn_code.Str2 = null;
+            this.sn_code.TabIndex = 177;
+            this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(9, 185);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(889, 272);
+            this.OperateResult.TabIndex = 175;
+            this.OperateResult.Text = "";
+            // 
+            // groupBoxWithBorder2
+            // 
+            this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder2.Controls.Add(this.pa_standardqty);
+            this.groupBoxWithBorder2.Controls.Add(this.pa_currentqty);
+            this.groupBoxWithBorder2.Controls.Add(this.label4);
+            this.groupBoxWithBorder2.Controls.Add(this.label3);
+            this.groupBoxWithBorder2.Controls.Add(this.label2);
+            this.groupBoxWithBorder2.Controls.Add(this.pa_outboxcode);
+            this.groupBoxWithBorder2.Controls.Add(this.newpack);
+            this.groupBoxWithBorder2.Controls.Add(this.movepack);
+            this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(455, 10);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(446, 157);
+            this.groupBoxWithBorder2.TabIndex = 174;
+            this.groupBoxWithBorder2.TabStop = false;
+            this.groupBoxWithBorder2.Text = "转移箱";
+            this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
+            // 
+            // pa_standardqty
+            // 
+            this.pa_standardqty.AllPower = null;
+            this.pa_standardqty.BackColor = System.Drawing.Color.White;
+            this.pa_standardqty.ID = null;
+            this.pa_standardqty.Location = new System.Drawing.Point(121, 117);
+            this.pa_standardqty.Name = "pa_standardqty";
+            this.pa_standardqty.Negative = false;
+            this.pa_standardqty.Power = null;
+            this.pa_standardqty.Size = new System.Drawing.Size(196, 29);
+            this.pa_standardqty.Str = null;
+            this.pa_standardqty.Str1 = null;
+            this.pa_standardqty.Str2 = null;
+            this.pa_standardqty.TabIndex = 174;
+            // 
+            // pa_currentqty
+            // 
+            this.pa_currentqty.AutoSize = true;
+            this.pa_currentqty.CutLength = null;
+            this.pa_currentqty.Location = new System.Drawing.Point(351, 62);
+            this.pa_currentqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_currentqty.Name = "pa_currentqty";
+            this.pa_currentqty.Size = new System.Drawing.Size(0, 21);
+            this.pa_currentqty.TabIndex = 173;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(277, 62);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(74, 21);
+            this.label4.TabIndex = 6;
+            this.label4.Text = "箱内数量";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(36, 117);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.TabIndex = 5;
+            this.label3.Text = "标准容量";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(36, 62);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.TabIndex = 4;
+            this.label2.Text = "目标箱号";
+            // 
+            // pa_outboxcode
+            // 
+            this.pa_outboxcode.AllPower = null;
+            this.pa_outboxcode.BackColor = System.Drawing.Color.White;
+            this.pa_outboxcode.ID = null;
+            this.pa_outboxcode.Location = new System.Drawing.Point(121, 59);
+            this.pa_outboxcode.Name = "pa_outboxcode";
+            this.pa_outboxcode.Power = null;
+            this.pa_outboxcode.Size = new System.Drawing.Size(150, 29);
+            this.pa_outboxcode.Str = null;
+            this.pa_outboxcode.Str1 = null;
+            this.pa_outboxcode.Str2 = null;
+            this.pa_outboxcode.TabIndex = 2;
+            this.pa_outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_outboxcode_KeyDown);
+            // 
+            // newpack
+            // 
+            this.newpack.AutoSize = true;
+            this.newpack.Location = new System.Drawing.Point(140, 28);
+            this.newpack.Name = "newpack";
+            this.newpack.Size = new System.Drawing.Size(60, 25);
+            this.newpack.TabIndex = 1;
+            this.newpack.TabStop = true;
+            this.newpack.Text = "新箱";
+            this.newpack.UseVisualStyleBackColor = true;
+            this.newpack.Click += new System.EventHandler(this.movepack_Click);
+            // 
+            // movepack
+            // 
+            this.movepack.AutoSize = true;
+            this.movepack.Location = new System.Drawing.Point(40, 28);
+            this.movepack.Name = "movepack";
+            this.movepack.Size = new System.Drawing.Size(60, 25);
+            this.movepack.TabIndex = 0;
+            this.movepack.TabStop = true;
+            this.movepack.Text = "移箱";
+            this.movepack.UseVisualStyleBackColor = true;
+            this.movepack.Click += new System.EventHandler(this.movepack_Click);
+            // 
+            // groupBoxWithBorder1
+            // 
+            this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder1.Controls.Add(this.pa_packtype);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_type);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_custcode);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_salecode);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_level);
+            this.groupBoxWithBorder1.Controls.Add(this.lastsccode);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_msmakecode);
+            this.groupBoxWithBorder1.Controls.Add(this.laststepcode);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_prodcode);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_qty);
+            this.groupBoxWithBorder1.Controls.Add(this.label1);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_currentqty_label);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_detail_label);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_outboxcode);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_code_label);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_outboxinnerqty_label);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_code_label);
+            this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(9, 10);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(442, 157);
+            this.groupBoxWithBorder1.TabIndex = 173;
+            this.groupBoxWithBorder1.TabStop = false;
+            this.groupBoxWithBorder1.Text = "原箱信息";
+            this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
+            // 
+            // pa_packtype
+            // 
+            this.pa_packtype.AutoSize = true;
+            this.pa_packtype.CutLength = null;
+            this.pa_packtype.Location = new System.Drawing.Point(116, 13);
+            this.pa_packtype.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_packtype.Name = "pa_packtype";
+            this.pa_packtype.Size = new System.Drawing.Size(0, 21);
+            this.pa_packtype.TabIndex = 181;
+            this.pa_packtype.Visible = false;
+            // 
+            // pa_type
+            // 
+            this.pa_type.AutoSize = true;
+            this.pa_type.CutLength = null;
+            this.pa_type.Location = new System.Drawing.Point(404, 19);
+            this.pa_type.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_type.Name = "pa_type";
+            this.pa_type.Size = new System.Drawing.Size(0, 21);
+            this.pa_type.TabIndex = 180;
+            this.pa_type.Visible = false;
+            // 
+            // pa_custcode
+            // 
+            this.pa_custcode.AutoSize = true;
+            this.pa_custcode.CutLength = null;
+            this.pa_custcode.Location = new System.Drawing.Point(360, 21);
+            this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_custcode.Name = "pa_custcode";
+            this.pa_custcode.Size = new System.Drawing.Size(0, 21);
+            this.pa_custcode.TabIndex = 179;
+            this.pa_custcode.Visible = false;
+            // 
+            // pa_salecode
+            // 
+            this.pa_salecode.AutoSize = true;
+            this.pa_salecode.CutLength = null;
+            this.pa_salecode.Location = new System.Drawing.Point(285, 13);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_salecode.Name = "pa_salecode";
+            this.pa_salecode.Size = new System.Drawing.Size(0, 21);
+            this.pa_salecode.TabIndex = 178;
+            this.pa_salecode.Visible = false;
+            // 
+            // pa_level
+            // 
+            this.pa_level.AutoSize = true;
+            this.pa_level.CutLength = null;
+            this.pa_level.Location = new System.Drawing.Point(108, 13);
+            this.pa_level.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_level.Name = "pa_level";
+            this.pa_level.Size = new System.Drawing.Size(0, 21);
+            this.pa_level.TabIndex = 177;
+            this.pa_level.Visible = false;
+            // 
+            // lastsccode
+            // 
+            this.lastsccode.AutoSize = true;
+            this.lastsccode.CutLength = null;
+            this.lastsccode.Location = new System.Drawing.Point(326, 117);
+            this.lastsccode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.lastsccode.Name = "lastsccode";
+            this.lastsccode.Size = new System.Drawing.Size(0, 21);
+            this.lastsccode.TabIndex = 176;
+            // 
+            // ms_msmakecode
+            // 
+            this.ms_msmakecode.AutoSize = true;
+            this.ms_msmakecode.CutLength = null;
+            this.ms_msmakecode.Location = new System.Drawing.Point(326, 81);
+            this.ms_msmakecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ms_msmakecode.Name = "ms_msmakecode";
+            this.ms_msmakecode.Size = new System.Drawing.Size(0, 21);
+            this.ms_msmakecode.TabIndex = 175;
+            // 
+            // laststepcode
+            // 
+            this.laststepcode.AutoSize = true;
+            this.laststepcode.CutLength = null;
+            this.laststepcode.Location = new System.Drawing.Point(108, 117);
+            this.laststepcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.laststepcode.Name = "laststepcode";
+            this.laststepcode.Size = new System.Drawing.Size(0, 21);
+            this.laststepcode.TabIndex = 174;
+            // 
+            // ms_prodcode
+            // 
+            this.ms_prodcode.AutoSize = true;
+            this.ms_prodcode.CutLength = null;
+            this.ms_prodcode.Location = new System.Drawing.Point(111, 81);
+            this.ms_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ms_prodcode.Name = "ms_prodcode";
+            this.ms_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ms_prodcode.TabIndex = 173;
+            // 
+            // pa_qty
+            // 
+            this.pa_qty.AutoSize = true;
+            this.pa_qty.CutLength = null;
+            this.pa_qty.Location = new System.Drawing.Point(326, 42);
+            this.pa_qty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_qty.Name = "pa_qty";
+            this.pa_qty.Size = new System.Drawing.Size(0, 21);
+            this.pa_qty.TabIndex = 172;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(214, 41);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.TabIndex = 171;
+            this.label1.Text = "箱内数量";
+            // 
+            // pa_currentqty_label
+            // 
+            this.pa_currentqty_label.AutoSize = true;
+            this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_currentqty_label.Location = new System.Drawing.Point(214, 117);
+            this.pa_currentqty_label.Name = "pa_currentqty_label";
+            this.pa_currentqty_label.Size = new System.Drawing.Size(106, 21);
+            this.pa_currentqty_label.TabIndex = 95;
+            this.pa_currentqty_label.Text = "最后所在资源";
+            // 
+            // pr_detail_label
+            // 
+            this.pr_detail_label.AutoSize = true;
+            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_detail_label.Location = new System.Drawing.Point(214, 81);
+            this.pr_detail_label.Name = "pr_detail_label";
+            this.pr_detail_label.Size = new System.Drawing.Size(81, 21);
+            this.pr_detail_label.TabIndex = 80;
+            this.pr_detail_label.Text = "工单/合同";
+            // 
+            // ms_outboxcode
+            // 
+            this.ms_outboxcode.Caller = null;
+            this.ms_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.ms_outboxcode.Location = new System.Drawing.Point(112, 41);
+            this.ms_outboxcode.MakeCode = null;
+            this.ms_outboxcode.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.ms_outboxcode.Name = "ms_outboxcode";
+            this.ms_outboxcode.Pr_id = null;
+            this.ms_outboxcode.ProdCode = null;
+            this.ms_outboxcode.ShowClickIcon = false;
+            this.ms_outboxcode.Size = new System.Drawing.Size(103, 22);
+            this.ms_outboxcode.TabIndex = 163;
+            // 
+            // pr_code_label
+            // 
+            this.pr_code_label.AutoSize = true;
+            this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_code_label.Location = new System.Drawing.Point(5, 81);
+            this.pr_code_label.Name = "pr_code_label";
+            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_code_label.TabIndex = 81;
+            this.pr_code_label.Text = "产品编号";
+            // 
+            // pr_outboxinnerqty_label
+            // 
+            this.pr_outboxinnerqty_label.AutoSize = true;
+            this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(5, 117);
+            this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
+            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(106, 21);
+            this.pr_outboxinnerqty_label.TabIndex = 97;
+            this.pr_outboxinnerqty_label.Text = "最后所在工序";
+            // 
+            // pa_code_label
+            // 
+            this.pa_code_label.AutoSize = true;
+            this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_code_label.Location = new System.Drawing.Point(5, 42);
+            this.pa_code_label.Name = "pa_code_label";
+            this.pa_code_label.Size = new System.Drawing.Size(58, 21);
+            this.pa_code_label.TabIndex = 113;
+            this.pa_code_label.Text = "原箱号";
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(608, 477);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 178;
+            this.button1.Text = "button1";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // Make_CartonTransfer
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(910, 527);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.sn_code);
+            this.Controls.Add(this.sn_code_label);
+            this.Controls.Add(this.OperateResult);
+            this.Controls.Add(this.groupBoxWithBorder2);
+            this.Controls.Add(this.groupBoxWithBorder1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Name = "Make_CartonTransfer";
+            this.Tag = "Make!CartonTransfer";
+            this.Text = "卡通箱转移";
+            this.Load += new System.EventHandler(this.卡通箱转移_Load);
+            this.SizeChanged += new System.EventHandler(this.卡通箱转移_SizeChanged);
+            this.groupBoxWithBorder2.ResumeLayout(false);
+            this.groupBoxWithBorder2.PerformLayout();
+            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder2;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder1;
+        private System.Windows.Forms.Label pa_currentqty_label;
+        private System.Windows.Forms.Label pr_detail_label;
+        private CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode ms_outboxcode;
+        private System.Windows.Forms.Label pr_code_label;
+        private System.Windows.Forms.Label pr_outboxinnerqty_label;
+        private System.Windows.Forms.Label pa_code_label;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.RadioButton movepack;
+        private System.Windows.Forms.RadioButton newpack;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_outboxcode;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label4;
+        private CustomControl.ValueLabel.ValueLabel pa_qty;
+        private CustomControl.ValueLabel.ValueLabel ms_prodcode;
+        private CustomControl.ValueLabel.ValueLabel laststepcode;
+        private CustomControl.ValueLabel.ValueLabel ms_msmakecode;
+        private CustomControl.ValueLabel.ValueLabel lastsccode;
+        private CustomControl.ValueLabel.ValueLabel pa_currentqty;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private System.Windows.Forms.Label sn_code_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox pa_standardqty;
+        private CustomControl.ValueLabel.ValueLabel pa_level;
+        private CustomControl.ValueLabel.ValueLabel pa_salecode;
+        private CustomControl.ValueLabel.ValueLabel pa_custcode;
+        private CustomControl.ValueLabel.ValueLabel pa_type;
+        private CustomControl.ValueLabel.ValueLabel pa_packtype;
+        private System.Windows.Forms.Button button1;
+    }
+}

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -0,0 +1,247 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES.DataOperate;
+using UAS_MES.Entity;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.Packing
+{
+    public partial class Make_CartonTransfer : Form
+    {
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataTable dt;
+
+        DataTable dt1;
+
+        DataTable dtbar;
+
+        DataTable dtst;
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        DataHelper dh;
+
+        public Make_CartonTransfer()
+        {
+            InitializeComponent();
+        }
+
+        private void 卡通箱转移_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            dh = new DataHelper();
+            movepack.Focus();
+            OperateResult.AppendText(">>请输入目标箱号\n", Color.Black);
+        }
+
+        private void 卡通箱转移_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void movepack_Click(object sender, EventArgs e)
+        {
+            if (((RadioButton)sender).Checked == true)
+            {
+                if (((RadioButton)sender).Name == "movepack")
+                {
+                    pa_standardqty.Enabled = false;
+                    pa_outboxcode.Focus();
+                }
+                else if (((RadioButton)sender).Name == "newpack")
+                {
+                    pa_standardqty.Enabled = true;
+                    pa_outboxcode.Focus();
+                }
+
+            }
+        }
+
+        private void pa_outboxcode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (newpack.Checked)
+                {
+                    if (dh.CheckExist("package", "pa_outboxcode = '" + pa_outboxcode.Text + "'"))
+                    {
+                        OperateResult.AppendText(">>该箱号" + pa_outboxcode.Text + "已经存在,如需转移至已经存在的箱号,请选择移箱\n", Color.Red, pa_outboxcode);
+                        pa_outboxcode.Focus();
+                        return;
+                    }
+                }
+                else if (movepack.Checked)
+                {
+                    CheckBoxCode();       
+                }
+            }
+        }
+
+        private Boolean CheckBoxCode()
+        {
+            sql.Clear();
+            sql.Append("select pa_id,pa_outboxcode,pa_standardqty,nvl(pa_currentqty,0) pa_currentqty,pa_prodcode,nvl(pa_downstatus,0) pa_downstatus from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count > 0)
+            {
+                string pa_downstatus = dt.Rows[0]["pa_downstatus"].ToString();
+                string pa_currentqty = dt.Rows[0]["pa_currentqty"].ToString();
+                string pa_standardqty = dt.Rows[0]["pa_standardqty"].ToString();
+                if (pa_downstatus != "0")
+                {
+                    OperateResult.AppendText(">>该箱号" + pa_outboxcode.Text + "处于下地状态，不允许操作\n", Color.Red, pa_outboxcode);
+                    OperateResult.AppendText(">>请输入目标箱号\n", Color.Black);
+                    pa_outboxcode.Focus();
+                    return false;
+
+                }
+                else if (pa_currentqty == pa_standardqty)
+                {
+                    OperateResult.AppendText(">>目标箱号" + pa_outboxcode.Text + "已装满\n", Color.Red, pa_outboxcode);
+                    OperateResult.AppendText(">>请输入目标箱号\n", Color.Black);
+                    pa_outboxcode.Focus();
+                    return false;
+                }
+                BaseUtil.SetFormValue(this.Controls, dt);
+                return true;
+            }
+            else
+            {
+                OperateResult.AppendText(">>该箱号" + pa_outboxcode.Text + "不存在\n", Color.Red, pa_outboxcode);
+                OperateResult.AppendText(">>请输入目标箱号\n", Color.Black);
+                pa_outboxcode.Focus();
+                return false;
+            }
+        }
+
+        private void sn_code_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+
+                string ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode = '" + sn_code.Text + "'").ToString();
+                if (ms_id != "")
+                {
+                    sql.Clear();
+                    sql.Append("select ms_id,ms_prodcode,ms_outboxcode,ms_makecode ms_msmakecode, ms_sccode,");
+                    sql.Append("nvl(ms_currentstepcode,ms_stepcode ) laststepcode, ms_sccode lastsccode,");
+                    sql.Append("ms_checkno from makeserial where ms_id='" + ms_id + "'");
+                    dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    string ms_outboxcode = dt1.Rows[0]["ms_outboxcode"].ToString();
+                    if (ms_outboxcode != "")
+                    {
+                        sql.Clear();
+                        sql.Append("select pa_id,pa_checkno,PA_CURRENTQTY pa_qty,PA_PACKTYPE,nvl(PA_DOWNSTATUS,0) PA_DOWNSTATUS,pa_prodcode  pa_macode,pa_salecode,pa_level,pa_custcode,pa_type,pa_packtype from package where pa_outboxcode='" + ms_outboxcode + "'");
+                        dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dtbar.Rows.Count > 0)
+                        {
+                            string pa_checkno = dtbar.Rows[0]["pa_checkno"].ToString();
+                            string PA_DOWNSTATUS = dtbar.Rows[0]["PA_DOWNSTATUS"].ToString();
+                            string ob_result = dh.getFieldDataByCondition("oqcbatch","ob_result","ob_checkno = '"+ pa_checkno + "'").ToString();
+                            if (PA_DOWNSTATUS == "0")
+                            {
+                                BaseUtil.SetFormValue(this.Controls, dtbar);
+                                BaseUtil.SetFormValue(this.Controls, dt1);
+                                if (newpack.Checked)
+                                {
+                                    if (ob_result == "")
+                                    {
+                                        if (pa_standardqty.Text != "")
+                                        {
+                                            if (pa_outboxcode.Text != "")
+                                            {
+                                                if (dh.CheckExist("package", "pa_outboxcode = '" + pa_outboxcode.Text + "'"))
+                                                {
+                                                    OperateResult.AppendText(">>该箱号" + pa_outboxcode.Text + "已经存在,如需转移至已经存在的箱号,请选择移箱\n", Color.Red, pa_outboxcode);
+                                                    pa_outboxcode.Focus();
+                                                    return;
+                                                }
+                                                else {
+                                                    string pa_id = dh.GetSEQ("package_seq");
+                                                    //新增箱
+                                                    sql.Clear();
+                                                    sql.Append("insert into package (PA_ID, PA_OUTBOXCODE,PA_PRODCODE, PA_PACKDATE,");
+                                                    sql.Append("PA_LEVEL,PA_PACKAGEQTY,PA_TOTALQTY,PA_MAKECODE,PA_STATUS,PA_INDATE,");
+                                                    sql.Append("PA_SALECODE,PA_CUSTCODE,PA_TYPE,PA_CURRENTQTY,PA_PACKTYPE,PA_STANDARDQTY)");
+                                                    sql.Append("values ('"+pa_id+"','" + pa_outboxcode.Text+"','"+ ms_prodcode.Text + "',sysdate,'"+pa_level.Text+"','0','0'");
+                                                    sql.Append(",'"+ ms_msmakecode.Text + "','0',sysdate,'"+pa_salecode.Text+"','"+pa_custcode.Text+"','"+pa_type.Text+"','0','"+ pa_packtype.Text + "','"+pa_standardqty.Text+"')");
+                                                    dh.ExecuteSql(sql.GetString(), "insert");
+                                                    sql.Clear();
+                                                    sql.Append("insert into packagedetail (PD_ID,PD_PAID,PD_OUTBOXCODE,PD_BARCODE,PD_INNERQTY,PD_PRODCODE,PD_MAKECODE,PD_BUILDDATE,PD_YMD)");
+                                                    sql.Append("values (packagedetail_seq.nextval,'"+pa_id+"','"+ pa_outboxcode.Text + "','"+sn_code.Text+"','1','"+ ms_prodcode.Text + "','"+ ms_msmakecode.Text + "',sysdate,to_char(sysdate,'yymmdd'))");
+                                                    dh.ExecuteSql(sql.GetString(), "insert");
+
+                                                    //更新原箱数量
+                                                    dh.UpdateByCondition("package", "pa_currentqty=pa_currentqty-1", "pa_outboxcode = '" + ms_outboxcode + "'");
+                                                    //更新目标箱数量
+                                                    dh.UpdateByCondition("package", "pa_currentqty=1, pa_totalqty=1,pa_packageqty=1", "pa_outboxcode = '" + pa_outboxcode.Text + "'");
+                                                    dh.UpdateByCondition("makeserial", "ms_outboxcode = '" + pa_outboxcode.Text + "'","ms_id = '"+ ms_id + "'");
+                                                    LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,ms_msmakecode.Text,User.UserLineCode,User.UserSourceCode,"卡通箱转移", "卡通箱转移,生成目标箱号"+pa_outboxcode.Text+"",sn_code.Text,"");
+                                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_msmakecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱转移", "序列号:"+sn_code.Text+",从原箱号:"+ms_outboxcode+"转移至目标箱号:"+pa_outboxcode.Text+"", sn_code.Text, "");
+                                                    OperateResult.AppendText(">>序列号:" + sn_code.Text + ",从原箱号:" + ms_outboxcode + "转移至目标箱号:" + pa_outboxcode.Text + "\n",Color.Green);
+                                                    movepack.Focus();
+                                                    pa_outboxcode_KeyDown(sender,e);
+                                                }
+                                            }
+                                            else {
+                                                OperateResult.AppendText(">>必须填写新增目标箱号\n", Color.Red);
+                                                return;
+                                            }
+                                        }
+                                        else {
+                                            OperateResult.AppendText(">>新增目标箱号必须填写标准容量\n", Color.Red);
+                                            return;
+                                        }
+                                    }
+                                    else {
+                                        OperateResult.AppendText(">>原箱" + ms_outboxcode + "处于送检状态，不允许转移\n", Color.Red, sn_code);
+                                        return;
+                                    }
+                                }
+                                else if (movepack.Checked)
+                                {
+                                    if (CheckBoxCode()) {
+
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>原箱" + ms_outboxcode + "已经下地\n", Color.Red, sn_code);
+                                return;
+                            }
+                        }
+                        else
+                        {
+                            OperateResult.AppendText(">>序列号" + sn_code.Text + "未装箱\n", Color.Red, sn_code);
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>序列号" + sn_code.Text + "未装箱\n", Color.Red, sn_code);
+                        return;
+                    }
+                }
+                else
+                {
+                    OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在\n", Color.Red, sn_code);
+                    return;
+                }
+            }
+
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            BaseUtil.CleanControls(this.Controls);
+        }
+    }
+}

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

UAS-MES/PublicMethod/BaseUtil.cs

@@ -604,6 +604,19 @@ namespace UAS_MES.PublicMethod
             }
         }
 
+        public static void CleanControls(ControlCollection collection)
+        {
+            for (int i = 0; i < collection.Count; i++)
+            {
+                if (collection[i].Controls.Count > 0)
+                    CleanControls(collection[i].Controls);
+                if (collection[i] is EnterTextBox || collection[i] is TextBox || collection[i] is ValueLabel || collection[i] is SearchTextBox || collection[i] is ValueNumLabel || collection[i] is MaCodeSearchTextBox)
+                    collection[i].Text = "";
+                if (collection[i] is DataGridView)
+                    CleanDGVData((DataGridView)collection[i]);
+            }
+        }
+
         public static void CleanControlsText(params Control[] ctl)
         {
             foreach (Control item in ctl)