修改表格字段

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

@@ -52,11 +52,6 @@
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.PackageDetail = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pa_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_innerqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pa_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.pr_code = new System.Windows.Forms.Label();
             this.pr_detail = new System.Windows.Forms.Label();
@@ -74,6 +69,12 @@
             this.pr_packrule = new System.Windows.Forms.Label();
             this.pa_status = new System.Windows.Forms.Label();
             this.ob_checkno = new System.Windows.Forms.Label();
+            this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pa_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pa_prodcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_innerqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pa_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
@@ -365,6 +366,7 @@
             this.PackageDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.pd_barcode,
             this.pa_outboxcode1,
+            this.pa_prodcode1,
             this.pd_innerqty,
             this.pa_indate,
             this.pd_id});
@@ -376,51 +378,6 @@
             this.PackageDetail.Size = new System.Drawing.Size(1150, 300);
             this.PackageDetail.TabIndex = 134;
             // 
-            // pd_barcode
-            // 
-            this.pd_barcode.DataPropertyName = "pd_barcode";
-            this.pd_barcode.HeaderText = "序号";
-            this.pd_barcode.Name = "pd_barcode";
-            this.pd_barcode.ReadOnly = true;
-            this.pd_barcode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.pd_barcode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic;
-            this.pd_barcode.Width = 202;
-            // 
-            // pa_outboxcode1
-            // 
-            this.pa_outboxcode1.DataPropertyName = "pa_outboxcode";
-            this.pa_outboxcode1.HeaderText = "箱号";
-            this.pa_outboxcode1.Name = "pa_outboxcode1";
-            this.pa_outboxcode1.ReadOnly = true;
-            this.pa_outboxcode1.Width = 201;
-            // 
-            // pd_innerqty
-            // 
-            this.pd_innerqty.DataPropertyName = "pd_innerqty";
-            this.pd_innerqty.HeaderText = "箱内数量";
-            this.pd_innerqty.Name = "pd_innerqty";
-            this.pd_innerqty.ReadOnly = true;
-            this.pd_innerqty.Visible = false;
-            this.pd_innerqty.Width = 80;
-            // 
-            // pa_indate
-            // 
-            this.pa_indate.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pa_indate.DataPropertyName = "pa_indate";
-            this.pa_indate.HeaderText = "装箱日期";
-            this.pa_indate.MinimumWidth = 300;
-            this.pa_indate.Name = "pa_indate";
-            this.pa_indate.ReadOnly = true;
-            this.pa_indate.Width = 300;
-            // 
-            // pd_id
-            // 
-            this.pd_id.DataPropertyName = "pd_id";
-            this.pd_id.HeaderText = "ID";
-            this.pd_id.Name = "pd_id";
-            this.pd_id.ReadOnly = true;
-            this.pd_id.Visible = false;
-            // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
@@ -651,6 +608,59 @@
             this.ob_checkno.Visible = false;
             this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
             // 
+            // pd_barcode
+            // 
+            this.pd_barcode.DataPropertyName = "pd_barcode";
+            this.pd_barcode.HeaderText = "序列号";
+            this.pd_barcode.Name = "pd_barcode";
+            this.pd_barcode.ReadOnly = true;
+            this.pd_barcode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.pd_barcode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic;
+            this.pd_barcode.Width = 202;
+            // 
+            // pa_outboxcode1
+            // 
+            this.pa_outboxcode1.DataPropertyName = "pa_outboxcode";
+            this.pa_outboxcode1.HeaderText = "箱号";
+            this.pa_outboxcode1.Name = "pa_outboxcode1";
+            this.pa_outboxcode1.ReadOnly = true;
+            this.pa_outboxcode1.Visible = false;
+            this.pa_outboxcode1.Width = 201;
+            // 
+            // pa_prodcode1
+            // 
+            this.pa_prodcode1.DataPropertyName = "pa_prodcode";
+            this.pa_prodcode1.HeaderText = "产品编号";
+            this.pa_prodcode1.Name = "pa_prodcode1";
+            this.pa_prodcode1.ReadOnly = true;
+            // 
+            // pd_innerqty
+            // 
+            this.pd_innerqty.DataPropertyName = "pd_innerqty";
+            this.pd_innerqty.HeaderText = "箱内数量";
+            this.pd_innerqty.Name = "pd_innerqty";
+            this.pd_innerqty.ReadOnly = true;
+            this.pd_innerqty.Visible = false;
+            this.pd_innerqty.Width = 80;
+            // 
+            // pa_indate
+            // 
+            this.pa_indate.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pa_indate.DataPropertyName = "pa_indate";
+            this.pa_indate.HeaderText = "装箱日期";
+            this.pa_indate.MinimumWidth = 300;
+            this.pa_indate.Name = "pa_indate";
+            this.pa_indate.ReadOnly = true;
+            this.pa_indate.Width = 300;
+            // 
+            // pd_id
+            // 
+            this.pd_id.DataPropertyName = "pd_id";
+            this.pd_id.HeaderText = "ID";
+            this.pd_id.Name = "pd_id";
+            this.pd_id.ReadOnly = true;
+            this.pd_id.Visible = false;
+            // 
             // Make_PackageCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -717,11 +727,6 @@
         private System.Windows.Forms.Label label3;
         private CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode pa_outboxcode;
         private System.Windows.Forms.NumericUpDown PrintNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_barcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pa_outboxcode1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_innerqty;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pa_indate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
         private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
         private System.Windows.Forms.Label pr_code;
         private System.Windows.Forms.Label pr_detail;
@@ -739,5 +744,11 @@
         private System.Windows.Forms.Label ob_batchqty_label;
         private System.Windows.Forms.Label ob_nowcheckqty;
         private System.Windows.Forms.Label ob_checkno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_barcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pa_outboxcode1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pa_prodcode1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_innerqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pa_indate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -106,7 +106,7 @@ namespace UAS_MES.Make
         private void LoadGridData()
         {
             //加载Grid数据
-            dt = (DataTable)dh.ExecuteSql("select pa_outboxcode,pd_barcode,pd_innerqty,pa_indate from packageDetail left join package on pa_id=pd_paid where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
+            dt = (DataTable)dh.ExecuteSql("select pa_outboxcode,pa_prodcode,pd_barcode,pd_innerqty,pa_indate from packageDetail left join package on pa_id=pd_paid where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
             BaseUtil.FillDgvWithDataTable(PackageDetail, dt);
             //更新界面的采集数量
             pa_currentqty.Text = dh.getFieldDataByCondition("package", "pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();

UAS-MES/FunctionCode/Make/Make_PackageCollection.resx

@@ -200,6 +200,9 @@
   <metadata name="pa_outboxcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pa_prodcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

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

@@ -52,11 +52,6 @@
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.PackageDetail = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pa_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_innerqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pa_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.pr_code = new System.Windows.Forms.Label();
             this.pr_detail = new System.Windows.Forms.Label();
@@ -83,6 +78,12 @@
             this.label2 = new System.Windows.Forms.Label();
             this.Baurate = new System.Windows.Forms.Label();
             this.ComList = new System.Windows.Forms.Label();
+            this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pa_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pa_prodcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_innerqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pa_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
@@ -374,6 +375,7 @@
             this.PackageDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.pd_barcode,
             this.pa_outboxcode1,
+            this.pa_prodcode1,
             this.pd_innerqty,
             this.pa_indate,
             this.pd_id});
@@ -385,51 +387,6 @@
             this.PackageDetail.Size = new System.Drawing.Size(881, 300);
             this.PackageDetail.TabIndex = 134;
             // 
-            // pd_barcode
-            // 
-            this.pd_barcode.DataPropertyName = "pd_barcode";
-            this.pd_barcode.HeaderText = "序号";
-            this.pd_barcode.Name = "pd_barcode";
-            this.pd_barcode.ReadOnly = true;
-            this.pd_barcode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.pd_barcode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic;
-            this.pd_barcode.Width = 202;
-            // 
-            // pa_outboxcode1
-            // 
-            this.pa_outboxcode1.DataPropertyName = "pa_outboxcode";
-            this.pa_outboxcode1.HeaderText = "箱号";
-            this.pa_outboxcode1.Name = "pa_outboxcode1";
-            this.pa_outboxcode1.ReadOnly = true;
-            this.pa_outboxcode1.Width = 201;
-            // 
-            // pd_innerqty
-            // 
-            this.pd_innerqty.DataPropertyName = "pd_innerqty";
-            this.pd_innerqty.HeaderText = "箱内数量";
-            this.pd_innerqty.Name = "pd_innerqty";
-            this.pd_innerqty.ReadOnly = true;
-            this.pd_innerqty.Visible = false;
-            this.pd_innerqty.Width = 80;
-            // 
-            // pa_indate
-            // 
-            this.pa_indate.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pa_indate.DataPropertyName = "pa_indate";
-            this.pa_indate.HeaderText = "装箱日期";
-            this.pa_indate.MinimumWidth = 300;
-            this.pa_indate.Name = "pa_indate";
-            this.pa_indate.ReadOnly = true;
-            this.pa_indate.Width = 300;
-            // 
-            // pd_id
-            // 
-            this.pd_id.DataPropertyName = "pd_id";
-            this.pd_id.HeaderText = "ID";
-            this.pd_id.Name = "pd_id";
-            this.pd_id.ReadOnly = true;
-            this.pd_id.Visible = false;
-            // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
@@ -765,6 +722,59 @@
             this.ComList.TabIndex = 177;
             this.ComList.Visible = false;
             // 
+            // pd_barcode
+            // 
+            this.pd_barcode.DataPropertyName = "pd_barcode";
+            this.pd_barcode.HeaderText = "序列号";
+            this.pd_barcode.Name = "pd_barcode";
+            this.pd_barcode.ReadOnly = true;
+            this.pd_barcode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.pd_barcode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic;
+            this.pd_barcode.Width = 202;
+            // 
+            // pa_outboxcode1
+            // 
+            this.pa_outboxcode1.DataPropertyName = "pa_outboxcode";
+            this.pa_outboxcode1.HeaderText = "箱号";
+            this.pa_outboxcode1.Name = "pa_outboxcode1";
+            this.pa_outboxcode1.ReadOnly = true;
+            this.pa_outboxcode1.Visible = false;
+            this.pa_outboxcode1.Width = 201;
+            // 
+            // pa_prodcode1
+            // 
+            this.pa_prodcode1.DataPropertyName = "pa_prodcode";
+            this.pa_prodcode1.HeaderText = "产品编号";
+            this.pa_prodcode1.Name = "pa_prodcode1";
+            this.pa_prodcode1.ReadOnly = true;
+            // 
+            // pd_innerqty
+            // 
+            this.pd_innerqty.DataPropertyName = "pd_innerqty";
+            this.pd_innerqty.HeaderText = "箱内数量";
+            this.pd_innerqty.Name = "pd_innerqty";
+            this.pd_innerqty.ReadOnly = true;
+            this.pd_innerqty.Visible = false;
+            this.pd_innerqty.Width = 80;
+            // 
+            // pa_indate
+            // 
+            this.pa_indate.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pa_indate.DataPropertyName = "pa_indate";
+            this.pa_indate.HeaderText = "装箱日期";
+            this.pa_indate.MinimumWidth = 300;
+            this.pa_indate.Name = "pa_indate";
+            this.pa_indate.ReadOnly = true;
+            this.pa_indate.Width = 300;
+            // 
+            // pd_id
+            // 
+            this.pd_id.DataPropertyName = "pd_id";
+            this.pd_id.HeaderText = "ID";
+            this.pd_id.Name = "pd_id";
+            this.pd_id.ReadOnly = true;
+            this.pd_id.Visible = false;
+            // 
             // Make_PackageCollectionWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -836,11 +846,6 @@
         private System.Windows.Forms.Label label3;
         private CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode pa_outboxcode;
         private System.Windows.Forms.NumericUpDown PrintNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_barcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pa_outboxcode1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_innerqty;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pa_indate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
         private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
         private System.Windows.Forms.Label pr_code;
         private System.Windows.Forms.Label pr_detail;
@@ -867,5 +872,11 @@
         private System.Windows.Forms.Label ComList;
         private System.Windows.Forms.Label pr_cartonunit;
         private System.Windows.Forms.Label pr_cartonunit1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_barcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pa_outboxcode1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pa_prodcode1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_innerqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pa_indate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -181,7 +181,7 @@ namespace UAS_MES.Make
         private void LoadGridData()
         {
             //加载Grid数据
-            dt = (DataTable)dh.ExecuteSql("select pa_outboxcode,pd_barcode,pd_innerqty,pa_indate from packageDetail left join package on pa_id=pd_paid where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
+            dt = (DataTable)dh.ExecuteSql("select pa_outboxcode,pa_prodcode,pd_barcode,pd_innerqty,pa_indate from packageDetail left join package on pa_id=pd_paid where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
             BaseUtil.FillDgvWithDataTable(PackageDetail, dt);
             //更新界面的采集数量
             pa_currentqty.Text = dh.getFieldDataByCondition("package", "pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.resx

@@ -200,19 +200,7 @@
   <metadata name="pa_outboxcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_outboxcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="pa_prodcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">