完工品入库出库调整

UAS_MES_YD/FunctionCode/Make/Make_CollectBTMAC.Designer.cs

@@ -53,10 +53,10 @@
             // 
             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(612, 22);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(918, 35);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
             this.pr_detail_label.TabIndex = 206;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -66,10 +66,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(34, 517);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sncode_label.Location = new System.Drawing.Point(51, 827);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.sncode_label.Size = new System.Drawing.Size(114, 41);
             this.sncode_label.TabIndex = 205;
             this.sncode_label.Text = "录入框";
             // 
@@ -77,10 +77,10 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(306, 72);
-            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(459, 115);
+            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(114, 41);
             this.mcd_remainqty_label.TabIndex = 202;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -88,10 +88,10 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(36, 72);
-            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(54, 115);
+            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(146, 41);
             this.mcd_okqty_label.TabIndex = 201;
             this.mcd_okqty_label.Text = "采集计数";
             // 
@@ -99,10 +99,10 @@
             // 
             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(306, 22);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(459, 35);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             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(146, 41);
             this.pr_code_label.TabIndex = 200;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -110,22 +110,24 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(36, 22);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Location = new System.Drawing.Point(54, 35);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
+            this.ms_makecode_label.Size = new System.Drawing.Size(146, 41);
             this.ms_makecode_label.TabIndex = 199;
             this.ms_makecode_label.Text = "工单编号";
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(617, 70);
+            this.StepCount.Location = new System.Drawing.Point(926, 112);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(106, 28);
+            this.StepCount.Size = new System.Drawing.Size(159, 45);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 214;
+            this.StepCount.Load += new System.EventHandler(this.StepCount_Load);
             // 
             // DeleteButton
             // 
@@ -134,13 +136,13 @@
             this.DeleteButton.DownImage = ((System.Drawing.Image)(resources.GetObject("DeleteButton.DownImage")));
             this.DeleteButton.Image = null;
             this.DeleteButton.IsShowBorder = true;
-            this.DeleteButton.Location = new System.Drawing.Point(397, 517);
-            this.DeleteButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.DeleteButton.Location = new System.Drawing.Point(596, 827);
+            this.DeleteButton.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.DeleteButton.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteButton.MoveImage")));
             this.DeleteButton.Name = "DeleteButton";
             this.DeleteButton.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteButton.NormalImage")));
             this.DeleteButton.Power = null;
-            this.DeleteButton.Size = new System.Drawing.Size(80, 30);
+            this.DeleteButton.Size = new System.Drawing.Size(120, 48);
             this.DeleteButton.TabIndex = 213;
             this.DeleteButton.Text = "取消";
             this.DeleteButton.UseVisualStyleBackColor = false;
@@ -151,20 +153,21 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(142, 22);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(267, 0);
+            this.ms_makecode.Location = new System.Drawing.Point(213, 35);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(400, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 41);
             this.ms_makecode.TabIndex = 212;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(418, 72);
-            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.Location = new System.Drawing.Point(627, 115);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
+            this.mcd_remainqty.Size = new System.Drawing.Size(37, 41);
             this.mcd_remainqty.TabIndex = 210;
             this.mcd_remainqty.Text = "0";
             // 
@@ -172,10 +175,10 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(142, 72);
-            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty.Location = new System.Drawing.Point(213, 115);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
+            this.mcd_okqty.Size = new System.Drawing.Size(37, 41);
             this.mcd_okqty.TabIndex = 209;
             this.mcd_okqty.Text = "0";
             // 
@@ -184,11 +187,11 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(418, 27);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(267, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(627, 43);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(400, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 41);
             this.ma_prodcode.TabIndex = 208;
             // 
             // pr_detail
@@ -196,11 +199,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(725, 22);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(267, 0);
+            this.pr_detail.Location = new System.Drawing.Point(1088, 35);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(400, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 27);
+            this.pr_detail.Size = new System.Drawing.Size(0, 41);
             this.pr_detail.TabIndex = 207;
             // 
             // sncode
@@ -210,11 +213,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(117, 520);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.sncode.Location = new System.Drawing.Point(176, 832);
+            this.sncode.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(260, 25);
+            this.sncode.Size = new System.Drawing.Size(388, 35);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -225,10 +228,10 @@
             // 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(16, 122);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.OperateResult.Location = new System.Drawing.Point(24, 195);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(704, 381);
+            this.OperateResult.Size = new System.Drawing.Size(1054, 607);
             this.OperateResult.TabIndex = 203;
             this.OperateResult.Text = "";
             // 
@@ -238,10 +241,10 @@
             this.CollectRemark.Checked = true;
             this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.CollectRemark.Location = new System.Drawing.Point(733, 127);
-            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Location = new System.Drawing.Point(1100, 203);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.CollectRemark.Name = "CollectRemark";
-            this.CollectRemark.Size = new System.Drawing.Size(100, 27);
+            this.CollectRemark.Size = new System.Drawing.Size(155, 39);
             this.CollectRemark.TabIndex = 216;
             this.CollectRemark.Text = "采集备注";
             this.CollectRemark.UseVisualStyleBackColor = true;
@@ -249,18 +252,18 @@
             // Remark
             // 
             this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Remark.Location = new System.Drawing.Point(728, 161);
-            this.Remark.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Remark.Location = new System.Drawing.Point(1092, 258);
+            this.Remark.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(245, 99);
+            this.Remark.Size = new System.Drawing.Size(366, 156);
             this.Remark.TabIndex = 215;
             this.Remark.Text = "";
             // 
             // Make_CollectBTMAC
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(987, 560);
+            this.ClientSize = new System.Drawing.Size(1480, 896);
             this.Controls.Add(this.CollectRemark);
             this.Controls.Add(this.Remark);
             this.Controls.Add(this.StepCount);
@@ -279,14 +282,14 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             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(4, 3, 4, 3);
             this.Name = "Make_CollectBTMAC";
             this.Tag = "Make!CollectBTMAC";
             this.Text = "BT/MAC采集";
             this.Activated += new System.EventHandler(this.Make_CollectBTMAC_Activated);
             this.Load += new System.EventHandler(this.Make_CollectBTMAC_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectBTMAC_SizeChanged);
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -388,5 +388,10 @@ namespace UAS_MES_NEW.Make
                 }
             }
         }
+
+        private void StepCount_Load(object sender, EventArgs e)
+        {
+
+        }
     }
 }

UAS_MES_YD/FunctionCode/Make/Make_FeedingCollection.cs

@@ -426,6 +426,42 @@ namespace UAS_MES_NEW.Make
                         case "10":
                             t[1] = 0X10;
                             break;
+                        case "11":
+                            t[1] = 0X11;
+                            break;
+                        case "0A":
+                            t[1] = 0X0A;
+                            break;
+                        case "12":
+                            t[1] = 0X12;
+                            break;
+                        case "13":
+                            t[1] = 0X13;
+                            break;
+                        case "14":
+                            t[1] = 0X14;
+                            break;
+                        case "15":
+                            t[1] = 0X15;
+                            break;
+                        case "16":
+                            t[1] = 0X16;
+                            break;
+                        case "17":
+                            t[1] = 0X17;
+                            break;
+                        case "18":
+                            t[1] = 0X18;
+                            break;
+                        case "19":
+                            t[1] = 0X19;
+                            break;
+                        case "1A":
+                            t[1] = 0X1A;
+                            break;
+                        case "1B":
+                            t[1] = 0X1B;
+                            break;
                         default:
                             break;
                     }

UAS_MES_YD/FunctionCode/Packing/Packing_PackageCollectionWeigh_HUAGUAN.Designer.cs

@@ -1231,13 +1231,13 @@
             this.Load += new System.EventHandler(this.Make_PackageCollectionWeigh_Load);
             this.SizeChanged += new System.EventHandler(this.Make_PackageCollectionWeigh_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).EndInit();
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
-            this.groupBoxWithBorder2.ResumeLayout(false);
+            this.groupBoxWithBorder2.ResumeLayout(true);
             this.groupBoxWithBorder2.PerformLayout();
-            this.groupBoxWithBorder3.ResumeLayout(false);
+            this.groupBoxWithBorder3.ResumeLayout(true);
             this.groupBoxWithBorder3.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_PalletCollection.cs

@@ -447,7 +447,7 @@ namespace UAS_MES_NEW.Packing
                 if (Delete == "Yes")
                 {
                     sql.Clear();
-                    sql.Append("select nvl(pa_iostatus,0) pa_iostatus,pa_outno from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                    sql.Append("select nvl(pa_iostatus,0) pa_iostatus,pa_outno from package where pa_outboxcode='" + pa_outboxcode.Text + "' and pa_type=2");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count > 0)
                     {
@@ -462,6 +462,11 @@ namespace UAS_MES_NEW.Packing
                             return;
                         }
                     }
+                    else
+                    {
+                        OperateResult.AppendText(">>" + pa_outboxcode.Text + "不属于栈板类型，不允许拆解\n", Color.Red);
+                        return;
+                    }
                     //如果含有下一执行步骤的撤销过站，否则直接删除
                     if (dh.getFieldDataByCondition("package", "pa_nextstep", "pa_mothercode='" + pa_outboxcode.Text + "'").ToString() != "")
                         LogicHandler.OutBoxDrawStepPass(pa_outboxcode.Text, pa_makecode.Text, User.UserSourceCode);

UAS_MES_YD/FunctionCode/Warehouse/Warehouse_FinishedProductOut.Designer.cs

@@ -77,9 +77,10 @@
             // 
             this.pi_inoutno_label.AutoSize = true;
             this.pi_inoutno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_inoutno_label.Location = new System.Drawing.Point(5, 20);
+            this.pi_inoutno_label.Location = new System.Drawing.Point(10, 40);
+            this.pi_inoutno_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_inoutno_label.Name = "pi_inoutno_label";
-            this.pi_inoutno_label.Size = new System.Drawing.Size(74, 21);
+            this.pi_inoutno_label.Size = new System.Drawing.Size(146, 41);
             this.pi_inoutno_label.TabIndex = 211;
             this.pi_inoutno_label.Text = "出货单号";
             // 
@@ -87,9 +88,10 @@
             // 
             this.pi_titile_label.AutoSize = true;
             this.pi_titile_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_titile_label.Location = new System.Drawing.Point(252, 20);
+            this.pi_titile_label.Location = new System.Drawing.Point(504, 40);
+            this.pi_titile_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_titile_label.Name = "pi_titile_label";
-            this.pi_titile_label.Size = new System.Drawing.Size(74, 21);
+            this.pi_titile_label.Size = new System.Drawing.Size(146, 41);
             this.pi_titile_label.TabIndex = 212;
             this.pi_titile_label.Text = "客户名称";
             // 
@@ -97,9 +99,10 @@
             // 
             this.pi_title.AutoSize = true;
             this.pi_title.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_title.Location = new System.Drawing.Point(326, 23);
+            this.pi_title.Location = new System.Drawing.Point(652, 46);
+            this.pi_title.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_title.Name = "pi_title";
-            this.pi_title.Size = new System.Drawing.Size(0, 17);
+            this.pi_title.Size = new System.Drawing.Size(0, 31);
             this.pi_title.TabIndex = 213;
             // 
             // panel1
@@ -115,10 +118,10 @@
             this.panel1.Controls.Add(this.label8);
             this.panel1.Controls.Add(this.label6);
             this.panel1.Controls.Add(this.label4);
-            this.panel1.Location = new System.Drawing.Point(563, 66);
-            this.panel1.Margin = new System.Windows.Forms.Padding(2);
+            this.panel1.Location = new System.Drawing.Point(1126, 132);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(169, 195);
+            this.panel1.Size = new System.Drawing.Size(336, 388);
             this.panel1.TabIndex = 217;
             // 
             // datacount
@@ -126,19 +129,21 @@
             this.datacount.AutoSize = true;
             this.datacount.CutLength = null;
             this.datacount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.datacount.Location = new System.Drawing.Point(95, 155);
-            this.datacount.MaximumSize = new System.Drawing.Size(200, 0);
+            this.datacount.Location = new System.Drawing.Point(190, 310);
+            this.datacount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.datacount.MaximumSize = new System.Drawing.Size(400, 0);
             this.datacount.Name = "datacount";
-            this.datacount.Size = new System.Drawing.Size(0, 21);
+            this.datacount.Size = new System.Drawing.Size(0, 41);
             this.datacount.TabIndex = 230;
             // 
             // Label
             // 
             this.Label.AutoSize = true;
             this.Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Label.Location = new System.Drawing.Point(9, 155);
+            this.Label.Location = new System.Drawing.Point(18, 310);
+            this.Label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Label.Name = "Label";
-            this.Label.Size = new System.Drawing.Size(74, 21);
+            this.Label.Size = new System.Drawing.Size(146, 41);
             this.Label.TabIndex = 229;
             this.Label.Text = "当前明细";
             // 
@@ -147,10 +152,11 @@
             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(95, 120);
-            this.boxqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.boxqty.Location = new System.Drawing.Point(190, 240);
+            this.boxqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.boxqty.MaximumSize = new System.Drawing.Size(400, 0);
             this.boxqty.Name = "boxqty";
-            this.boxqty.Size = new System.Drawing.Size(0, 21);
+            this.boxqty.Size = new System.Drawing.Size(0, 41);
             this.boxqty.TabIndex = 227;
             // 
             // getqty
@@ -158,10 +164,11 @@
             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(95, 84);
-            this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.getqty.Location = new System.Drawing.Point(190, 168);
+            this.getqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.getqty.MaximumSize = new System.Drawing.Size(400, 0);
             this.getqty.Name = "getqty";
-            this.getqty.Size = new System.Drawing.Size(0, 21);
+            this.getqty.Size = new System.Drawing.Size(0, 41);
             this.getqty.TabIndex = 226;
             // 
             // ungetqty
@@ -169,10 +176,11 @@
             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(95, 44);
-            this.ungetqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ungetqty.Location = new System.Drawing.Point(190, 88);
+            this.ungetqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ungetqty.MaximumSize = new System.Drawing.Size(400, 0);
             this.ungetqty.Name = "ungetqty";
-            this.ungetqty.Size = new System.Drawing.Size(0, 21);
+            this.ungetqty.Size = new System.Drawing.Size(0, 41);
             this.ungetqty.TabIndex = 225;
             // 
             // outqty
@@ -180,19 +188,21 @@
             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(95, 11);
-            this.outqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.outqty.Location = new System.Drawing.Point(190, 22);
+            this.outqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.outqty.MaximumSize = new System.Drawing.Size(400, 0);
             this.outqty.Name = "outqty";
-            this.outqty.Size = new System.Drawing.Size(0, 21);
+            this.outqty.Size = new System.Drawing.Size(0, 41);
             this.outqty.TabIndex = 224;
             // 
             // label10
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(9, 120);
+            this.label10.Location = new System.Drawing.Point(18, 240);
+            this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(58, 21);
+            this.label10.Size = new System.Drawing.Size(114, 41);
             this.label10.TabIndex = 222;
             this.label10.Text = "总箱数";
             // 
@@ -200,9 +210,10 @@
             // 
             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(9, 84);
+            this.label8.Location = new System.Drawing.Point(18, 168);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(74, 21);
+            this.label8.Size = new System.Drawing.Size(146, 41);
             this.label8.TabIndex = 220;
             this.label8.Text = "已采集数";
             // 
@@ -210,9 +221,10 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(9, 44);
+            this.label6.Location = new System.Drawing.Point(18, 88);
+            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(74, 21);
+            this.label6.Size = new System.Drawing.Size(146, 41);
             this.label6.TabIndex = 218;
             this.label6.Text = "待采集数";
             // 
@@ -220,9 +232,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(9, 11);
+            this.label4.Location = new System.Drawing.Point(18, 22);
+            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 21);
+            this.label4.Size = new System.Drawing.Size(146, 41);
             this.label4.TabIndex = 218;
             this.label4.Text = "出货数量";
             // 
@@ -231,10 +244,10 @@
             this.palletBtn.AutoSize = true;
             this.palletBtn.Checked = 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(14, 427);
-            this.palletBtn.Margin = new System.Windows.Forms.Padding(2);
+            this.palletBtn.Location = new System.Drawing.Point(28, 854);
+            this.palletBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.palletBtn.Name = "palletBtn";
-            this.palletBtn.Size = new System.Drawing.Size(76, 25);
+            this.palletBtn.Size = new System.Drawing.Size(145, 45);
             this.palletBtn.TabIndex = 219;
             this.palletBtn.TabStop = true;
             this.palletBtn.Text = "栈板号";
@@ -245,10 +258,10 @@
             // 
             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(183, 427);
-            this.serBtn.Margin = new System.Windows.Forms.Padding(2);
+            this.serBtn.Location = new System.Drawing.Point(366, 854);
+            this.serBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.serBtn.Name = "serBtn";
-            this.serBtn.Size = new System.Drawing.Size(108, 25);
+            this.serBtn.Size = new System.Drawing.Size(209, 45);
             this.serBtn.TabIndex = 220;
             this.serBtn.Text = "单台序列号";
             this.serBtn.UseVisualStyleBackColor = true;
@@ -258,10 +271,10 @@
             // 
             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(97, 427);
-            this.bigboxBtn.Margin = new System.Windows.Forms.Padding(2);
+            this.bigboxBtn.Location = new System.Drawing.Point(194, 854);
+            this.bigboxBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bigboxBtn.Name = "bigboxBtn";
-            this.bigboxBtn.Size = new System.Drawing.Size(60, 25);
+            this.bigboxBtn.Size = new System.Drawing.Size(113, 45);
             this.bigboxBtn.TabIndex = 221;
             this.bigboxBtn.Text = "箱号";
             this.bigboxBtn.UseVisualStyleBackColor = true;
@@ -271,26 +284,29 @@
             // 
             this.pi_id.AutoSize = true;
             this.pi_id.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_id.Location = new System.Drawing.Point(460, 21);
+            this.pi_id.Location = new System.Drawing.Point(920, 42);
+            this.pi_id.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_id.Name = "pi_id";
-            this.pi_id.Size = new System.Drawing.Size(0, 21);
+            this.pi_id.Size = new System.Drawing.Size(0, 41);
             this.pi_id.TabIndex = 229;
             this.pi_id.Visible = false;
             // 
             // pi_type
             // 
             this.pi_type.AutoSize = true;
-            this.pi_type.Location = new System.Drawing.Point(235, 48);
+            this.pi_type.Location = new System.Drawing.Point(470, 96);
+            this.pi_type.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_type.Name = "pi_type";
-            this.pi_type.Size = new System.Drawing.Size(0, 12);
+            this.pi_type.Size = new System.Drawing.Size(0, 24);
             this.pi_type.TabIndex = 230;
             this.pi_type.Visible = false;
             // 
             // Search
             // 
-            this.Search.Location = new System.Drawing.Point(203, 51);
+            this.Search.Location = new System.Drawing.Point(406, 102);
+            this.Search.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Search.Name = "Search";
-            this.Search.Size = new System.Drawing.Size(68, 21);
+            this.Search.Size = new System.Drawing.Size(136, 42);
             this.Search.TabIndex = 239;
             this.Search.Text = "查询";
             this.Search.UseVisualStyleBackColor = true;
@@ -299,32 +315,35 @@
             // pallecode
             // 
             this.pallecode.BackColor = System.Drawing.Color.Transparent;
-            this.pallecode.Location = new System.Drawing.Point(9, 51);
+            this.pallecode.Location = new System.Drawing.Point(18, 102);
+            this.pallecode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.pallecode.Name = "pallecode";
             this.pallecode.PlaceHolder = "栈板/箱搜索";
-            this.pallecode.Size = new System.Drawing.Size(170, 28);
+            this.pallecode.Size = new System.Drawing.Size(340, 56);
             this.pallecode.TabIndex = 238;
             this.pallecode.UserControlTextChanged += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder.OnTextChange(this.pallecode_UserControlTextChanged);
             // 
             // 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(563, 266);
+            this.OperateResult.Location = new System.Drawing.Point(1126, 532);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(170, 245);
+            this.OperateResult.Size = new System.Drawing.Size(336, 486);
             this.OperateResult.TabIndex = 228;
             this.OperateResult.Text = "";
             // 
             // pi_type_check
             // 
+            this.pi_type_check.AllPower = null;
             this.pi_type_check.AutoSize = true;
             this.pi_type_check.Enabled = false;
             this.pi_type_check.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_type_check.Location = new System.Drawing.Point(453, 427);
-            this.pi_type_check.Margin = new System.Windows.Forms.Padding(2);
+            this.pi_type_check.Location = new System.Drawing.Point(906, 854);
+            this.pi_type_check.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pi_type_check.Name = "pi_type_check";
             this.pi_type_check.Power = null;
-            this.pi_type_check.Size = new System.Drawing.Size(109, 25);
+            this.pi_type_check.Size = new System.Drawing.Size(210, 45);
             this.pi_type_check.TabIndex = 225;
             this.pi_type_check.Text = "按订单出货";
             this.pi_type_check.UseVisualStyleBackColor = true;
@@ -337,13 +356,13 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(479, 475);
-            this.Clean.Margin = new System.Windows.Forms.Padding(2);
+            this.Clean.Location = new System.Drawing.Point(958, 950);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(74, 20);
+            this.Clean.Size = new System.Drawing.Size(148, 40);
             this.Clean.TabIndex = 224;
             this.Clean.Text = "取消采集";
             this.Clean.UseVisualStyleBackColor = false;
@@ -351,13 +370,14 @@
             // 
             // cancel
             // 
+            this.cancel.AllPower = null;
             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(150, 475);
-            this.cancel.Margin = new System.Windows.Forms.Padding(2);
+            this.cancel.Location = new System.Drawing.Point(300, 950);
+            this.cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cancel.Name = "cancel";
             this.cancel.Power = null;
-            this.cancel.Size = new System.Drawing.Size(61, 25);
+            this.cancel.Size = new System.Drawing.Size(114, 45);
             this.cancel.TabIndex = 223;
             this.cancel.Text = "取消";
             this.cancel.UseVisualStyleBackColor = true;
@@ -367,11 +387,11 @@
             this.input.AllPower = null;
             this.input.BackColor = System.Drawing.Color.White;
             this.input.ID = null;
-            this.input.Location = new System.Drawing.Point(9, 475);
-            this.input.Margin = new System.Windows.Forms.Padding(2);
+            this.input.Location = new System.Drawing.Point(18, 950);
+            this.input.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.input.Name = "input";
             this.input.Power = null;
-            this.input.Size = new System.Drawing.Size(125, 21);
+            this.input.Size = new System.Drawing.Size(246, 35);
             this.input.Str = null;
             this.input.Str1 = null;
             this.input.Str2 = null;
@@ -390,11 +410,12 @@
             this.pr_spec,
             this.blank});
             this.InOutDetailDGV.EnableContentClick = true;
-            this.InOutDetailDGV.Location = new System.Drawing.Point(9, 84);
-            this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(2);
+            this.InOutDetailDGV.Location = new System.Drawing.Point(18, 168);
+            this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.InOutDetailDGV.Name = "InOutDetailDGV";
+            this.InOutDetailDGV.RowHeadersWidth = 82;
             this.InOutDetailDGV.RowTemplate.Height = 27;
-            this.InOutDetailDGV.Size = new System.Drawing.Size(544, 339);
+            this.InOutDetailDGV.Size = new System.Drawing.Size(1088, 678);
             this.InOutDetailDGV.TabIndex = 218;
             this.InOutDetailDGV.DataSourceChanged += new System.EventHandler(this.InOutDetailDGV_DataSourceChanged);
             // 
@@ -411,22 +432,28 @@
             // 
             this.pim_mac.DataPropertyName = "pim_mac";
             this.pim_mac.HeaderText = "SN号";
+            this.pim_mac.MinimumWidth = 10;
             this.pim_mac.Name = "pim_mac";
             this.pim_mac.ReadOnly = true;
+            this.pim_mac.Width = 200;
             // 
             // pim_prodcode
             // 
             this.pim_prodcode.DataPropertyName = "pim_prodcode";
             this.pim_prodcode.HeaderText = "产品代码";
+            this.pim_prodcode.MinimumWidth = 10;
             this.pim_prodcode.Name = "pim_prodcode";
             this.pim_prodcode.ReadOnly = true;
+            this.pim_prodcode.Width = 200;
             // 
             // pr_detail
             // 
             this.pr_detail.DataPropertyName = "pr_detail";
             this.pr_detail.HeaderText = "名称";
+            this.pr_detail.MinimumWidth = 10;
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.ReadOnly = true;
+            this.pr_detail.Width = 200;
             // 
             // pr_spec
             // 
@@ -453,13 +480,13 @@
             this.ConfirmOut.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ConfirmOut.Image = null;
             this.ConfirmOut.IsShowBorder = true;
-            this.ConfirmOut.Location = new System.Drawing.Point(563, 20);
-            this.ConfirmOut.Margin = new System.Windows.Forms.Padding(2);
+            this.ConfirmOut.Location = new System.Drawing.Point(1126, 40);
+            this.ConfirmOut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ConfirmOut.MoveImage = ((System.Drawing.Image)(resources.GetObject("ConfirmOut.MoveImage")));
             this.ConfirmOut.Name = "ConfirmOut";
             this.ConfirmOut.NormalImage = ((System.Drawing.Image)(resources.GetObject("ConfirmOut.NormalImage")));
             this.ConfirmOut.Power = null;
-            this.ConfirmOut.Size = new System.Drawing.Size(75, 27);
+            this.ConfirmOut.Size = new System.Drawing.Size(150, 54);
             this.ConfirmOut.TabIndex = 216;
             this.ConfirmOut.Text = "确认出货";
             this.ConfirmOut.UseVisualStyleBackColor = false;
@@ -473,16 +500,17 @@
             this.NewProdInOut.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.NewProdInOut.Image = null;
             this.NewProdInOut.IsShowBorder = true;
-            this.NewProdInOut.Location = new System.Drawing.Point(654, 21);
-            this.NewProdInOut.Margin = new System.Windows.Forms.Padding(2);
+            this.NewProdInOut.Location = new System.Drawing.Point(1308, 42);
+            this.NewProdInOut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NewProdInOut.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewProdInOut.MoveImage")));
             this.NewProdInOut.Name = "NewProdInOut";
             this.NewProdInOut.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewProdInOut.NormalImage")));
             this.NewProdInOut.Power = null;
-            this.NewProdInOut.Size = new System.Drawing.Size(75, 26);
+            this.NewProdInOut.Size = new System.Drawing.Size(150, 52);
             this.NewProdInOut.TabIndex = 215;
             this.NewProdInOut.Text = "新增出货单";
             this.NewProdInOut.UseVisualStyleBackColor = false;
+            this.NewProdInOut.Visible = false;
             this.NewProdInOut.Click += new System.EventHandler(this.NewProdInOut_Click);
             // 
             // ProdDetail
@@ -493,13 +521,13 @@
             this.ProdDetail.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ProdDetail.Image = null;
             this.ProdDetail.IsShowBorder = true;
-            this.ProdDetail.Location = new System.Drawing.Point(488, 20);
-            this.ProdDetail.Margin = new System.Windows.Forms.Padding(2);
+            this.ProdDetail.Location = new System.Drawing.Point(976, 40);
+            this.ProdDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ProdDetail.MoveImage = ((System.Drawing.Image)(resources.GetObject("ProdDetail.MoveImage")));
             this.ProdDetail.Name = "ProdDetail";
             this.ProdDetail.NormalImage = ((System.Drawing.Image)(resources.GetObject("ProdDetail.NormalImage")));
             this.ProdDetail.Power = null;
-            this.ProdDetail.Size = new System.Drawing.Size(65, 27);
+            this.ProdDetail.Size = new System.Drawing.Size(130, 54);
             this.ProdDetail.TabIndex = 214;
             this.ProdDetail.Text = "产品明细";
             this.ProdDetail.UseVisualStyleBackColor = false;
@@ -512,23 +540,23 @@
             this.pi_inoutno.Condition = null;
             this.pi_inoutno.DBTitle = null;
             this.pi_inoutno.FormName = null;
-            this.pi_inoutno.Location = new System.Drawing.Point(77, 21);
-            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(2);
+            this.pi_inoutno.Location = new System.Drawing.Point(154, 42);
+            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pi_inoutno.Name = "pi_inoutno";
             this.pi_inoutno.Power = null;
             this.pi_inoutno.ReturnData = null;
             this.pi_inoutno.SelectField = null;
             this.pi_inoutno.SetValueField = null;
-            this.pi_inoutno.Size = new System.Drawing.Size(158, 20);
+            this.pi_inoutno.Size = new System.Drawing.Size(316, 40);
             this.pi_inoutno.TabIndex = 0;
             this.pi_inoutno.TableName = null;
             this.pi_inoutno.TextBoxEnable = true;
             // 
             // Warehouse_FinishedProductOut
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(740, 518);
+            this.ClientSize = new System.Drawing.Size(1480, 1036);
             this.Controls.Add(this.Search);
             this.Controls.Add(this.pallecode);
             this.Controls.Add(this.pi_type);
@@ -551,7 +579,7 @@
             this.Controls.Add(this.pi_inoutno_label);
             this.Controls.Add(this.pi_inoutno);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Warehouse_FinishedProductOut";
             this.Tag = "Warehouse!FinishedProductIn";
             this.Text = "成品出货";

UAS_MES_YD/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -49,7 +49,7 @@ namespace UAS_MES_NEW.Warehouse
             pi_inoutno.SelectField = "pi_id # ID,pi_title  # 客户名称,pi_inoutno # 出货单号,pi_type # 出货类型";
             pi_inoutno.SetValueField = new string[] { "pi_title", "pi_inoutno", "pi_id", "pi_type" };
             pi_inoutno.FormName = Name;
-            pi_inoutno.Condition = "pi_pdastatus<>'已出库' and pi_class='出货单'";
+            pi_inoutno.Condition = "nvl(pi_pdastatus,' ')<>'已出库' and pi_class='其它出库单' and pi_type='销售出货'";
             pi_inoutno.DbChange += Pi_inoutno_DbChange;
             asc.controllInitializeSize(this);
             dh = SystemInf.dh;
@@ -82,7 +82,7 @@ namespace UAS_MES_NEW.Warehouse
                 BaseUtil.SetFormValue(this.Controls, dtpi);
             }
 
-            if (pi_type.Text == "按订单出货")
+            if (pi_type.Text == "销售出货")
             {
                 sql.Clear();
                 sql.Append("select nvl((select sum(pd_outqty) from prodiodetail where pd_piid=" + pi_id.Text + "),0)outqty,nvl((select count(1)cn from prodiomac where pim_inoutno=pd_inoutno),0) getqty  ");
@@ -192,7 +192,7 @@ namespace UAS_MES_NEW.Warehouse
                             OperateResult.AppendText("出货单" + pi_inoutno.Text + "尚未备货，无法确认出货\n", Color.Red);
                             return;
                         }
-                        else if (dt.Rows[0]["pi_type"].ToString() == "按订单出货" && dt.Rows[0]["pi_pdastatus"].ToString() == "备货中")
+                        else if (dt.Rows[0]["pi_type"].ToString() == "销售出货" && dt.Rows[0]["pi_pdastatus"].ToString() == "备货中")
                         {
                             OperateResult.AppendText("出货单" + pi_inoutno.Text + "未完成备货，无法确认出货\n", Color.Red);
                             return;
@@ -473,7 +473,7 @@ namespace UAS_MES_NEW.Warehouse
                                     OperateResult.AppendText("序列号" + input.Text + "已经被出货单:" + ms_outno + "采集\n", Color.Red, input);
                                     return;
                                 }
-                                if (dta.Rows[0]["pi_type"].ToString() == "按订单出货")
+                                if (dta.Rows[0]["pi_type"].ToString() == "销售出货")
                                 {
                                     string pr_packrule = dh.getFieldDataByCondition("product", "pr_packrule", "pr_code = '" + dtms.Rows[0]["ms_prodcode"].ToString() + "'").ToString();
                                     if (pr_packrule == "SALE")
@@ -527,7 +527,7 @@ namespace UAS_MES_NEW.Warehouse
                         }
                         LoadFormData();
                         LoadGridData();
-                        if (dta.Rows[0]["pi_type"].ToString() == "按订单出货")
+                        if (dta.Rows[0]["pi_type"].ToString() == "销售出货")
                         {
                             if (int.Parse(dtform.Rows[0]["outqty"].ToString()) > int.Parse(dtform.Rows[0]["getqty"].ToString()))
                             {
@@ -784,7 +784,7 @@ namespace UAS_MES_NEW.Warehouse
                 OperateResult.AppendText(type + input.Text + "内序列号未完工，序列号:" + dt.Rows[0]["data"].ToString() + "\n", Color.Red, input);
                 return false;
             }
-            if (dta.Rows[0]["pi_type"].ToString() == "按订单出货")
+            if (dta.Rows[0]["pi_type"].ToString() == "销售出货")
             {
                 //获取进行出库的产品的包装规则
                 string pr_packrule = dh.getFieldDataByCondition("product left join package on pr_code = pa_prodcode", "pr_packrule", "pa_outboxcode = '" + input.Text + "'").ToString();

UAS_MES_YD/FunctionCode/Warehouse/Warehouse_FinishedProductOut.resx

@@ -177,24 +177,6 @@
   <metadata name="blank.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>
-  <metadata name="blank.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="ConfirmOut.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

UAS_MES_YD/FunctionCode/Warehouse/Warehouse_ProductMakeIn.cs

@@ -399,8 +399,8 @@ namespace UAS_MES_NEW.Warehouse
                 sql.Append("select pim_id,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 + "'and pim_inorout='IN' AND pim_class='完工入库'");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                (bindingSource1.DataSource as DataTable).Merge(dt.Copy());
-                BaseUtil.FillDgvWithDataTable(InOutDetailDGV, (DataTable)bindingSource1.DataSource);
+                //(bindingSource1.DataSource as DataTable).Merge(dt.Copy());
+                BaseUtil.FillDgvWithDataTable(InOutDetailDGV, dt);
             }
             else
             {