fixed pm event occurs carrierid is null

Venus/Venus_RT/Modules/Autotransfer_LP_FA.cs

@@ -190,7 +190,7 @@ namespace Venus_RT.Modules
                     {DVIDName.JobID,  cj.Name},
                     {DVIDName.PortID, PortId[module] },
                     {DVIDName.SlotID, (slotID+1).ToString() },
-                    {DVIDName.CarrierID, cj.CarrierID==null?"":cj.CarrierID.ToString()},
+                    {DVIDName.CarrierID, waferInfo.OriginCarrierID==null?"":waferInfo.OriginCarrierID},
                     {DVIDName.SequenceID,waferInfo.SequenceName }
                 });
             }
@@ -209,7 +209,7 @@ namespace Venus_RT.Modules
                     {DVIDName.JobID,  cj.Name},
                     {DVIDName.PortID, PortId[module] },
                     {DVIDName.SlotID, (slotID+1).ToString() },
-                    {DVIDName.CarrierID, cj.CarrierID==null?"":cj.CarrierID.ToString()},
+                    {DVIDName.CarrierID, wafer.OriginCarrierID==null?"":wafer.OriginCarrierID},
                     {DVIDName.WaferProcessResult, (wafer.ProcessState == EnumWaferProcessStatus.Failed ? 0:1).ToString()},
                     {DVIDName.SequenceID,wafer.SequenceName }
                 });

Venus/Venus_RT/Modules/PMs/PMProcess_FA.cs

@@ -130,7 +130,7 @@ namespace Venus_RT.Modules.PMs
                     {DVIDName.PortID, PortId[wafer.OriginStation]},
                     {DVIDName.SlotID, (wafer.OriginSlot+1).ToString()},
                     {DVIDName.LotID, wafer.LotId},
-                    {DVIDName.CarrierID,wafer.OriginCarrierID.ToString() }
+                    {DVIDName.CarrierID,wafer.OriginCarrierID == null ? "" : wafer.OriginCarrierID }
                 });
             }
             else
@@ -141,7 +141,7 @@ namespace Venus_RT.Modules.PMs
                     {DVIDName.StationName,  module},
                     {DVIDName.SlotID, (wafer.OriginSlot+1).ToString()},
                     {DVIDName.LotID, wafer.LotId},
-                    {DVIDName.CarrierID,wafer.OriginCarrierID.ToString() }
+                    {DVIDName.CarrierID,wafer.OriginCarrierID==null?"":wafer.OriginCarrierID }
                 });
             }
         }
@@ -230,7 +230,7 @@ namespace Venus_RT.Modules.PMs
                     {DVIDName.SlotID, (wafer.OriginSlot + 1).ToString()},
                     //{DVIDName.RecipeStepEndDataSummary, fdc},
                     {DVIDName.LotID, wafer.LotId},
-                    {DVIDName.CarrierID,wafer.OriginCarrierID.ToString() }
+                    {DVIDName.CarrierID,wafer.OriginCarrierID==null?"":wafer.OriginCarrierID }
                 });
             }
             else
@@ -243,7 +243,7 @@ namespace Venus_RT.Modules.PMs
                     {DVIDName.SlotID, (wafer.OriginSlot + 1).ToString()},
                     //{DVIDName.RecipeStepEndDataSummary, fdc},
                     {DVIDName.LotID, wafer.LotId},
-                    {DVIDName.CarrierID,wafer.OriginCarrierID.ToString() }
+                    {DVIDName.CarrierID,wafer.OriginCarrierID==null?"":wafer.OriginCarrierID }
 
                 });
             }
@@ -266,7 +266,7 @@ namespace Venus_RT.Modules.PMs
                     {DVIDName.PortID, PortId[wafer.OriginStation]},
                     {DVIDName.SlotID, (wafer.OriginSlot + 1).ToString()},
                     {DVIDName.LotID, wafer.LotId},
-                    {DVIDName.CarrierID,wafer.OriginCarrierID.ToString() }
+                    {DVIDName.CarrierID,wafer.OriginCarrierID==null?"":wafer.OriginCarrierID }
                 });
             }
             else
@@ -278,7 +278,7 @@ namespace Venus_RT.Modules.PMs
                     {DVIDName.RecipeStepNumber, (stepNumber + 1).ToString()},
                     {DVIDName.SlotID, (wafer.OriginSlot + 1).ToString()},
                     {DVIDName.LotID, wafer.LotId},
-                    {DVIDName.CarrierID,wafer.OriginCarrierID.ToString() }
+                    {DVIDName.CarrierID,wafer.OriginCarrierID==null?"":wafer.OriginCarrierID.ToString() }
                 });
             }
         }