空Layout不上报 ChargeStart/ChargeEnd/DisChargeStart/DisChargeEnd

Furnace/FurnaceRT/Equipments/Jobs/AutoTransfer.cs

@@ -1028,7 +1028,7 @@ namespace FurnaceRT.Equipments.Jobs
                 {
                     pj.SetState(EnumProcessJobState.ProcessingComplete);
                     JobDataRecorder.EndPJ(pj.InnerId.ToString(), 0, 0);
-
+                    _faCallback.EndDischarge(pj);
                 }
                 else
                 {
@@ -1050,7 +1050,7 @@ namespace FurnaceRT.Equipments.Jobs
                         {
                             pj.SetState(EnumProcessJobState.ProcessingComplete);
                             JobDataRecorder.EndPJ(pj.InnerId.ToString(), 0, 0);
-
+                            _faCallback.EndDischarge(pj);
                         }
                     }
                 }

Furnace/FurnaceRT/Equipments/Schedulers/SchedulerFACallback.cs

@@ -319,6 +319,8 @@ namespace FurnaceRT.Equipments.Schedulers
             }
             if (pj != null)
             {
+                if (pj.IsEmptyLayout)
+                    return;
                 EV.Notify(UniversalEvents.ChargeStart, new SerializableDictionary<string, object>()
                 {
                     {DataVariables.PRJobID,  pj.Name},
@@ -339,6 +341,8 @@ namespace FurnaceRT.Equipments.Schedulers
             }
             if (pj != null)
             {
+                if (pj.IsEmptyLayout)
+                    return;
                 EV.Notify(UniversalEvents.ChargeEnd, new SerializableDictionary<string, object>()
                 {
                     {DataVariables.PRJobID,  pj.Name},
@@ -361,6 +365,9 @@ namespace FurnaceRT.Equipments.Schedulers
 
             if (pj != null)
             {
+                if (pj.IsEmptyLayout)
+                    return;
+
                 EV.Notify(UniversalEvents.DischargeStart, new SerializableDictionary<string, object>()
                 {
                     {DataVariables.PRJobID,  pj.Name},
@@ -376,6 +383,9 @@ namespace FurnaceRT.Equipments.Schedulers
         {
             if (pj != null)
             {
+                if (pj.IsEmptyLayout)
+                    return;
+
                 EV.Notify(UniversalEvents.DischargeEnd, new SerializableDictionary<string, object>()
                 {
                     {DataVariables.PRJobID,  pj.Name},