|
|
@@ -37,10 +37,10 @@ namespace WCS.Service.Helpers
|
|
|
/// </summary>
|
|
|
public static void End(this RGVDevice rgv)
|
|
|
{
|
|
|
- if (rgv.Data2.Status_1.HasFlag(RGVStatus.RGV到站) && rgv.Data2.Status_1.HasFlag(RGVStatus.任务完成) && deviceTaskTimes.Any(v => v.DeviceCode == rgv.Entity.CODE && v.TaskType == rgv.Data2.TaskType_1.ToString()))
|
|
|
+ if (deviceTaskTimes.Any(v => v.DeviceCode == rgv.Entity.CODE && v.TaskType == rgv.Data2.TaskType_1.ToString()))
|
|
|
{
|
|
|
- var deviceTaskTime= deviceTaskTimes.Find(v => v.DeviceCode == rgv.Entity.CODE);
|
|
|
- deviceTaskTime.EndTime= DateTime.Now;
|
|
|
+ var deviceTaskTime = deviceTaskTimes.Find(v => v.DeviceCode == rgv.Entity.CODE);
|
|
|
+ deviceTaskTime.EndTime = DateTime.Now;
|
|
|
deviceTaskTime.SumTime = (deviceTaskTime.EndTime - deviceTaskTime.StartTime).TotalSeconds;
|
|
|
InfoLog.INFO_DEVICETASKTIME(JsonConvert.SerializeObject(deviceTaskTime));
|
|
|
deviceTaskTimes.Remove(deviceTaskTime);
|