Browse Source

1、修复了Wafer_Left_Position上报数据;
2、补充了PortClamped/PortUnclamped/PortJobStopped事件

chenkui 1 year ago
parent
commit
2f30fa17c4

+ 9 - 7
Venus/Framework/Common/SubstrateTrackings/WaferManager.cs

@@ -139,18 +139,20 @@ namespace MECF.Framework.Common.SubstrateTrackings
             }
             EV.Notify(EventWaferLeft, new SerializableDictionary<string, string>()
             {
-                {"SLOT_NO", (slotFrom+1).ToString("D2")},
+                {"SLOT_NO", (slotTo+1).ToString("D2")},
+                {"Slot", (slotTo+1).ToString("D2") },
+                {"SlotID", (slotTo+1).ToString("D2") },
                 {"WAFER_ID", wafer.WaferID},
-                { "LotID", wafer.LotId},
+                {"SubstID", wafer.WaferID},
+                {"LotID", wafer.LotId},
                 {"LOT_ID", wafer.LotId},
                 { "CAR_ID", fromCarrierId},
                 { "CarrierID", fromCarrierId},
-                { "LEFT_POS_NAME", $"{moduleFrom}.{(slotFrom+1).ToString("D2")}" },
-                { "LocationID", $"{moduleTo}.{(slotTo + 1).ToString("D2")}" },
+                { "SubstLocID",((ModuleName)wafer.Station).ToString()},
                 { "SubstLocState", "0" },
-                { "SubstProcState",((int)wafer.ProcessState).ToString()},
-                {"PortID", (wafer.OriginStation-(int)ModuleName.LP1+1).ToString()},
-                {"SlotID", (wafer.OriginSlot+1).ToString()}
+                {"SubstProcState",((int)wafer.ProcessState).ToString()},
+                { "LEFT_POS_NAME", $"{moduleFrom}.{(slotFrom+1).ToString("D2")}" },
+                { "LocationID", $"{moduleTo}.{(slotTo+1).ToString("D2")}" }
 
             });
 

+ 14 - 2
Venus/Venus_RT/Devices/EFEM/Loadport.cs

@@ -962,12 +962,24 @@ namespace Venus_RT.Devices.EFEM
 
             public void Clamped(Loadport lp)
             {
-               
+                ModuleName moduleName = lp.Module;
+                var dvid = new SerializableDictionary<string, string>
+                {
+                    ["CarrierID"] = lp.CarrierId ?? "",
+                    ["PortID"] = lp.PortId.ToString()
+                };
+                EV.Notify(PortClamped, dvid);
             }
 
             public void Unclamped(Loadport lp)
             {
-               
+                ModuleName moduleName = lp.Module;
+                var dvid = new SerializableDictionary<string, string>
+                {
+                    ["CarrierID"] = lp.CarrierId ?? "",
+                    ["PortID"] = lp.PortId.ToString()
+                };
+                EV.Notify(PortUnclamped, dvid);
             }
 
             public void IDRead(Loadport lp)

+ 1 - 0
Venus/Venus_RT/Modules/AutoCycle.cs

@@ -2136,6 +2136,7 @@ namespace Venus_RT.Modules
                 if (hand != Hand.None && outSlots.Count > 0 && !IsForwardPathBlocking(lp, outSlots[0]))
                 {
                     _efemMovingItems.Add(new MoveItem(lp, outSlots[0], ModuleName.EfemRobot, (int)hand, hand));
+
                 }
 
                 if (canPushInWafers > 1)

+ 2 - 2
Venus/Venus_RT/Modules/Autotransfer_LP_FA.cs

@@ -27,7 +27,7 @@ namespace Venus_RT.Modules
         void JobFinished(ControlJobInfo cj, ProcessJobInfo pj);
         void JobFailed(ControlJobInfo cj, ProcessJobInfo pj);
 
-        void JobWaferStart(ControlJobInfo cj, ProcessJobInfo pj, string module, int slotID);
+        void JobWaferStart(ControlJobInfo cj, ProcessJobInfo pj,int slotID);
         void JobWaferEnd(ControlJobInfo cj, ProcessJobInfo pj, string module, int slotID);
     }
     public class SchedulerFACallback : ISchedulerFACallback
@@ -178,7 +178,7 @@ namespace Venus_RT.Modules
             });
         }
 
-        public void JobWaferStart(ControlJobInfo cj, ProcessJobInfo pj, string module1, int slotID)
+        public void JobWaferStart(ControlJobInfo cj, ProcessJobInfo pj,int slotID)
         {
             ModuleName module = ModuleHelper.Converter(cj.Module);