出货单采集界面调整

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

@@ -33,12 +33,8 @@
             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 System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
-            this.getqty = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
-            this.ungetqty = new System.Windows.Forms.Label();
-            this.outqty = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.palletBtn = new System.Windows.Forms.RadioButton();
@@ -52,15 +48,19 @@
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.cancel = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
             this.InOutDetailDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.ConfirmOut = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.NewProdInOut = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ProdDetail = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pi_inoutno = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             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.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();
+            this.pi_inoutno = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).BeginInit();
             this.SuspendLayout();
@@ -98,11 +98,11 @@
             // 
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.boxqty);
-            this.panel1.Controls.Add(this.label10);
             this.panel1.Controls.Add(this.getqty);
-            this.panel1.Controls.Add(this.label8);
             this.panel1.Controls.Add(this.ungetqty);
             this.panel1.Controls.Add(this.outqty);
+            this.panel1.Controls.Add(this.label10);
+            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);
@@ -111,34 +111,16 @@
             this.panel1.Size = new System.Drawing.Size(169, 195);
             this.panel1.TabIndex = 217;
             // 
-            // boxqty
-            // 
-            this.boxqty.AutoSize = true;
-            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(83, 150);
-            this.boxqty.Name = "boxqty";
-            this.boxqty.Size = new System.Drawing.Size(0, 21);
-            this.boxqty.TabIndex = 223;
-            // 
             // 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, 150);
+            this.label10.Location = new System.Drawing.Point(9, 143);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(58, 21);
             this.label10.TabIndex = 222;
             this.label10.Text = "总箱数";
             // 
-            // getqty
-            // 
-            this.getqty.AutoSize = true;
-            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, 106);
-            this.getqty.Name = "getqty";
-            this.getqty.Size = new System.Drawing.Size(0, 21);
-            this.getqty.TabIndex = 221;
-            // 
             // label8
             // 
             this.label8.AutoSize = true;
@@ -149,24 +131,6 @@
             this.label8.TabIndex = 220;
             this.label8.Text = "已采集数";
             // 
-            // ungetqty
-            // 
-            this.ungetqty.AutoSize = true;
-            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(83, 60);
-            this.ungetqty.Name = "ungetqty";
-            this.ungetqty.Size = new System.Drawing.Size(0, 21);
-            this.ungetqty.TabIndex = 219;
-            // 
-            // outqty
-            // 
-            this.outqty.AutoSize = true;
-            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(83, 17);
-            this.outqty.Name = "outqty";
-            this.outqty.Size = new System.Drawing.Size(0, 21);
-            this.outqty.TabIndex = 219;
-            // 
             // label6
             // 
             this.label6.AutoSize = true;
@@ -320,6 +284,7 @@
             this.pim_prodcode,
             this.pr_detail,
             this.pr_spec});
+            this.InOutDetailDGV.EnableContentClick = true;
             this.InOutDetailDGV.Location = new System.Drawing.Point(9, 66);
             this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(2);
             this.InOutDetailDGV.Name = "InOutDetailDGV";
@@ -327,6 +292,87 @@
             this.InOutDetailDGV.Size = new System.Drawing.Size(544, 357);
             this.InOutDetailDGV.TabIndex = 218;
             // 
+            // 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;
+            // 
+            // 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;
@@ -406,43 +452,6 @@
             this.pi_inoutno.TableName = null;
             this.pi_inoutno.TextBoxEnable = false;
             // 
-            // 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;
-            // 
             // Warehouse_FinishedProductOut
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -492,12 +501,8 @@
         private CustomControl.ButtonUtil.NormalButton NewProdInOut;
         private CustomControl.ButtonUtil.NormalButton ConfirmOut;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label boxqty;
         private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label getqty;
         private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label ungetqty;
-        private System.Windows.Forms.Label outqty;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label4;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum InOutDetailDGV;
@@ -516,5 +521,9 @@
         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 outqty;
+        private CustomControl.ValueLabel.ValueLabel ungetqty;
+        private CustomControl.ValueLabel.ValueLabel getqty;
+        private CustomControl.ValueLabel.ValueLabel boxqty;
     }
 }

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -68,6 +68,7 @@ namespace UAS_MES.Warehouse
         /// </summary>
         private void LoadFormData()
         {
+            BaseUtil.CleanControls(panel1.Controls);
             sql.Clear();
             sql.Append("select pi_id,pi_title,pi_inoutno,pi_type from prodinout where pi_inoutno = '" + pi_inoutno.Text + "'");
             dtpi = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.resx

@@ -171,6 +171,21 @@
   <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>
   <data name="ConfirmOut.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m