|
@@ -20,9 +20,9 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
{
|
|
|
public ScheduleMaintenanceDataItem DataItem { get; private set; }
|
|
|
|
|
|
- public ScheduleMaintenanceData(string item, string display, string unit, float startValue, float limitValue, string maintenanceProcessing, string path, string additionInformationName = "", string additionInformationDisplay = "", string associationProcessRecipeName = "")
|
|
|
+ public ScheduleMaintenanceData(string item, string display, string unit, float startValue, float limitValue, string maintenanceProcessing, string path, string additionInformationName = "", string additionInformationDisplay = "", string associationProcessRecipeName = "", string additionInformationDisplaySupplement = "")
|
|
|
{
|
|
|
- ScheduleMaintenanceDataManager.Instance.Subscribe(item, display, unit, startValue, limitValue, maintenanceProcessing, path, additionInformationName, additionInformationDisplay, associationProcessRecipeName);
|
|
|
+ ScheduleMaintenanceDataManager.Instance.Subscribe(item, display, unit, startValue, limitValue, maintenanceProcessing, path, additionInformationName, additionInformationDisplay, associationProcessRecipeName, additionInformationDisplaySupplement);
|
|
|
|
|
|
DataItem = ScheduleMaintenanceDataManager.Instance.GetItem(item);
|
|
|
}
|
|
@@ -67,6 +67,7 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
public string Path { get; set; }
|
|
|
public string AdditionInformationName { get; set; }
|
|
|
public string AdditionInformationDisplay { get; set; }
|
|
|
+ public string AdditionInformationDisplaySupplement { get; set; }
|
|
|
}
|
|
|
|
|
|
public class ScheduleMaintenanceDataManager : Singleton<ScheduleMaintenanceDataManager>
|
|
@@ -84,6 +85,8 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
|
|
|
public void Initialize()
|
|
|
{
|
|
|
+ InitScheduleMaintenance();
|
|
|
+
|
|
|
try
|
|
|
{
|
|
|
OP.Subscribe("System.ScheduleMaintenance.SetCurrentValue", (method, args) =>
|
|
@@ -126,7 +129,7 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
|
|
|
OP.Subscribe("System.ScheduleMaintenance.SetAdditionInformationDisplayName", (method, args) =>
|
|
|
{
|
|
|
- SetMaintenanceName((string)args[0], args[1].ToString());
|
|
|
+ SetAdditionInformationDisplayName((string)args[0], args[1].ToString(), args.Length > 2 ? args[2].ToString(): "");
|
|
|
return true;
|
|
|
});
|
|
|
|
|
@@ -142,6 +145,7 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
item.Path = dt.Rows[i]["path"].ToString();
|
|
|
item.AdditionInformationName = dt.Rows[i]["addition_information_name"].ToString();
|
|
|
item.AdditionInformationDisplay = dt.Rows[i]["addition_information_display"].ToString();
|
|
|
+ item.AdditionInformationDisplaySupplement = dt.Rows[i]["addition_information_display_supplement"].ToString();
|
|
|
item.AssociationProcessRecipeName = dt.Rows[i]["association_process_recipeName"].ToString();
|
|
|
if (float.TryParse(dt.Rows[i]["current_value"].ToString(), out float value))
|
|
|
item.CurrentValue = value;
|
|
@@ -153,7 +157,7 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
_items[item.Item] = item;
|
|
|
}
|
|
|
|
|
|
- InitScheduleMaintenance();
|
|
|
+
|
|
|
UpdateSEDWafer();
|
|
|
}
|
|
|
catch (Exception ex)
|
|
@@ -184,7 +188,7 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
return display;
|
|
|
}
|
|
|
}
|
|
|
- public string SetAdditionInformationDisplayName(string name, string display)
|
|
|
+ public string SetAdditionInformationDisplayName(string name, string display, string displaySupplement = "")
|
|
|
{
|
|
|
lock (_locker)
|
|
|
{
|
|
@@ -198,8 +202,8 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
_items[name].AdditionInformationDisplay = display;
|
|
|
|
|
|
string sql = string.Format(
|
|
|
- "UPDATE \"schedule_maintenance\" SET \"addition_information_display\"='{0}'WHERE \"maintenance_item\"='{1}';", display,
|
|
|
- name);
|
|
|
+ "UPDATE \"schedule_maintenance\" SET \"addition_information_display\"='{0}' , \"addition_information_display_supplement\"='{2}'WHERE \"maintenance_item\"='{1}';", display,
|
|
|
+ name, displaySupplement);
|
|
|
DB.Insert(sql);
|
|
|
|
|
|
EV.PostInfoLog("System", $"{name} schedule maintenance AdditionInformationDisplay value changed from {preValue} to {display}");
|
|
@@ -283,7 +287,7 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
{
|
|
|
|
|
|
}
|
|
|
- public void Subscribe(string item, string display, string unit, float startValue, float limitValue, string maintenanceProcessing, string path, string additionInformationName, string additionInformationDisplay, string associationProcessRecipeName)
|
|
|
+ public void Subscribe(string item, string display, string unit, float startValue, float limitValue, string maintenanceProcessing, string path, string additionInformationName, string additionInformationDisplay, string associationProcessRecipeName, string additionInformationDisplaySupplement)
|
|
|
{
|
|
|
lock (_locker)
|
|
|
{
|
|
@@ -300,10 +304,11 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
""unit"",
|
|
|
""path"",
|
|
|
""addition_information_name"",
|
|
|
- ""addition_information_display""
|
|
|
- ""association_process_recipeName""
|
|
|
- ) values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}')",
|
|
|
- item, display, startValue, limitValue, maintenanceProcessing, unit, path, additionInformationName, additionInformationDisplay, associationProcessRecipeName);
|
|
|
+ ""addition_information_display"",
|
|
|
+ ""association_process_recipeName"",
|
|
|
+ ""addition_information_display_supplement""
|
|
|
+ ) values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}')",
|
|
|
+ item, display, startValue, limitValue, maintenanceProcessing, unit, path, additionInformationName, additionInformationDisplay, associationProcessRecipeName, additionInformationDisplaySupplement);
|
|
|
DB.Insert(executeInsert);
|
|
|
}
|
|
|
}
|
|
@@ -413,7 +418,7 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
|
|
|
private Dictionary<MaintenanceItemEnum, ScheduleMaintenanceData> _scheduleMaintenanceDataDictionary;
|
|
|
|
|
|
- private void InitScheduleMaintenance()
|
|
|
+ public void InitScheduleMaintenance()
|
|
|
{
|
|
|
|
|
|
_scheduleMaintenanceDataDictionary = new Dictionary<MaintenanceItemEnum, ScheduleMaintenanceData>
|
|
@@ -432,18 +437,18 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
{ MaintenanceItemEnum.FDWaferUserTime, new ScheduleMaintenanceData(MaintenanceItemEnum.FDWaferUserTime.ToString(), "FDWaferUserTime", "h:m", 0, 0, "None", "CarrierWafer.FillDummy", "Carrier Kind", "Fill Dummy") },
|
|
|
|
|
|
|
|
|
- { MaintenanceItemEnum.OnBoatDummyWaferUse, new ScheduleMaintenanceData(MaintenanceItemEnum.OnBoatDummyWaferUse.ToString(),"OnBoatDummyWaferUse", "Times", 0, 0, "None", "Boat", "", "") },
|
|
|
- { MaintenanceItemEnum.OnBoatDummyWaferThick, new ScheduleMaintenanceData(MaintenanceItemEnum.OnBoatDummyWaferThick.ToString(), "OnBoatDummyWaferThick", "Å", 0, 0, "None", "Boat", "", "") },
|
|
|
{ MaintenanceItemEnum.BoatRecipeThickness1, new ScheduleMaintenanceData(MaintenanceItemEnum.BoatRecipeThickness1.ToString(), "BoatRecipeThickness1", "Å", 0, 0, "None", "Boat", "", "") },
|
|
|
- { MaintenanceItemEnum.BoatRecipeThickness2, new ScheduleMaintenanceData(MaintenanceItemEnum.BoatRecipeThickness2.ToString(), "BoatRecipeThickness2", "Å", 0, 0, "None", "Boat", "", "") },
|
|
|
- { MaintenanceItemEnum.BoatRecipeThickness3, new ScheduleMaintenanceData(MaintenanceItemEnum.BoatRecipeThickness3.ToString(), "BoatRecipeThickness3", "Å", 0, 0, "None", "Boat", "", "") },
|
|
|
+ { MaintenanceItemEnum.BoatTCUseTime, new ScheduleMaintenanceData(MaintenanceItemEnum.BoatTCUseTime.ToString(), "BoatTCUseTime", "h:m", 0, 0, "None", "Boat", "", "") },
|
|
|
+ { MaintenanceItemEnum.BoatCKDUseTime, new ScheduleMaintenanceData(MaintenanceItemEnum.BoatCKDUseTime.ToString(), "BoatCKDUseTime", "h:m", 0, 0, "None", "Boat", "", "") },
|
|
|
+ { MaintenanceItemEnum.BoatPUMPUseTime, new ScheduleMaintenanceData(MaintenanceItemEnum.BoatPUMPUseTime.ToString(), "BoatPUMPUseTime", "h:m", 0, 0, "None", "Boat", "", "") },
|
|
|
+
|
|
|
|
|
|
|
|
|
{ MaintenanceItemEnum.NonOperationTime1, new ScheduleMaintenanceData(MaintenanceItemEnum.NonOperationTime1.ToString(), "NonOperationTime1", "h:m", 0, 0, "None", "Conditioning", "", "") },
|
|
|
{ MaintenanceItemEnum.NonOperationTime2, new ScheduleMaintenanceData(MaintenanceItemEnum.NonOperationTime2.ToString(), "NonOperationTime2", "h:m", 0, 0, "None", "Conditioning", "", "") },
|
|
|
|
|
|
- { MaintenanceItemEnum.RecipeExecuteFreq, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeExecuteFreq.ToString(), "Recipe Run Freq", "Times", 0, 0, "None", "Reactor.Recipe", "", "") },
|
|
|
- { MaintenanceItemEnum.RecipeThickness, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness.ToString(), "Recipe Thickness", "Å", 0, 0, "None", "Reactor.Recipe", "", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeExecuteFreq, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeExecuteFreq.ToString(), "Recipe Run Freq", "Times", 0, 0, "None", "Reactor.Recipe", "Select Recipe", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeThickness, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness.ToString(), "Recipe Thickness", "Å", 0, 0, "None", "Reactor.Recipe", "Select Recipe", "") },
|
|
|
|
|
|
|
|
|
{ MaintenanceItemEnum.RecipeStepExecuteFreq1, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeStepExecuteFreq1.ToString(), "Recipe StepRunTime1", "Times", 0, 0, "None", "Reactor.StepRunFreq", "Step ID", "") },
|
|
@@ -462,14 +467,14 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
|
|
|
|
|
|
|
|
|
- { MaintenanceItemEnum.RecipeThickness1_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness1_Step.ToString(), "Recipe StepThickness1", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "Group 1") },
|
|
|
- { MaintenanceItemEnum.RecipeThickness2_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness2_Step.ToString(), "Recipe StepThickness2", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "Group 2") },
|
|
|
- { MaintenanceItemEnum.RecipeThickness3_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness3_Step.ToString(), "Recipe StepThickness3", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "Group 3") },
|
|
|
- { MaintenanceItemEnum.RecipeThickness4_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness4_Step.ToString(), "Recipe StepThickness4", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "Group 4") },
|
|
|
- { MaintenanceItemEnum.RecipeThickness5_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness5_Step.ToString(), "Recipe StepThickness5", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "Group 5") },
|
|
|
- { MaintenanceItemEnum.RecipeThickness6_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness6_Step.ToString(), "Recipe StepThickness6", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "Group 6") },
|
|
|
- { MaintenanceItemEnum.RecipeThickness7_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness7_Step.ToString(), "Recipe StepThickness7", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "Group 7") },
|
|
|
- { MaintenanceItemEnum.RecipeThickness8_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness8_Step.ToString(), "Recipe StepThickness8", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "Group 8") }
|
|
|
+ { MaintenanceItemEnum.RecipeThickness1_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness1_Step.ToString(), "Recipe StepThickness1", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeThickness2_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness2_Step.ToString(), "Recipe StepThickness2", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeThickness3_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness3_Step.ToString(), "Recipe StepThickness3", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeThickness4_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness4_Step.ToString(), "Recipe StepThickness4", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeThickness5_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness5_Step.ToString(), "Recipe StepThickness5", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeThickness6_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness6_Step.ToString(), "Recipe StepThickness6", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeThickness7_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness7_Step.ToString(), "Recipe StepThickness7", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "") },
|
|
|
+ { MaintenanceItemEnum.RecipeThickness8_Step, new ScheduleMaintenanceData(MaintenanceItemEnum.RecipeThickness8_Step.ToString(), "Recipe StepThickness8", "Å", 0, 0, "None", "Reactor.StepThickness", "Step Group", "") }
|
|
|
};
|
|
|
_stepThickness = new Dictionary<string, string>()
|
|
|
{
|
|
@@ -524,7 +529,10 @@ namespace MECF.Framework.Common.DataCenter
|
|
|
|
|
|
public void UpdateSEDWafer()
|
|
|
{
|
|
|
-
|
|
|
+ if (_scheduleMaintenanceDataDictionary == null)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
var ccc = BinarySerializer<Dictionary<ModuleName, Dictionary<int, WaferInfo>>>.FromStream("WaferManager");
|
|
|
List<WaferInfo> waferInfos = new List<WaferInfo>();
|
|
|
if (ccc != null)
|