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

UAS-出货标签管理/UAS_出货标签管理.cs

@@ -2506,6 +2506,14 @@ namespace UAS_LabelMachine
                         LabelInf.Rows[i].Cells["pib_madein"].Value = madein;
                 }
             }
+            if (LabelInf.Columns[e.ColumnIndex].Name == "pib_madein" && CollectionUnit.Text == "全部")
+            {
+                string madein = LabelInf.Rows[e.RowIndex].Cells["pib_madein"].Value.ToString();
+                for (int i = 0; i < LabelInf.Rows.Count; i++)
+                {
+                    LabelInf.Rows[i].Cells["pib_madein"].Value = madein;
+                }
+            }
         }
 
         private void ExportData_Click(object sender, EventArgs e)