CarrierOutEnd事件上报LpPortId

Furnace/FurnaceRT/Equipments/CarrierRobots/CarrierUnload.cs

@@ -336,7 +336,7 @@ namespace FurnaceRT.Equipments.CarrierRobots
                     throw (new RoutineBreakException());
             }
         }
-        
+
         private void SetLPUnload(int id, ModuleName source, int timeout)
         {
             Tuple<bool, Result> ret = ExecuteAndWait(id, () =>
@@ -350,7 +350,7 @@ namespace FurnaceRT.Equipments.CarrierRobots
                     var lpCarrierInfo = CarrierManager.Instance.GetCarrier(source, 0);
                     if (lpCarrierInfo != null)
                     {
-                        (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule).CarrierOutEnd(lpCarrierInfo);
+                        (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule).CarrierOutEnd(lpCarrierInfo, source.ToString().Replace("LP", "").ToString());
                     }
                     lp.LPDevice.Unload(out string reason);
 

Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -1850,7 +1850,7 @@ namespace FurnaceRT.Equipments.PMs
             bufinfo.Add("BUFPara", unallocatedPartitionCapacity, SECsFormat.U1);
             return bufinfo;
         }
-        public void CarrierOutEnd(CarrierInfo carrier)
+        public void CarrierOutEnd(CarrierInfo carrier, string lPPortID)
         {
 
             List<string> crids = CarrierManager.Instance.GetBufferMaterialInfo();
@@ -1868,6 +1868,7 @@ namespace FurnaceRT.Equipments.PMs
             {
                 EV.Notify(UniversalEvents.CarrierOutEnd, new SerializableDictionary<string, object>()
                 {
+                    {"PortID", lPPortID},
                     {DataVariables.Usage,  carrier.CarrierType.ToString()},
                     {DataVariables.BufferCapacitiyList,  GetBufferCapacitiyList()},
                     {DataVariables.BufferMaterialInfo,  BufferMaterialInfos},

Furnace/FurnaceRT/Equipments/Schedulers/SchedulerFACallback.cs

@@ -402,9 +402,9 @@ namespace FurnaceRT.Equipments.Schedulers
                 });
             }
         }
-        public void CarrierOutEnd(CarrierInfo carrier)
+        public void CarrierOutEnd(CarrierInfo carrier, string lpPortId)
         {
-            (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule).CarrierOutEnd(carrier);
+            (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule).CarrierOutEnd(carrier, lpPortId);
 
         }
         public void CarrierInStart(CarrierType carrierType, string _carrierid)
@@ -510,7 +510,7 @@ namespace FurnaceRT.Equipments.Schedulers
             EV.Notify("SLOT_MAP_AVAILABLE", dvid);
             try
             {
-                Singleton<FAJobController>.Instance.Eqp_NoteCarrierSlotMapRead(carrier.PortID, slotMap, carrier.CarrierId??"");
+                Singleton<FAJobController>.Instance.Eqp_NoteCarrierSlotMapRead(carrier.PortID, slotMap, carrier.CarrierId ?? "");
 
             }
             catch (Exception ex)