|
@@ -140,15 +140,17 @@ namespace UAS_LabelMachine
|
|
|
|
|
|
void bindingsource(DataGridView dgv, DataTable dt)
|
|
|
{
|
|
|
- if (dgv.InvokeRequired)
|
|
|
- {
|
|
|
- dgv.Invoke(new BindDataSource(bindingsource), new object[] { dgv, dt });
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- dgv.AutoGenerateColumns = false;
|
|
|
- dgv.DataSource = dt;
|
|
|
- }
|
|
|
+ dgv.DataSource = null;
|
|
|
+ dgv.DataSource = dt;
|
|
|
+ //if (dgv.InvokeRequired)
|
|
|
+ //{
|
|
|
+ // dgv.Invoke(new BindDataSource(bindingsource), new object[] { dgv, dt });
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // dgv.AutoGenerateColumns = false;
|
|
|
+ // dgv.DataSource = dt;
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
private void 贴标机条码打印_Load(object sender, EventArgs e)
|
|
@@ -707,7 +709,7 @@ namespace UAS_LabelMachine
|
|
|
pibid += PIBID[i];
|
|
|
}
|
|
|
if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
|
|
|
- SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
|
|
|
+ SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
|
|
|
for (int j = 0; j < SingleReport.Parameters.Count; j++)
|
|
|
{
|
|
|
SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, "");
|
|
@@ -950,7 +952,7 @@ namespace UAS_LabelMachine
|
|
|
if (pibid != "")
|
|
|
{
|
|
|
if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
|
|
|
- SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
|
|
|
+ SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
|
|
|
for (int j = 0; j < SingleReport.Parameters.Count; j++)
|
|
|
{
|
|
|
SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, "");
|
|
@@ -1563,7 +1565,7 @@ namespace UAS_LabelMachine
|
|
|
if (ComBoxClickChangeLabelDoc)
|
|
|
{
|
|
|
if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
|
|
|
- SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
|
|
|
+ SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
|
|
|
}
|
|
|
}
|
|
|
catch (Exception) { }
|