|
@@ -15,6 +15,10 @@ using System.Windows;
|
|
|
using FurnaceUI.Models;
|
|
|
using MECF.Framework.Common.SubstrateTrackings;
|
|
|
using Aitex.Core.RT.SCCore;
|
|
|
+using Aitex.Core.RT.Event;
|
|
|
+using OpenSEMI.Ctrlib.Controls;
|
|
|
+using DocumentFormat.OpenXml.Bibliography;
|
|
|
+using System.Reflection;
|
|
|
|
|
|
namespace FurnaceUI.Views.Operations
|
|
|
{
|
|
@@ -231,32 +235,15 @@ namespace FurnaceUI.Views.Operations
|
|
|
DialogBox.ShowWarning($"OriginSlot input error,can not create,input range 1 to {(int)QueryDataClient.Instance.Service.GetConfig("System.CassetteSlotCount")}");
|
|
|
return;
|
|
|
}
|
|
|
- CarrierInfo carrierInfo = null;
|
|
|
- switch (ModuleName)
|
|
|
+ var key = $"{ModuleName.ToString()}.Carrier";
|
|
|
+ var rtData = QueryDataClient.Instance.Service.PollData(new List<string>() { key });
|
|
|
+ if (rtData == null)
|
|
|
{
|
|
|
- case "FIMS1":
|
|
|
- if (!(FIMS1CarrierData != null && FIMS1CarrierData.Status == CarrierStatus.Normal))
|
|
|
- {
|
|
|
- carrierInfo = FIMS1CarrierData;
|
|
|
- }
|
|
|
- break;
|
|
|
- case "FIMS2":
|
|
|
- if (!(FIMS2CarrierData != null && FIMS2CarrierData.Status == CarrierStatus.Normal))
|
|
|
- {
|
|
|
- carrierInfo = FIMS2CarrierData;
|
|
|
- }
|
|
|
- break;
|
|
|
- case "CarrierRobot":
|
|
|
- if (!(CassetteRobotCarrierData != null && CassetteRobotCarrierData.Status == CarrierStatus.Normal))
|
|
|
- {
|
|
|
- carrierInfo = CassetteRobotCarrierData;
|
|
|
- }
|
|
|
- break;
|
|
|
- default:
|
|
|
- carrierInfo = new CarrierInfo(1);
|
|
|
- break;
|
|
|
+ DialogBox.ShowWarning($"{ModuleName} Carrier is null!");
|
|
|
+ return;
|
|
|
}
|
|
|
- if (carrierInfo != null)
|
|
|
+ var carrierInfo = (CarrierInfo)rtData[key];
|
|
|
+ if (carrierInfo == null || carrierInfo.IsEmpty)
|
|
|
{
|
|
|
DialogBox.ShowWarning($"{ModuleName} Carrier is null!");
|
|
|
return;
|