所有wafer退出后 上报disChargeEnd事件

Furnace/FurnaceRT/Equipments/Jobs/AutoTransfer.cs

@@ -92,6 +92,7 @@ namespace FurnaceRT.Equipments.Jobs
         private Dictionary<string, R_TRIG> _logTrigDic = new Dictionary<string, R_TRIG>();
         private Dictionary<string, Tuple<FilterChecker, double>> _fimsCheckOxDensityDict = new Dictionary<string, Tuple<FilterChecker, double>>();
         private bool _isCoolingSkip = false;
+        private R_TRIG r_Trig_DisChargeEndEvent = new R_TRIG();
         public bool HasJobRunning
         {
             get { return _lstControlJobs.Count > 0; }
@@ -1035,12 +1036,16 @@ namespace FurnaceRT.Equipments.Jobs
                     if (pj.State == EnumProcessJobState.Processing)
                     {
                         var pmModule = Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM1] as PMModule;
+                        r_Trig_DisChargeEndEvent.CLK = CheckAllWaferReturned(pj, true);
+                        if (r_Trig_DisChargeEndEvent.Q)
+                        {
+                            _faCallback.EndDischarge(pj);
 
+                        }
                         if (CheckAllWaferReturned(pj, true) && pmModule.CheckRecipeIsCompleted(pj))
                         {
                             pj.SetState(EnumProcessJobState.ProcessingComplete);
                             JobDataRecorder.EndPJ(pj.InnerId.ToString(), 0, 0);
-                            _faCallback.EndDischarge(pj);
 
                         }
                     }
@@ -4813,7 +4818,7 @@ namespace FurnaceRT.Equipments.Jobs
                 if (needPAndCurrect > 0)
                 {
                     //判断dumy是否够补充p类型
-                    var surplusDumyCount = ( currentEDWaferNum) - needPAndCurrect;
+                    var surplusDumyCount = (currentEDWaferNum) - needPAndCurrect;
                     if (surplusDumyCount >= 0)
                     {
                         //判断剩余dumy是否足够Layout配置
@@ -4841,7 +4846,7 @@ namespace FurnaceRT.Equipments.Jobs
                                         currentEDWaferNum--;
                                         needPAndCurrect--;
                                     }
-                                  
+
                                 }
                             }
                         }
@@ -4868,7 +4873,7 @@ namespace FurnaceRT.Equipments.Jobs
                                             currentEDWaferNum--;
                                             needPAndCurrect--;
                                         }
-                                        
+
                                     }
                                 }
                             }
@@ -4889,7 +4894,7 @@ namespace FurnaceRT.Equipments.Jobs
                                             currentEDWaferNum--;
                                             needPAndCurrect--;
                                         }
-                                      
+
                                     }
                                 }
 
@@ -4909,7 +4914,7 @@ namespace FurnaceRT.Equipments.Jobs
                                             currentEDWaferNum--;
                                             needPAndCurrect--;
                                         }
-                                  
+
                                     }
                                 }
                             }