|
@@ -118,11 +118,11 @@ namespace Venus_MainPages.ViewModels
|
|
WaferHistoryWafer wafer1 = new WaferHistoryWafer();
|
|
WaferHistoryWafer wafer1 = new WaferHistoryWafer();
|
|
wafer1.StartTime = WaferRecipe.StartTime;
|
|
wafer1.StartTime = WaferRecipe.StartTime;
|
|
wafer1.EndTime = WaferRecipe.EndTime;
|
|
wafer1.EndTime = WaferRecipe.EndTime;
|
|
- string sql = string.Format($"SELECT * FROM \"lot_wafer_data\" where wafer_data_guid ='{WaferRecipe.ID}'; ");
|
|
|
|
|
|
+ string sql = string.Format($"SELECT * FROM \"lot_wafer_data\" where wafer_data_guid ='{WaferRecipe.RfID}'; ");
|
|
DataTable dbData = QueryDataClient.Instance.Service.QueryData(sql);
|
|
DataTable dbData = QueryDataClient.Instance.Service.QueryData(sql);
|
|
string lot_data_guid = dbData.Rows[0]["guid"].ToString();
|
|
string lot_data_guid = dbData.Rows[0]["guid"].ToString();
|
|
wafer1.WaferGuid = lot_data_guid;
|
|
wafer1.WaferGuid = lot_data_guid;
|
|
- SwitchPage( "ProcessHistory", wafer1);
|
|
|
|
|
|
+ SwitchPage("Process History", wafer1);
|
|
}
|
|
}
|
|
else if (o is WaferHistoryLot waferLot)
|
|
else if (o is WaferHistoryLot waferLot)
|
|
{
|
|
{
|
|
@@ -147,7 +147,7 @@ namespace Venus_MainPages.ViewModels
|
|
}
|
|
}
|
|
else if (o is WaferHistoryWafer wafer)
|
|
else if (o is WaferHistoryWafer wafer)
|
|
{
|
|
{
|
|
- SwitchPage("ProcessHistory", item1);
|
|
|
|
|
|
+ SwitchPage("Process History", item1);
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -487,7 +487,7 @@ namespace Venus_MainPages.ViewModels
|
|
for (int i = 0; i < dbData.Rows.Count; i++)
|
|
for (int i = 0; i < dbData.Rows.Count; i++)
|
|
{
|
|
{
|
|
WaferHistoryRecipe item = new WaferHistoryRecipe();
|
|
WaferHistoryRecipe item = new WaferHistoryRecipe();
|
|
-
|
|
|
|
|
|
+ item.RfID = dbData.Rows[i]["wafer_data_guid"].ToString();
|
|
item.ID = dbData.Rows[i]["guid"].ToString();
|
|
item.ID = dbData.Rows[i]["guid"].ToString();
|
|
var itemName = dbData.Rows[i]["recipe_name"].ToString();
|
|
var itemName = dbData.Rows[i]["recipe_name"].ToString();
|
|
|
|
|