|
|
@@ -744,9 +744,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -755,7 +755,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
for (int k = 0; k < PercentSum.Count; k++)
|
|
|
@@ -1063,9 +1063,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -1074,7 +1074,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
for (int k = 0; k < PercentSum.Count; k++)
|
|
|
@@ -1384,9 +1384,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -1395,7 +1395,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
for (int k = 0; k < PercentSum.Count; k++)
|
|
|
@@ -1654,7 +1654,7 @@ namespace UAS_LabelMachine
|
|
|
row1.CreateCell(j - 4);
|
|
|
if (FirstDT.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if (!NotShowColumn.Contains(FirstDT.Columns[j].ColumnName.ToLower()))
|
|
|
{
|
|
|
@@ -2124,9 +2124,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -2135,7 +2135,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
}
|
|
|
@@ -2406,9 +2406,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -2417,7 +2417,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
}
|
|
|
@@ -2680,9 +2680,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -2691,7 +2691,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
}
|
|
|
@@ -2919,7 +2919,7 @@ namespace UAS_LabelMachine
|
|
|
row1.CreateCell(j - 4);
|
|
|
if (FirstDT.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if (!NotShowColumn.Contains(FirstDT.Columns[j].ColumnName.ToLower()))
|
|
|
{
|
|
|
@@ -3411,9 +3411,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -3422,7 +3422,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
}
|
|
|
@@ -3763,9 +3763,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -3774,7 +3774,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
}
|
|
|
@@ -4097,9 +4097,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -4108,7 +4108,7 @@ namespace UAS_LabelMachine
|
|
|
else
|
|
|
{
|
|
|
double Num = 0;
|
|
|
- if (double.TryParse(Data, out Num))
|
|
|
+ if (double.TryParse(Data, out Num)&& DataTable.Columns[j].ColumnName.ToLower() != "ch_bluefilm")
|
|
|
{
|
|
|
row1.Cells[j - 4].SetCellValue(Num);
|
|
|
}
|
|
|
@@ -4447,9 +4447,9 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string Data = DataTable.Rows[i][j].ToString();
|
|
|
row1.CreateCell(j - 4);
|
|
|
- if (DataTable.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
+ if (DataTable.Columns[j].ColumnName.ToLower() == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if ((NotShowColumn.Contains(DataTable.Columns[j].ColumnName.ToLower())))
|
|
|
{
|
|
|
@@ -4721,7 +4721,7 @@ namespace UAS_LabelMachine
|
|
|
row1.CreateCell(j - 4);
|
|
|
if (FirstDT.Columns[j].ColumnName == "ch_bluefilm")
|
|
|
{
|
|
|
- row1.CreateCell(j - 4, CellType.Numeric);
|
|
|
+ row1.CreateCell(j - 4, CellType.String);
|
|
|
}
|
|
|
if (!NotShowColumn.Contains(FirstDT.Columns[j].ColumnName.ToLower()))
|
|
|
{
|