卡通箱移箱添加全部移箱，完工入库代码添加

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

@@ -28,7 +28,9 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Packing_CartonTransfer));
             this.sn_code_label = new System.Windows.Forms.Label();
+            this.清除 = new System.Windows.Forms.Button();
             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();
@@ -54,11 +56,11 @@
             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.清除 = new System.Windows.Forms.Button();
+            this.ALLMOVE = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.ms_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.groupBoxWithBorder2.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
             this.SuspendLayout();
@@ -67,23 +69,31 @@
             // 
             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, 580);
-            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sn_code_label.Location = new System.Drawing.Point(14, 464);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(72, 27);
+            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
             this.sn_code_label.TabIndex = 176;
             this.sn_code_label.Text = "序列号";
             // 
+            // 清除
+            // 
+            this.清除.Location = new System.Drawing.Point(849, 462);
+            this.清除.Name = "清除";
+            this.清除.Size = new System.Drawing.Size(48, 23);
+            this.清除.TabIndex = 178;
+            this.清除.Text = "清除";
+            this.清除.UseVisualStyleBackColor = true;
+            this.清除.Click += new System.EventHandler(this.button1_Click);
+            // 
             // 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(108, 582);
-            this.sn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sn_code.Location = new System.Drawing.Point(81, 466);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(260, 25);
+            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;
@@ -93,10 +103,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(12, 231);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(9, 185);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1184, 339);
+            this.OperateResult.Size = new System.Drawing.Size(889, 272);
             this.OperateResult.TabIndex = 175;
             this.OperateResult.Text = "";
             // 
@@ -112,11 +121,11 @@
             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(607, 12);
-            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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(3, 2, 3, 2);
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(595, 196);
+            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 = "转移箱";
@@ -128,12 +137,11 @@
             this.pa_standardqty.BackColor = System.Drawing.Color.White;
             this.pa_standardqty.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.pa_standardqty.ID = null;
-            this.pa_standardqty.Location = new System.Drawing.Point(161, 146);
-            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            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(199, 27);
+            this.pa_standardqty.Size = new System.Drawing.Size(150, 23);
             this.pa_standardqty.Str = null;
             this.pa_standardqty.Str1 = null;
             this.pa_standardqty.Str2 = null;
@@ -143,40 +151,36 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.CutLength = null;
-            this.pa_currentqty.Location = new System.Drawing.Point(468, 78);
-            this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_currentqty.MaximumSize = new System.Drawing.Size(267, 0);
+            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, 27);
+            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(369, 78);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(277, 62);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(92, 27);
+            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(48, 146);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Location = new System.Drawing.Point(36, 116);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(92, 27);
+            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(48, 78);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(36, 62);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(92, 27);
+            this.label2.Size = new System.Drawing.Size(74, 21);
             this.label2.TabIndex = 4;
             this.label2.Text = "目标箱号";
             // 
@@ -186,11 +190,10 @@
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(161, 78);
-            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pa_outboxcode.Location = new System.Drawing.Point(121, 62);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = null;
-            this.pa_outboxcode.Size = new System.Drawing.Size(199, 27);
+            this.pa_outboxcode.Size = new System.Drawing.Size(150, 23);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
@@ -200,10 +203,9 @@
             // newpack
             // 
             this.newpack.AutoSize = true;
-            this.newpack.Location = new System.Drawing.Point(187, 35);
-            this.newpack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.newpack.Location = new System.Drawing.Point(140, 27);
             this.newpack.Name = "newpack";
-            this.newpack.Size = new System.Drawing.Size(73, 31);
+            this.newpack.Size = new System.Drawing.Size(60, 25);
             this.newpack.TabIndex = 1;
             this.newpack.TabStop = true;
             this.newpack.Text = "新箱";
@@ -213,10 +215,9 @@
             // movepack
             // 
             this.movepack.AutoSize = true;
-            this.movepack.Location = new System.Drawing.Point(53, 35);
-            this.movepack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.movepack.Location = new System.Drawing.Point(40, 27);
             this.movepack.Name = "movepack";
-            this.movepack.Size = new System.Drawing.Size(73, 31);
+            this.movepack.Size = new System.Drawing.Size(60, 25);
             this.movepack.TabIndex = 0;
             this.movepack.TabStop = true;
             this.movepack.Text = "移箱";
@@ -226,6 +227,7 @@
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder1.Controls.Add(this.ms_outboxcode);
             this.groupBoxWithBorder1.Controls.Add(this.pa_packtype);
             this.groupBoxWithBorder1.Controls.Add(this.pa_type);
             this.groupBoxWithBorder1.Controls.Add(this.pa_custcode);
@@ -239,16 +241,15 @@
             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(12, 12);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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(3, 2, 3, 2);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(589, 196);
+            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 = "原箱信息";
@@ -258,11 +259,10 @@
             // 
             this.pa_packtype.AutoSize = true;
             this.pa_packtype.CutLength = null;
-            this.pa_packtype.Location = new System.Drawing.Point(155, 16);
-            this.pa_packtype.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_packtype.MaximumSize = new System.Drawing.Size(267, 0);
+            this.pa_packtype.Location = new System.Drawing.Point(116, 12);
+            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, 27);
+            this.pa_packtype.Size = new System.Drawing.Size(0, 21);
             this.pa_packtype.TabIndex = 181;
             this.pa_packtype.Visible = false;
             // 
@@ -270,11 +270,10 @@
             // 
             this.pa_type.AutoSize = true;
             this.pa_type.CutLength = null;
-            this.pa_type.Location = new System.Drawing.Point(539, 24);
-            this.pa_type.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_type.MaximumSize = new System.Drawing.Size(267, 0);
+            this.pa_type.Location = new System.Drawing.Point(404, 18);
+            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, 27);
+            this.pa_type.Size = new System.Drawing.Size(0, 21);
             this.pa_type.TabIndex = 180;
             this.pa_type.Visible = false;
             // 
@@ -282,11 +281,10 @@
             // 
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
-            this.pa_custcode.Location = new System.Drawing.Point(480, 26);
-            this.pa_custcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_custcode.MaximumSize = new System.Drawing.Size(267, 0);
+            this.pa_custcode.Location = new System.Drawing.Point(360, 20);
+            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, 27);
+            this.pa_custcode.Size = new System.Drawing.Size(0, 21);
             this.pa_custcode.TabIndex = 179;
             this.pa_custcode.Visible = false;
             // 
@@ -294,11 +292,10 @@
             // 
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.CutLength = null;
-            this.pa_salecode.Location = new System.Drawing.Point(380, 16);
-            this.pa_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(267, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(285, 12);
+            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, 27);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 21);
             this.pa_salecode.TabIndex = 178;
             this.pa_salecode.Visible = false;
             // 
@@ -306,11 +303,10 @@
             // 
             this.pa_level.AutoSize = true;
             this.pa_level.CutLength = null;
-            this.pa_level.Location = new System.Drawing.Point(144, 16);
-            this.pa_level.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_level.MaximumSize = new System.Drawing.Size(267, 0);
+            this.pa_level.Location = new System.Drawing.Point(108, 12);
+            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, 27);
+            this.pa_level.Size = new System.Drawing.Size(0, 21);
             this.pa_level.TabIndex = 177;
             this.pa_level.Visible = false;
             // 
@@ -318,65 +314,59 @@
             // 
             this.lastsccode.AutoSize = true;
             this.lastsccode.CutLength = null;
-            this.lastsccode.Location = new System.Drawing.Point(435, 146);
-            this.lastsccode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lastsccode.MaximumSize = new System.Drawing.Size(267, 0);
+            this.lastsccode.Location = new System.Drawing.Point(326, 116);
+            this.lastsccode.MaximumSize = new System.Drawing.Size(200, 0);
             this.lastsccode.Name = "lastsccode";
-            this.lastsccode.Size = new System.Drawing.Size(0, 27);
+            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(435, 101);
-            this.ms_msmakecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ms_msmakecode.MaximumSize = new System.Drawing.Size(267, 0);
+            this.ms_msmakecode.Location = new System.Drawing.Point(326, 80);
+            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, 27);
+            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(148, 146);
-            this.laststepcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.laststepcode.MaximumSize = new System.Drawing.Size(267, 0);
+            this.laststepcode.Location = new System.Drawing.Point(111, 116);
+            this.laststepcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.laststepcode.Name = "laststepcode";
-            this.laststepcode.Size = new System.Drawing.Size(0, 27);
+            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(148, 101);
-            this.ms_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ms_prodcode.MaximumSize = new System.Drawing.Size(267, 0);
+            this.ms_prodcode.Location = new System.Drawing.Point(111, 80);
+            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, 27);
+            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(435, 52);
-            this.pa_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_qty.MaximumSize = new System.Drawing.Size(267, 0);
+            this.pa_qty.Location = new System.Drawing.Point(326, 41);
+            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, 27);
+            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(285, 51);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(214, 40);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 171;
             this.label1.Text = "箱内数量";
             // 
@@ -384,10 +374,9 @@
             // 
             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(285, 146);
-            this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(214, 116);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
-            this.pa_currentqty_label.Size = new System.Drawing.Size(132, 27);
+            this.pa_currentqty_label.Size = new System.Drawing.Size(106, 21);
             this.pa_currentqty_label.TabIndex = 95;
             this.pa_currentqty_label.Text = "最后所在资源";
             // 
@@ -395,35 +384,19 @@
             // 
             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(285, 101);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(214, 80);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(101, 27);
+            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(149, 51);
-            this.ms_outboxcode.MakeCode = null;
-            this.ms_outboxcode.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
-            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(137, 28);
-            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(7, 101);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(5, 80);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
             this.pr_code_label.TabIndex = 81;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -431,10 +404,9 @@
             // 
             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(7, 146);
-            this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(5, 116);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
-            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(132, 27);
+            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(106, 21);
             this.pr_outboxinnerqty_label.TabIndex = 97;
             this.pr_outboxinnerqty_label.Text = "最后所在工序";
             // 
@@ -442,29 +414,51 @@
             // 
             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(7, 52);
-            this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_code_label.Location = new System.Drawing.Point(5, 41);
             this.pa_code_label.Name = "pa_code_label";
-            this.pa_code_label.Size = new System.Drawing.Size(72, 27);
+            this.pa_code_label.Size = new System.Drawing.Size(58, 21);
             this.pa_code_label.TabIndex = 113;
             this.pa_code_label.Text = "原箱号";
             // 
-            // 清除
+            // ALLMOVE
+            // 
+            this.ALLMOVE.AllPower = null;
+            this.ALLMOVE.BackColor = System.Drawing.Color.Transparent;
+            this.ALLMOVE.DownImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.DownImage")));
+            this.ALLMOVE.Image = null;
+            this.ALLMOVE.IsShowBorder = true;
+            this.ALLMOVE.Location = new System.Drawing.Point(339, 464);
+            this.ALLMOVE.MoveImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.MoveImage")));
+            this.ALLMOVE.Name = "ALLMOVE";
+            this.ALLMOVE.NormalImage = ((System.Drawing.Image)(resources.GetObject("ALLMOVE.NormalImage")));
+            this.ALLMOVE.Power = null;
+            this.ALLMOVE.Size = new System.Drawing.Size(75, 28);
+            this.ALLMOVE.TabIndex = 179;
+            this.ALLMOVE.Text = "全部移箱";
+            this.ALLMOVE.UseVisualStyleBackColor = false;
+            this.ALLMOVE.Click += new System.EventHandler(this.ALLMOVE_Click);
             // 
-            this.清除.Location = new System.Drawing.Point(1132, 578);
-            this.清除.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.清除.Name = "清除";
-            this.清除.Size = new System.Drawing.Size(64, 29);
-            this.清除.TabIndex = 178;
-            this.清除.Text = "清除";
-            this.清除.UseVisualStyleBackColor = true;
-            this.清除.Click += new System.EventHandler(this.button1_Click);
+            // ms_outboxcode
+            // 
+            this.ms_outboxcode.AllPower = null;
+            this.ms_outboxcode.BackColor = System.Drawing.Color.White;
+            this.ms_outboxcode.ID = null;
+            this.ms_outboxcode.Location = new System.Drawing.Point(72, 38);
+            this.ms_outboxcode.Name = "ms_outboxcode";
+            this.ms_outboxcode.Power = null;
+            this.ms_outboxcode.Size = new System.Drawing.Size(110, 29);
+            this.ms_outboxcode.Str = null;
+            this.ms_outboxcode.Str1 = null;
+            this.ms_outboxcode.Str2 = null;
+            this.ms_outboxcode.TabIndex = 180;
+            this.ms_outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_outboxcode_KeyDown);
             // 
             // Packing_CartonTransfer
             // 
-            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(1213, 628);
+            this.ClientSize = new System.Drawing.Size(910, 502);
+            this.Controls.Add(this.ALLMOVE);
             this.Controls.Add(this.清除);
             this.Controls.Add(this.sn_code);
             this.Controls.Add(this.sn_code_label);
@@ -472,7 +466,7 @@
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "Packing_CartonTransfer";
             this.Tag = "Packing!CartonTransfer";
             this.Text = "卡通箱转移";
@@ -493,7 +487,6 @@
         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;
@@ -520,5 +513,7 @@
         private CustomControl.ValueLabel.ValueLabel pa_type;
         private CustomControl.ValueLabel.ValueLabel pa_packtype;
         private System.Windows.Forms.Button 清除;
+        private CustomControl.ButtonUtil.NormalButton ALLMOVE;
+        private CustomControl.TextBoxWithIcon.EnterTextBox ms_outboxcode;
     }
 }

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -68,6 +68,7 @@ namespace UAS_MES.Packing
                     pa_currentqty.Text = "";
                     pa_standardqty.Text = "";
                     pa_standardqty.Enabled = false;
+                    ALLMOVE.Enabled = false;
                     pa_outboxcode.Focus();
                 }
                 else if (((RadioButton)sender).Name == "newpack")
@@ -76,6 +77,7 @@ namespace UAS_MES.Packing
                     pa_currentqty.Text = "";
                     pa_standardqty.Text = "";
                     pa_standardqty.Enabled = true;
+                    ALLMOVE.Enabled = true;
                     pa_outboxcode.Focus();
                 }
             }
@@ -212,7 +214,8 @@ namespace UAS_MES.Packing
                                 {
                                     if (CheckBoxCode())
                                     {
-                                        if (pa_outboxcode.Text == ms_outboxcode) {
+                                        if (pa_outboxcode.Text == ms_outboxcode)
+                                        {
                                             OperateResult.AppendText(">>原箱" + ms_outboxcode + "和目标箱号" + pa_outboxcode.Text + "相同，不允许转移\n", Color.Red, sn_code);
                                             return;
                                         }
@@ -357,5 +360,114 @@ namespace UAS_MES.Packing
         {
             BaseUtil.CleanControls(this.Controls);
         }
+
+        private void ms_outboxcode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                sql.Clear();
+                sql.Append("select pa_id,pa_checkno,PA_MAKECODE,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,pa_mothercode from package where pa_outboxcode='" + ms_outboxcode.Text + "'");
+                DataTable dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dtbar.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dtbar);
+                }
+                else OperateResult.AppendText(">>箱号" + ms_outboxcode.Text + "不存在\n", Color.Red, ms_outboxcode);
+            }
+        }
+
+
+        private void ALLMOVE_Click(object sender, EventArgs e)
+        {
+            sql.Clear();
+            sql.Append("select pa_id,pa_checkno,PA_MAKECODE,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,pa_mothercode from package where pa_outboxcode='" + ms_outboxcode.Text + "'");
+            dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dtbar.Rows.Count > 0)
+            {
+                BaseUtil.SetFormValue(this.Controls, dtbar);
+            }
+            else
+            {
+                OperateResult.AppendText(">>箱号" + ms_outboxcode.Text + "不存在\n", Color.Red, ms_outboxcode);
+                return;
+            }
+            string pa_mothercode = dtbar.Rows[0]["pa_mothercode"].ToString();
+            string PA_PACKTYPE = dtbar.Rows[0]["PA_PACKTYPE"].ToString();
+            string pa_checkno = dtbar.Rows[0]["pa_checkno"].ToString();
+            string PA_DOWNSTATUS = dtbar.Rows[0]["PA_DOWNSTATUS"].ToString();
+            string old_pa_id = dtbar.Rows[0]["pa_id"].ToString();
+            string pa_makecode = dtbar.Rows[0]["pa_makecode"].ToString();
+            string pa_macode = dtbar.Rows[0]["pa_macode"].ToString();
+            string ob_result = dh.getFieldDataByCondition("oqcbatch", "ob_result", "ob_checkno = '" + pa_checkno + "'").ToString();
+            if (pa_mothercode != "")
+            {
+                OperateResult.AppendText(">>原箱" + ms_outboxcode.Text + "已装入大箱，不允许转移\n", Color.Red, sn_code);
+                return;
+            }
+            if (ob_result == "")
+            {
+                if (pa_standardqty.Text != "")
+                {
+                    if (int.Parse(pa_standardqty.Text) < int.Parse(pa_qty.Text))
+                    {
+                        OperateResult.AppendText(">>填写的标准容量" + pa_standardqty.Text + "小于待转移箱的容量\n", Color.Red);
+                        return;
+                    }
+                    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 + "','" + pa_macode + "',sysdate,'" + pa_level.Text + "','0','0'");
+                            sql.Append(",'" + pa_makecode + "','0',sysdate,'" + pa_salecode.Text + "','" + pa_custcode.Text + "','" + pa_type.Text + "','0','" + pa_packtype.Text + "','" + pa_standardqty.Text + "')");
+                            dh.ExecuteSql(sql.GetString(), "insert");
+                            ////删除原明细
+                            //dh.ExecuteSql("delete from packagedetail where pd_paid='" + old_pa_id + "'", "delete");
+                            //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','" + pa_macode + "','" + pa_makecode + "',sysdate,to_char(sysdate,'yyyymmdd'))");
+                            //dh.ExecuteSql(sql.GetString(), "insert");
+
+                            dh.UpdateByCondition("packagedetail", "PD_OUTBOXCODE = '" + pa_outboxcode.Text + "',PD_PAID = '" + pa_id + "'", "pd_paid='" + old_pa_id + "'");
+                            //更新原箱数量
+                            dh.UpdateByCondition("package", "pa_currentqty=0", "pa_outboxcode = '" + ms_outboxcode.Text + "'");
+                            //更新目标箱数量
+                            dh.UpdateByCondition("package", "pa_currentqty=" + int.Parse(pa_qty.Text) + ", pa_totalqty=" + int.Parse(pa_qty.Text) + ",pa_packageqty=" + int.Parse(pa_qty.Text) + "", "pa_outboxcode = '" + pa_outboxcode.Text + "'");
+                            dh.UpdateByCondition("makeserial", "ms_outboxcode = '" + pa_outboxcode.Text + "'", "ms_outboxcode = '" + ms_outboxcode.Text + "'");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, "卡通箱转移", "卡通箱转移,生成目标箱号" + pa_outboxcode.Text + "", "", "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, "卡通箱转移", "原箱号:" + ms_outboxcode.Text + "全部转移至目标箱号:" + pa_outboxcode.Text + "", "", "");
+                            OperateResult.AppendText("原箱号:" + ms_outboxcode.Text + "全部转移至目标箱号:" + pa_outboxcode.Text + "\n", Color.Green);
+                        }
+                    }
+                    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;
+            }
+
+        }
     }
 }

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.resx

@@ -117,4 +117,43 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ALLMOVE.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ALLMOVE.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="ALLMOVE.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
 </root>

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.Designer.cs

@@ -33,10 +33,6 @@
             this.pi_titile_label = new System.Windows.Forms.Label();
             this.pi_title = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.boxqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.getqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.ungetqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.outqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.label10 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
@@ -57,6 +53,10 @@
             this.pim_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.boxqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.getqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ungetqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.outqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ConfirmOut = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.NewProdInOut = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ProdDetail = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -111,50 +111,6 @@
             this.panel1.Size = new System.Drawing.Size(169, 195);
             this.panel1.TabIndex = 217;
             // 
-            // boxqty
-            // 
-            this.boxqty.AutoSize = true;
-            this.boxqty.CutLength = null;
-            this.boxqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.boxqty.Location = new System.Drawing.Point(80, 144);
-            this.boxqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.boxqty.Name = "boxqty";
-            this.boxqty.Size = new System.Drawing.Size(0, 21);
-            this.boxqty.TabIndex = 227;
-            // 
-            // getqty
-            // 
-            this.getqty.AutoSize = true;
-            this.getqty.CutLength = null;
-            this.getqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.getqty.Location = new System.Drawing.Point(80, 107);
-            this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.getqty.Name = "getqty";
-            this.getqty.Size = new System.Drawing.Size(0, 21);
-            this.getqty.TabIndex = 226;
-            // 
-            // ungetqty
-            // 
-            this.ungetqty.AutoSize = true;
-            this.ungetqty.CutLength = null;
-            this.ungetqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ungetqty.Location = new System.Drawing.Point(80, 60);
-            this.ungetqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.ungetqty.Name = "ungetqty";
-            this.ungetqty.Size = new System.Drawing.Size(0, 21);
-            this.ungetqty.TabIndex = 225;
-            // 
-            // outqty
-            // 
-            this.outqty.AutoSize = true;
-            this.outqty.CutLength = null;
-            this.outqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outqty.Location = new System.Drawing.Point(80, 17);
-            this.outqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.outqty.Name = "outqty";
-            this.outqty.Size = new System.Drawing.Size(0, 21);
-            this.outqty.TabIndex = 224;
-            // 
             // label10
             // 
             this.label10.AutoSize = true;
@@ -207,6 +163,7 @@
             this.palletBtn.TabStop = true;
             this.palletBtn.Text = "栈板号";
             this.palletBtn.UseVisualStyleBackColor = true;
+            this.palletBtn.Click += new System.EventHandler(this.serBtn_Click);
             // 
             // serBtn
             // 
@@ -220,6 +177,7 @@
             this.serBtn.TabStop = true;
             this.serBtn.Text = "单台序列号";
             this.serBtn.UseVisualStyleBackColor = true;
+            this.serBtn.Click += new System.EventHandler(this.serBtn_Click);
             // 
             // bigboxBtn
             // 
@@ -233,6 +191,7 @@
             this.bigboxBtn.TabStop = true;
             this.bigboxBtn.Text = "大箱号";
             this.bigboxBtn.UseVisualStyleBackColor = true;
+            this.bigboxBtn.Click += new System.EventHandler(this.serBtn_Click);
             // 
             // input
             // 
@@ -373,6 +332,50 @@
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.ReadOnly = true;
             // 
+            // boxqty
+            // 
+            this.boxqty.AutoSize = true;
+            this.boxqty.CutLength = null;
+            this.boxqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.boxqty.Location = new System.Drawing.Point(80, 144);
+            this.boxqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.boxqty.Name = "boxqty";
+            this.boxqty.Size = new System.Drawing.Size(0, 21);
+            this.boxqty.TabIndex = 227;
+            // 
+            // getqty
+            // 
+            this.getqty.AutoSize = true;
+            this.getqty.CutLength = null;
+            this.getqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.getqty.Location = new System.Drawing.Point(80, 107);
+            this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.getqty.Name = "getqty";
+            this.getqty.Size = new System.Drawing.Size(0, 21);
+            this.getqty.TabIndex = 226;
+            // 
+            // ungetqty
+            // 
+            this.ungetqty.AutoSize = true;
+            this.ungetqty.CutLength = null;
+            this.ungetqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ungetqty.Location = new System.Drawing.Point(80, 60);
+            this.ungetqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ungetqty.Name = "ungetqty";
+            this.ungetqty.Size = new System.Drawing.Size(0, 21);
+            this.ungetqty.TabIndex = 225;
+            // 
+            // outqty
+            // 
+            this.outqty.AutoSize = true;
+            this.outqty.CutLength = null;
+            this.outqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.outqty.Location = new System.Drawing.Point(80, 17);
+            this.outqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.outqty.Name = "outqty";
+            this.outqty.Size = new System.Drawing.Size(0, 21);
+            this.outqty.TabIndex = 224;
+            // 
             // ConfirmOut
             // 
             this.ConfirmOut.AllPower = null;

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -268,7 +268,7 @@ namespace UAS_MES.Warehouse
                             {
                                 if (dt.Rows[0]["pa_mothercode"].ToString() != "")
                                 {
-                                    OperateResult.AppendText("箱号" + input.Text + "已经装大箱或者栈板，不允许单独出货\n", Color.Red, input);
+                                    OperateResult.AppendText("箱号" + input.Text + "已经装大箱或者栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "，不允许单独出货\n", Color.Red, input);
                                     return;
                                 }
                                 if (!checkinput(dt, "箱号"))
@@ -587,5 +587,27 @@ namespace UAS_MES.Warehouse
             LoadFormData();
             LoadGridData();
         }
+
+        private void serBtn_Click(object sender, EventArgs e)
+        {
+            if (((RadioButton)sender).Checked == true)
+            {
+                if (((RadioButton)sender).Name == "serBtn")
+                {
+                    input.Focus();
+                    OperateResult.AppendText("请输入序列号进行采集\n", Color.Black, input);
+                }
+                else if (((RadioButton)sender).Name == "bigboxBtn")
+                {
+                    input.Focus();
+                    OperateResult.AppendText("请输入箱号进行采集\n", Color.Black, input);
+                }
+                else if (((RadioButton)sender).Name == "palletBtn")
+                {
+                    input.Focus();
+                    OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
+                }
+            }
+        }
     }
 }

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.Designer.cs

@@ -0,0 +1,253 @@
+namespace UAS_MES.Warehouse
+{
+    partial class Warehouse_ProductMakeIn
+    {
+        /// <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.InOutDetailDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.pim_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pim_mac = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pim_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.getqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.label8 = new System.Windows.Forms.Label();
+            this.cancel = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.input = new System.Windows.Forms.TextBox();
+            this.bigboxBtn = new System.Windows.Forms.RadioButton();
+            this.serBtn = new System.Windows.Forms.RadioButton();
+            this.palletBtn = new System.Windows.Forms.RadioButton();
+            this.label1 = new System.Windows.Forms.Label();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // InOutDetailDGV
+            // 
+            this.InOutDetailDGV.AllowUserToAddRows = false;
+            this.InOutDetailDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.InOutDetailDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.pim_outboxcode,
+            this.pim_mac,
+            this.pim_prodcode,
+            this.pr_detail,
+            this.pr_spec});
+            this.InOutDetailDGV.EnableContentClick = true;
+            this.InOutDetailDGV.Location = new System.Drawing.Point(11, 42);
+            this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(2);
+            this.InOutDetailDGV.Name = "InOutDetailDGV";
+            this.InOutDetailDGV.RowTemplate.Height = 27;
+            this.InOutDetailDGV.Size = new System.Drawing.Size(665, 329);
+            this.InOutDetailDGV.TabIndex = 219;
+            // 
+            // pim_outboxcode
+            // 
+            this.pim_outboxcode.DataPropertyName = "pim_outboxcode";
+            this.pim_outboxcode.HeaderText = "栈板/箱号";
+            this.pim_outboxcode.MinimumWidth = 120;
+            this.pim_outboxcode.Name = "pim_outboxcode";
+            this.pim_outboxcode.ReadOnly = true;
+            this.pim_outboxcode.Width = 120;
+            // 
+            // pim_mac
+            // 
+            this.pim_mac.DataPropertyName = "pim_mac";
+            this.pim_mac.HeaderText = "SN号";
+            this.pim_mac.Name = "pim_mac";
+            this.pim_mac.ReadOnly = true;
+            // 
+            // pim_prodcode
+            // 
+            this.pim_prodcode.DataPropertyName = "pim_prodcode";
+            this.pim_prodcode.HeaderText = "产品代码";
+            this.pim_prodcode.Name = "pim_prodcode";
+            this.pim_prodcode.ReadOnly = true;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "名称";
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.ReadOnly = true;
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.DataPropertyName = "pr_spec";
+            this.pr_spec.HeaderText = "规格";
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.ReadOnly = true;
+            // 
+            // getqty
+            // 
+            this.getqty.AutoSize = true;
+            this.getqty.CutLength = null;
+            this.getqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.getqty.Location = new System.Drawing.Point(83, 19);
+            this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.getqty.Name = "getqty";
+            this.getqty.Size = new System.Drawing.Size(0, 21);
+            this.getqty.TabIndex = 228;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(12, 18);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(74, 21);
+            this.label8.TabIndex = 227;
+            this.label8.Text = "已采集数";
+            // 
+            // cancel
+            // 
+            this.cancel.AutoSize = true;
+            this.cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cancel.Location = new System.Drawing.Point(228, 447);
+            this.cancel.Margin = new System.Windows.Forms.Padding(2);
+            this.cancel.Name = "cancel";
+            this.cancel.Power = null;
+            this.cancel.Size = new System.Drawing.Size(61, 25);
+            this.cancel.TabIndex = 233;
+            this.cancel.Text = "取消";
+            this.cancel.UseVisualStyleBackColor = true;
+            // 
+            // input
+            // 
+            this.input.Location = new System.Drawing.Point(87, 447);
+            this.input.Margin = new System.Windows.Forms.Padding(2);
+            this.input.Name = "input";
+            this.input.Size = new System.Drawing.Size(125, 21);
+            this.input.TabIndex = 232;
+            this.input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.input_KeyDown);
+            // 
+            // bigboxBtn
+            // 
+            this.bigboxBtn.AutoSize = true;
+            this.bigboxBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.bigboxBtn.Location = new System.Drawing.Point(111, 397);
+            this.bigboxBtn.Margin = new System.Windows.Forms.Padding(2);
+            this.bigboxBtn.Name = "bigboxBtn";
+            this.bigboxBtn.Size = new System.Drawing.Size(76, 25);
+            this.bigboxBtn.TabIndex = 231;
+            this.bigboxBtn.TabStop = true;
+            this.bigboxBtn.Text = "大箱号";
+            this.bigboxBtn.UseVisualStyleBackColor = true;
+            this.bigboxBtn.Click += new System.EventHandler(this.serBtn_Click);
+            // 
+            // serBtn
+            // 
+            this.serBtn.AutoSize = true;
+            this.serBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.serBtn.Location = new System.Drawing.Point(197, 397);
+            this.serBtn.Margin = new System.Windows.Forms.Padding(2);
+            this.serBtn.Name = "serBtn";
+            this.serBtn.Size = new System.Drawing.Size(108, 25);
+            this.serBtn.TabIndex = 230;
+            this.serBtn.TabStop = true;
+            this.serBtn.Text = "单台序列号";
+            this.serBtn.UseVisualStyleBackColor = true;
+            this.serBtn.Click += new System.EventHandler(this.serBtn_Click);
+            // 
+            // palletBtn
+            // 
+            this.palletBtn.AutoSize = true;
+            this.palletBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.palletBtn.Location = new System.Drawing.Point(28, 397);
+            this.palletBtn.Margin = new System.Windows.Forms.Padding(2);
+            this.palletBtn.Name = "palletBtn";
+            this.palletBtn.Size = new System.Drawing.Size(76, 25);
+            this.palletBtn.TabIndex = 229;
+            this.palletBtn.TabStop = true;
+            this.palletBtn.Text = "栈板号";
+            this.palletBtn.UseVisualStyleBackColor = true;
+            this.palletBtn.Click += new System.EventHandler(this.serBtn_Click);
+            // 
+            // 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(24, 447);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(58, 21);
+            this.label1.TabIndex = 234;
+            this.label1.Text = "采集框";
+            // 
+            // 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(333, 378);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(343, 94);
+            this.OperateResult.TabIndex = 235;
+            this.OperateResult.Text = "";
+            // 
+            // Warehouse_ProductMakeIn
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(700, 499);
+            this.Controls.Add(this.OperateResult);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.cancel);
+            this.Controls.Add(this.input);
+            this.Controls.Add(this.bigboxBtn);
+            this.Controls.Add(this.serBtn);
+            this.Controls.Add(this.palletBtn);
+            this.Controls.Add(this.getqty);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.InOutDetailDGV);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "Warehouse_ProductMakeIn";
+            this.Tag = "Warehouse!ProductMakeIn";
+            this.Text = "完工入库";
+            this.Load += new System.EventHandler(this.Warehouse_ProductMakeIn_Load);
+            this.SizeChanged += new System.EventHandler(this.Warehouse_ProductMakeIn_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).EndInit();
+            this.ResumeLayout(true);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private CustomControl.DataGrid_View.DataGridViewWithSerialNum InOutDetailDGV;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pim_outboxcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pim_mac;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pim_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
+        private CustomControl.ValueLabel.ValueLabel getqty;
+        private System.Windows.Forms.Label label8;
+        private CustomControl.CustomCheckBox.CustomCheckBox cancel;
+        private System.Windows.Forms.TextBox input;
+        private System.Windows.Forms.RadioButton bigboxBtn;
+        private System.Windows.Forms.RadioButton serBtn;
+        private System.Windows.Forms.RadioButton palletBtn;
+        private System.Windows.Forms.Label label1;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+    }
+}

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.cs

@@ -0,0 +1,437 @@
+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.Warehouse
+{
+    public partial class Warehouse_ProductMakeIn : Form
+    {
+
+        DataTable dbfind;
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        DataTable dt;
+
+        DataHelper dh;
+
+        DataTable dta;
+
+        DataTable dtpi;
+
+        DataTable dtform;
+
+        DataTable dtms;
+
+        int getcount;
+
+        public Warehouse_ProductMakeIn()
+        {
+            InitializeComponent();
+        }
+
+        private void input_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (input.Text == "")
+                {
+                    OperateResult.AppendText("录入信息不能为空\n", Color.Red, input);
+                    return;
+                }
+                if (!cancel.Checked)
+                {
+                    if (palletBtn.Checked)
+                    {
+                        sql.Clear();
+                        sql.Append("select pa_id,pa_outboxcode,pa_status,nvl(pa_downstatus,0)pa_downstatus,pa_makecode,");
+                        sql.Append("pa_outno,nvl(pa_iostatus,0) pa_iostatus from package where pa_outboxcode='" + input.Text + "' and pa_type=3");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            string pa_downstatus = dt.Rows[0]["pa_downstatus"].ToString();
+                            string pa_iostatus = dt.Rows[0]["pa_iostatus"].ToString();
+                            string pa_status = dt.Rows[0]["pa_status"].ToString();
+                            string pa_outno = dt.Rows[0]["pa_outno"].ToString();
+                            string pa_id = dt.Rows[0]["pa_id"].ToString();
+                            string pa_makecode = dt.Rows[0]["pa_makecode"].ToString();
+                            if (!CheckStatus(pa_downstatus, pa_status, pa_iostatus, pa_outno, "栈板"))
+                                return;
+                            insertprodiomac(pa_id, pa_makecode, "PALLET");
+                            OperateResult.AppendText("栈板" + input.Text + "完工入库成功\n", Color.Green);
+                        }
+                        else
+                        {
+                            OperateResult.AppendText("栈板号" + input.Text + "不存在,重新输入栈板号\n", Color.Red, input);
+                            return;
+                        }
+                    }
+                    else if (bigboxBtn.Checked)
+                    {
+                        sql.Clear();
+                        sql.Append("select pa_id,pa_outboxcode,pa_status,nvl(pa_downstatus,0)pa_downstatus,pa_makecode,");
+                        sql.Append("pa_outno,pa_mothercode,nvl(pa_iostatus,0) pa_iostatus  from package where pa_outboxcode='" + input.Text + "' and pa_type in (1,2)");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            string pa_mothercode = dt.Rows[0]["pa_mothercode"].ToString();
+                            string pa_downstatus = dt.Rows[0]["pa_downstatus"].ToString();
+                            string pa_iostatus = dt.Rows[0]["pa_iostatus"].ToString();
+                            string pa_status = dt.Rows[0]["pa_status"].ToString();
+                            string pa_outno = dt.Rows[0]["pa_outno"].ToString();
+                            string pa_id = dt.Rows[0]["pa_id"].ToString();
+                            string pa_makecode = dt.Rows[0]["pa_makecode"].ToString();
+                            if (pa_mothercode != "")
+                            {
+                                OperateResult.AppendText("箱号" + input.Text + "已经装大箱或者栈板" + pa_mothercode + "，不允许单独操作\n", Color.Red, input);
+                                return;
+                            }
+                            if (!CheckStatus(pa_downstatus, pa_status, pa_iostatus, pa_outno, "大箱"))
+                                return;
+                            insertprodiomac(pa_id, pa_makecode, "BOX");
+                            OperateResult.AppendText("箱号" + input.Text + "完工入库成功\n", Color.Green);
+                        }
+                        else
+                        {
+                            OperateResult.AppendText("箱号" + input.Text + "不存在,重新输入箱号\n", Color.Red, input);
+                            return;
+                        }
+                    }
+                    else if (serBtn.Checked)
+                    {
+                        string ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id)ms_id", "ms_sncode='" + input.Text + "'").ToString();
+                        if (ms_id == "")
+                        {
+                            OperateResult.AppendText("序列号" + input.Text + "不存在,请重新输入\n", Color.Red, input);
+                            return;
+                        }
+                        else
+                        {
+                            sql.Clear();
+                            sql.Append("select ms_status,nvl(ms_downstatus,0)ms_downstatus,ms_outboxcode,ms_makecode,nvl(ms_iostatus,0)ms_iostatus,ms_prodcode,ms_outno from makeserial  where ms_id='" + ms_id + "'");
+                            dtms = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            string ms_downstatus = dtms.Rows[0]["ms_downstatus"].ToString();
+                            string ms_status = dtms.Rows[0]["ms_status"].ToString();
+                            string ms_outboxcode = dtms.Rows[0]["ms_outboxcode"].ToString();
+                            string ms_iostatus = dtms.Rows[0]["ms_iostatus"].ToString();
+                            string ms_outno = dtms.Rows[0]["ms_outno"].ToString();
+                            string ms_prodcode = dtms.Rows[0]["ms_prodcode"].ToString();
+                            string ms_makecode = dtms.Rows[0]["ms_makecode"].ToString();
+                            if (ms_status != "2")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "未完工,不允许出货\n", Color.Red, input);
+                                return;
+                            }
+                            if (ms_outboxcode != "")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "有外箱号" + ms_outboxcode + ",不允许单独操作\n", Color.Red, input);
+                                return;
+                            }
+                            if (ms_downstatus != "0")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "处于下地状态，不允许出货\n", Color.Red, input);
+                                return;
+                            }
+                            if (ms_iostatus == "1")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "已经入库,不允许重复入库\n", Color.Red, input);
+                                return;
+                            }
+                            if (ms_iostatus == "2")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "已经出库,出库单号:" + ms_outno + "\n", Color.Red, input);
+                                return;
+                            }
+                            if (ms_iostatus == "3")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "处于售后退货状态\n", Color.Red, input);
+                                return;
+                            }
+                            sql.Clear();
+                            sql.Append("insert into prodiomac(pim_id,pim_prodcode,pim_mac,pim_indate,pim_inman,pim_type,pim_inorout,pim_class) ");
+                            sql.Append("values(prodiomac_seq.nextval,'" + ms_prodcode + "','" + input.Text + "',sysdate,'" + User.UserCode + "',' ','IN','完工入库')");
+                            dh.ExecuteSql(sql.GetString(), "insert");
+                            dh.UpdateByCondition("makeserial", "ms_iostatus=1", " ms_id='" + ms_id + "'");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "序列号" + input.Text + "完工入库", "序列号" + input.Text + "完工入库成功", "序列号" + input.Text + "", "");
+                            OperateResult.AppendText("序列号" + input.Text + "完工入库成功\n", Color.Green);
+                        }
+                    }
+                    else
+                    {
+                        OperateResult.AppendText("未选择录入数据类型\n", Color.Red, input);
+                        return;
+                    }
+                }
+                else
+                {
+                    if (palletBtn.Checked)
+                    {
+                        sql.Clear();
+                        sql.Append("select pa_id,pa_outboxcode,pa_status,nvl(pa_downstatus,0)pa_downstatus,pa_makecode,");
+                        sql.Append("pa_outno,nvl(pa_iostatus,0) pa_iostatus from package where pa_outboxcode='" + input.Text + "' and pa_type=3");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            string pa_downstatus = dt.Rows[0]["pa_downstatus"].ToString();
+                            string pa_iostatus = dt.Rows[0]["pa_iostatus"].ToString();
+                            string pa_status = dt.Rows[0]["pa_status"].ToString();
+                            string pa_outno = dt.Rows[0]["pa_outno"].ToString();
+                            string pa_id = dt.Rows[0]["pa_id"].ToString();
+                            string pa_makecode = dt.Rows[0]["pa_makecode"].ToString();
+                            if (pa_iostatus != "1")
+                            {
+                                OperateResult.AppendText("栈板号" + input.Text + "不是在库状态，无需取消完工入库\n", Color.Red, input);
+                                return;
+                            }
+                            if (pa_outno != "")
+                            {
+                                OperateResult.AppendText("栈板号" + input.Text + "已被出货单单号:" + pa_outno + "锁定\n", Color.Red, input);
+                                return;
+                            }
+                            deleteprodiomac(pa_id, pa_makecode, "PALLET");
+                            OperateResult.AppendText("栈板" + input.Text + "取消完工入库成功\n", Color.Green);
+                        }
+                        else
+                        {
+                            OperateResult.AppendText("栈板号" + input.Text + "不存在,重新输入栈板号\n", Color.Red, input);
+                            return;
+                        }
+                    }
+                    else if (bigboxBtn.Checked)
+                    {
+                        sql.Clear();
+                        sql.Append("select pa_id,pa_outboxcode,pa_status,nvl(pa_downstatus,0)pa_downstatus,pa_makecode,");
+                        sql.Append("pa_outno,pa_mothercode,nvl(pa_iostatus,0) pa_iostatus  from package where pa_outboxcode='" + input.Text + "' and pa_type in (1,2)");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            string pa_mothercode = dt.Rows[0]["pa_mothercode"].ToString();
+                            string pa_downstatus = dt.Rows[0]["pa_downstatus"].ToString();
+                            string pa_iostatus = dt.Rows[0]["pa_iostatus"].ToString();
+                            string pa_status = dt.Rows[0]["pa_status"].ToString();
+                            string pa_outno = dt.Rows[0]["pa_outno"].ToString();
+                            string pa_id = dt.Rows[0]["pa_id"].ToString();
+                            string pa_makecode = dt.Rows[0]["pa_makecode"].ToString();
+                            if (pa_mothercode != "")
+                            {
+                                OperateResult.AppendText("箱号" + input.Text + "已经装大箱或者栈板" + pa_mothercode + "，不允许单独操作\n", Color.Red, input);
+                                return;
+                            }
+                            if (pa_iostatus != "1")
+                            {
+                                OperateResult.AppendText("箱号" + input.Text + "不是在库状态，无需取消完工入库\n", Color.Red, input);
+                                return;
+                            }
+                            if (pa_outno != "")
+                            {
+                                OperateResult.AppendText("箱号" + input.Text + "已被出货单单号:" + pa_outno + "锁定\n", Color.Red, input);
+                                return;
+                            }
+                            deleteprodiomac(pa_id, pa_makecode, "BOX");
+                            OperateResult.AppendText("箱号" + input.Text + "取消完工入库成功\n", Color.Green);
+                        }
+                        else
+                        {
+                            OperateResult.AppendText("箱号" + input.Text + "不存在,重新输入箱号\n", Color.Red, input);
+                            return;
+                        }
+                    }
+                    else if (serBtn.Checked)
+                    {
+                        string ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id)ms_id", "ms_sncode='" + input.Text + "'").ToString();
+                        if (ms_id == "")
+                        {
+                            OperateResult.AppendText("序列号" + input.Text + "不存在,请重新输入\n", Color.Red, input);
+                            return;
+                        }
+                        else
+                        {
+                            sql.Clear();
+                            sql.Append("select ms_status,nvl(ms_downstatus,0)ms_downstatus,ms_outboxcode,ms_makecode,nvl(ms_iostatus,0)ms_iostatus,ms_prodcode,ms_outno from makeserial  where ms_id='" + ms_id + "'");
+                            dtms = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            string ms_downstatus = dtms.Rows[0]["ms_downstatus"].ToString();
+                            string ms_status = dtms.Rows[0]["ms_status"].ToString();
+                            string ms_outboxcode = dtms.Rows[0]["ms_outboxcode"].ToString();
+                            string ms_iostatus = dtms.Rows[0]["ms_iostatus"].ToString();
+                            string ms_outno = dtms.Rows[0]["ms_outno"].ToString();
+                            string ms_prodcode = dtms.Rows[0]["ms_prodcode"].ToString();
+                            string ms_makecode = dtms.Rows[0]["ms_makecode"].ToString();
+                            if (ms_outboxcode != "")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "有外箱号" + ms_outboxcode + ",不允许单独操作\n", Color.Red, input);
+                                return;
+                            }
+                            if (ms_outno != "")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "已被出货单单号:" + ms_outno + "锁定\n", Color.Red, input);
+                                return;
+                            }
+                            if (ms_iostatus != "1")
+                            {
+                                OperateResult.AppendText("序列号" + input.Text + "不是在库状态，无需取消完工入库\n", Color.Red, input);
+                                return;
+                            }
+                            sql.Clear();
+                            sql.Append("delete from prodiomac where pim_id =(select max(pim_id) from prodiomac where ");
+                            sql.Append(" pim_mac='" + input.Text + "' and pim_inorout='IN' AND pim_class='完工入库' )");
+                            dh.ExecuteSql(sql.GetString(), "delete");
+                            dh.UpdateByCondition("makeserial", "ms_iostatus=0", " ms_id='" + ms_id + "'");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "序列号" + input.Text + "取消完工入库", "序列号" + input.Text + "取消完工入库成功", "序列号" + input.Text + "", "");
+                            OperateResult.AppendText("序列号" + input.Text + "取消完工入库成功\n", Color.Green);
+                        }
+                    }
+                    else
+                    {
+                        OperateResult.AppendText("未选择录入数据类型\n", Color.Red, input);
+                        return;
+                    }
+                }
+                getqty.Text = (++getcount).ToString();
+                LoadGridData();
+            }
+        }
+
+        private Boolean CheckStatus(string pa_downstatus, string pa_status, string pa_iostatus, string pa_outno, string type)
+        {
+            if (pa_status == "0")
+            {
+                OperateResult.AppendText(type + "号" + input.Text + "未封装\n", Color.Red, input);
+                return false;
+            }
+            if (pa_downstatus != "0")
+            {
+                OperateResult.AppendText(type + "号" + input.Text + "处于下地状态，如需完工入库，请先取消下地\n", Color.Red, input);
+                return false;
+            }
+            if (pa_iostatus == "1")
+            {
+                OperateResult.AppendText(type + "号" + input.Text + "已经入库,不允许重复入库\n", Color.Red, input);
+                return false;
+            }
+            if (pa_iostatus == "2")
+            {
+                OperateResult.AppendText(type + "号" + input.Text + "已经出库,出库单号:" + pa_outno + "\n", Color.Red, input);
+                return false;
+            }
+            if (pa_iostatus == "3")
+            {
+                OperateResult.AppendText(type + "号" + input.Text + "处于售后退货状态\n", Color.Red, input);
+                return false;
+            }
+            sql.Clear();
+            sql.Append("select wm_concat(v_barcode)data,count(1)cn from mes_package_view left join ");
+            sql.Append("makeserial on ms_sncode=v_barcode and ms_makecode=v_makecode ");
+            sql.Append("where v_outboxcode='" + input.Text + "' and nvl(ms_status,0)<>2 and rownum<20");
+            dta = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            string CN = dta.Rows[0]["CN"].ToString();
+            string DATA = dta.Rows[0]["DATA"].ToString();
+            if (int.Parse(CN) > 0)
+            {
+                OperateResult.AppendText(type + "号" + input.Text + "内的序列号尚未完工，不允许进行完工入库，序列号:" + DATA + "\n", Color.Red, input);
+                return false;
+            }
+            return true;
+        }
+
+
+        private void insertprodiomac(string pa_id, string pa_makecode, string type)
+        {
+            sql.Clear();
+            sql.Append("insert into prodiomac(pim_id,pim_prodcode,pim_mac,pim_indate,pim_inman,pim_type,pim_outboxcode,pim_inorout,pim_class) ");
+            sql.Append("select prodiomac_seq.nextval,v_prodcode,v_barcode,sysdate,'" + User.UserCode + "','" + type + "','" + input.Text + "','IN','完工入库'  from mes_package_view where v_outboxcode='" + input.Text + "'");
+            dh.ExecuteSql(sql.GetString(), "update");
+            dh.UpdateByCondition("package", "pa_iostatus=1", "pa_id='" + pa_id + "'");
+            if (type == "BOX")
+            {
+                type = "箱";
+            }
+            else
+                type = "栈板";
+
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, type + "号" + input.Text + "完工入库", type + "号" + input.Text + "完工入库成功", "", type + "号" + input.Text + "");
+            return;
+        }
+
+
+        /// <summary>
+        /// 加载Grid数据
+        /// </summary>
+        private void LoadGridData()
+        {
+            if (palletBtn.Checked || bigboxBtn.Checked)
+            {
+                sql.Clear();
+                sql.Append("select pim_outboxcode,pim_mac,pim_prodcode,pr_detail,pr_spec from prodiomac ");
+                sql.Append("left join product on pr_code=pim_prodcode where pim_outboxcode='" + input.Text + "'");
+                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                BaseUtil.FillDgvWithDataTable(InOutDetailDGV, dt);
+            }
+            else
+            {
+                sql.Clear();
+                sql.Append("select pim_outboxcode,pim_mac,pim_prodcode,pr_detail,pr_spec from prodiomac ");
+                sql.Append("left join product on pr_code=pim_prodcode where pim_mac='" + input.Text + "'");
+                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                BaseUtil.FillDgvWithDataTable(InOutDetailDGV, dt);
+            }
+        }
+
+
+        private void deleteprodiomac(string pa_id, string pa_makecode, string type)
+        {
+            sql.Clear();
+            sql.Append("delete from prodiomac where pim_id in (select pim_id from prodiomac where ");
+            sql.Append(" pim_outboxcode='" + input.Text + "' and pim_type='" + type + "' and pim_inorout='IN' AND pim_class='完工入库' )");
+            dh.ExecuteSql(sql.GetString(), "delete");
+            dh.UpdateByCondition("package", "pa_iostatus=0", "pa_id='" + pa_id + "'");
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, type + "号" + input.Text + "取消完工入库", type + "号" + input.Text + "取消完工入库成功", "", type + "号" + input.Text + "");
+            return;
+        }
+
+        private void Warehouse_ProductMakeIn_Load(object sender, EventArgs e)
+        {
+            dh = new DataHelper();
+
+            asc.controllInitializeSize(this);
+            getcount = 0;
+            getqty.Text = getcount.ToString();
+        }
+
+        private void Warehouse_ProductMakeIn_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void serBtn_Click(object sender, EventArgs e)
+        {
+            if (((RadioButton)sender).Checked == true)
+            {
+                if (((RadioButton)sender).Name == "serBtn")
+                {
+                    input.Focus();
+                    OperateResult.AppendText("请输入序列号进行采集\n", Color.Black, input);
+                }
+                else if (((RadioButton)sender).Name == "bigboxBtn")
+                {
+                    input.Focus();
+                    OperateResult.AppendText("请输入箱号进行采集\n", Color.Black, input);
+                }
+                else if (((RadioButton)sender).Name == "palletBtn")
+                {
+                    input.Focus();
+                    OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
+                }
+            }
+        }
+    }
+}

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.resx

@@ -0,0 +1,150 @@
+<?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>
+  <metadata name="pim_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pim_mac.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pim_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pim_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pim_mac.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pim_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>