完工入库以及出货单界面调整

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

@@ -91,10 +91,10 @@
             // pi_title
             // 
             this.pi_title.AutoSize = true;
-            this.pi_title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_title.Location = new System.Drawing.Point(326, 20);
+            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.Name = "pi_title";
-            this.pi_title.Size = new System.Drawing.Size(0, 21);
+            this.pi_title.Size = new System.Drawing.Size(0, 17);
             this.pi_title.TabIndex = 213;
             // 
             // panel1
@@ -340,7 +340,7 @@
             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.Location = new System.Drawing.Point(95, 144);
             this.boxqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.boxqty.Name = "boxqty";
             this.boxqty.Size = new System.Drawing.Size(0, 21);
@@ -351,7 +351,7 @@
             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.Location = new System.Drawing.Point(95, 107);
             this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.getqty.Name = "getqty";
             this.getqty.Size = new System.Drawing.Size(0, 21);
@@ -362,7 +362,7 @@
             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.Location = new System.Drawing.Point(95, 60);
             this.ungetqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.ungetqty.Name = "ungetqty";
             this.ungetqty.Size = new System.Drawing.Size(0, 21);
@@ -373,7 +373,7 @@
             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.Location = new System.Drawing.Point(95, 17);
             this.outqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.outqty.Name = "outqty";
             this.outqty.Size = new System.Drawing.Size(0, 21);

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

@@ -30,6 +30,12 @@
         {
             this.components = new System.ComponentModel.Container();
             this.InOutDetailDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.pim_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pim_id = 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();
@@ -40,12 +46,6 @@
             this.label1 = new System.Windows.Forms.Label();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.pim_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pim_id = 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();
             ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             this.SuspendLayout();
@@ -69,12 +69,56 @@
             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_id
+            // 
+            this.pim_id.DataPropertyName = "pim_id";
+            this.pim_id.HeaderText = "pim_id";
+            this.pim_id.Name = "pim_id";
+            this.pim_id.Visible = false;
+            // 
+            // 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.Location = new System.Drawing.Point(101, 12);
             this.getqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.getqty.Name = "getqty";
             this.getqty.Size = new System.Drawing.Size(0, 21);
@@ -84,7 +128,7 @@
             // 
             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.Location = new System.Drawing.Point(12, 11);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(74, 21);
             this.label8.TabIndex = 227;
@@ -94,7 +138,7 @@
             // 
             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.Location = new System.Drawing.Point(234, 447);
             this.cancel.Margin = new System.Windows.Forms.Padding(2);
             this.cancel.Name = "cancel";
             this.cancel.Power = null;
@@ -158,7 +202,7 @@
             // 
             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.Location = new System.Drawing.Point(12, 447);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(58, 21);
             this.label1.TabIndex = 234;
@@ -173,50 +217,6 @@
             this.OperateResult.TabIndex = 235;
             this.OperateResult.Text = "";
             // 
-            // 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_id
-            // 
-            this.pim_id.DataPropertyName = "pim_id";
-            this.pim_id.HeaderText = "pim_id";
-            this.pim_id.Name = "pim_id";
-            this.pim_id.Visible = false;
-            // 
-            // 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;
-            // 
             // Warehouse_ProductMakeIn
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.resx

@@ -135,6 +135,24 @@
   <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_id.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="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>