林豪 左 2 лет назад
Родитель
Сommit
4ba21072c1

+ 2 - 1
Projects/永冠OPP/WCS.Service/Extensions/TaskExtension.cs

@@ -140,7 +140,8 @@ namespace WCS.Service.Extensions
 
         public static void AGVStatusChange(this WCS_AGVTask task, AGVTaskStatus status, string type = "同步")
         {
-            InfoLog.INFO_AGV($"AGV状态更新Status:{task.Status},AGVStatus:{status},{type}");
+            var time = task.AGVUpdateTime - task.UpdateTime;
+            InfoLog.INFO_AGV($"WCS更新Status:{task.Status},AGVStatus:{status},{type};耗时:{time.Value.TotalMilliseconds}");
         }
     }
 

+ 6 - 6
Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -49,7 +49,7 @@ namespace WCS.Service.Works.Station
                             tasking.Status = AGVTaskStatus.执行;
                             tasking.UpdateTime = DateTime.Now;
                             db.Default.SaveChanges();
-                            tasking.AGVStatusChange(AGVTaskStatus.执行, "变更");
+                            tasking.AGVStatusChange(AGVTaskStatus.执行, "确认执行");
                             return;
                         }
                         //agv到达指定位置给确认后分配站台
@@ -81,7 +81,7 @@ namespace WCS.Service.Works.Station
                             tasking.Status = AGVTaskStatus.执行;
                             tasking.UpdateTime = DateTime.Now;
                             db.Default.SaveChanges();
-                            tasking.AGVStatusChange(AGVTaskStatus.执行, "变更");
+                            tasking.AGVStatusChange(AGVTaskStatus.执行, "分配放货点");
                             return;
                         }
                         else if (tasking.Status < tasking.AGVStatus)
@@ -162,7 +162,7 @@ namespace WCS.Service.Works.Station
                                 tasking.Status = tasking.AGVStatus;
                                 tasking.UpdateTime = DateTime.Now;
                                 db.Default.SaveChanges();
-                                tasking.AGVStatusChange(tasking.AGVStatus);
+                                tasking.AGVStatusChange(tasking.AGVStatus, "允许放货");
                                 return;
                             }
                             else if (tasking.AGVStatus == AGVTaskStatus.取放完成)
@@ -187,7 +187,7 @@ namespace WCS.Service.Works.Station
                                     dev.Data.Goodsnum = (short)tasking.Goodsnum;
                                     dev.Data.Istation521Status = IstationStatus.AGV放货完成信号;
                                 }
-                                tasking.AGVStatusChange(tasking.AGVStatus);
+                                tasking.AGVStatusChange(tasking.AGVStatus, "允许设备顶升下降");
                                 return;
                             }
                             else if (Ltc.Do(tasking, v => v.AGVStatus == AGVTaskStatus.完成))
@@ -200,7 +200,7 @@ namespace WCS.Service.Works.Station
                                 {
                                     dev.Data.Goodscode = tasking.ID;
                                 }
-                                tasking.AGVStatusChange(tasking.AGVStatus);
+                                tasking.AGVStatusChange(tasking.AGVStatus, "完成任务");
                                 return;
                             }
                             else if (Ltc.Do(tasking, v => v.AGVStatus == AGVTaskStatus.取消))
@@ -208,7 +208,7 @@ namespace WCS.Service.Works.Station
                                 tasking.Status = tasking.AGVStatus;
                                 tasking.UpdateTime = DateTime.Now;
                                 db.Default.SaveChanges();
-                                tasking.AGVStatusChange(tasking.AGVStatus);
+                                tasking.AGVStatusChange(tasking.AGVStatus, "取消任务");
                                 return;
                             }
                         }

+ 6 - 6
Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

@@ -509,7 +509,7 @@ namespace WCS.Service.Works.Station
                                  tasking.Status = AGVTaskStatus.确认;
                                  tasking.UpdateTime = DateTime.Now;
                                  db.Default.SaveChanges();
-                                 tasking.AGVStatusChange(AGVTaskStatus.确认, "变更");
+                                 tasking.AGVStatusChange(AGVTaskStatus.确认, "获取出库任务");
                              });
                              return;
                          }
@@ -518,14 +518,14 @@ namespace WCS.Service.Works.Station
                              tasking.Status = tasking.AGVStatus;
                              tasking.UpdateTime = DateTime.Now;
                              db.Default.SaveChanges();
-                             tasking.AGVStatusChange(tasking.AGVStatus);
+                             tasking.AGVStatusChange(tasking.AGVStatus, "完成任务");
                          }
                          else if (tasking.AGVStatus == AGVTaskStatus.取消)
                          {
                              tasking.Status = tasking.AGVStatus;
                              tasking.UpdateTime = DateTime.Now;
                              db.Default.SaveChanges();
-                             tasking.AGVStatusChange(tasking.AGVStatus);
+                             tasking.AGVStatusChange(tasking.AGVStatus, "取消任务");
                          }
                      }
                  });
@@ -569,7 +569,7 @@ namespace WCS.Service.Works.Station
                          agvtask.Status = AGVTaskStatus.执行;
                          agvtask.UpdateTime = DateTime.Now;
                          db.Default.SaveChanges();
-                         agvtask.AGVStatusChange(AGVTaskStatus.执行, "变更");
+                         agvtask.AGVStatusChange(AGVTaskStatus.执行, "分配取货点");
                      }
                      else if (agvtask.Status < agvtask.AGVStatus)
                      {
@@ -583,7 +583,7 @@ namespace WCS.Service.Works.Station
                              agvtask.Status = agvtask.AGVStatus;
                              agvtask.UpdateTime = DateTime.Now;
                              db.Default.SaveChanges();
-                             agvtask.AGVStatusChange(agvtask.AGVStatus);
+                             agvtask.AGVStatusChange(agvtask.AGVStatus, "允许取货");
                          }
                          else if (agvtask.AGVStatus == AGVTaskStatus.取放完成)
                          {
@@ -594,7 +594,7 @@ namespace WCS.Service.Works.Station
                              agvtask.Status = agvtask.AGVStatus;
                              agvtask.UpdateTime = DateTime.Now;
                              db.Default.SaveChanges();
-                             agvtask.AGVStatusChange(agvtask.AGVStatus);
+                             agvtask.AGVStatusChange(agvtask.AGVStatus, "允许设备下降顶升");
 
                              foreach (var dev in stationDeviceGroup.Items)
                              {