Merge branch 'master' of ssh://10.10.101.21/source/mes-client

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

@@ -83,6 +83,7 @@
             this.mb_bgcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mb_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.AddBad = new System.Windows.Forms.DataGridViewImageColumn();
+            this.pr_detail_ = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.New_BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -173,6 +174,7 @@
             this.mb_bgcode,
             this.mb_badcode,
             this.AddBad,
+            this.pr_detail_,
             this.cm_soncode,
             this.cm_barcode,
             this.New_BarCode,
@@ -653,6 +655,11 @@
             this.AddBad.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.AddBad.Width = 20;
             // 
+            // pr_detail_
+            // 
+            this.pr_detail_.HeaderText = "子件名称";
+            this.pr_detail_.Name = "pr_detail_";
+            // 
             // cm_soncode
             // 
             this.cm_soncode.DataPropertyName = "cm_soncode";
@@ -811,6 +818,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn mb_bgcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn mb_badcode;
         private System.Windows.Forms.DataGridViewImageColumn AddBad;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail_;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_soncode;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_barcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn New_BarCode;

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -118,6 +118,7 @@ namespace UAS_MES.Make
                 for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
                 {
                     LabelDataGridView.Rows[i].Cells["cm_barcode"].Value = dh.getFieldDataByCondition("CRAFTMATERIAL", "CM_BARCODE", "cm_id = '" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "'");
+                    LabelDataGridView.Rows[i].Cells["pr_detail_"].Value = dh.getFieldDataByCondition("product", "pr_detail", "pr_code = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
                 }
             }
             else

UAS-MES/FunctionCode/Make/Make_Decompose.resx

@@ -150,6 +150,9 @@
   <metadata name="AddBad.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="cm_soncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>