直穿新增放货调回取货点

Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

@@ -24,6 +24,16 @@ namespace WCS.Service.Works.RGV
                 if (rgv.Data2.WorkMode != RGVMode.自动) throw new DoException($"{rgv.Data2.WorkMode}");
                 if (rgv.Data2.SystemStatus != RGVRunStatus.空闲) throw new DoException($"{rgv.Data2.SystemStatus}");
 
+                //RGV状态为 RGV到站&&任务完成 时程序认为RGV当前不在取货点
+                if (rgv.Data2.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.RGV到站) && rgv.Data2.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.任务完成))
+                {
+                    //下达一个目标为1030的移动任务
+                    rgv.Data.TaskID_1 = 1030;
+                    rgv.Data.StartPosition_1 = 1030;
+                    rgv.Data.TaskType_1 = RGVTaskType.移动;
+                    rgv.Data.Trigger_1++;
+                }
+
                 var obj = Device.Find(ConvGroup_1030).Create<StationDeviceGroup>();
 
                 obj.WhetherToExecute();
@@ -61,8 +71,8 @@ namespace WCS.Service.Works.RGV
 
                     foreach (var task in tasks)
                     {
-                        var msg = $"下达从{rgv.Data.StartPosition_1}移动至{ rgv.Data.DestPosition_1}的RGV PLC指令。";
-                        msg += $"[{ task.ID}][{rgv.Data.StartPosition_1}][{rgv.Data.DestPosition_1}[{ rgv.Data.Trigger_1}]";
+                        var msg = $"下达从{rgv.Data.StartPosition_1}移动至{rgv.Data.DestPosition_1}的RGV PLC指令。";
+                        msg += $"[{task.ID}][{rgv.Data.StartPosition_1}][{rgv.Data.DestPosition_1}[{rgv.Data.Trigger_1}]";
 
                         task.CreateStatusLog(db, msg, this.GetType());
                     }
@@ -146,8 +156,8 @@ namespace WCS.Service.Works.RGV
 
                                 foreach (var task in tasks)
                                 {
-                                    var msg = $"下达从{obj.Data.StartPosition_1}移动至{ obj.Data.DestPosition_1}的RGV PLC指令。";
-                                    msg += $"[{ task.ID}][{obj.Data.StartPosition_1}][{obj.Data.DestPosition_1}[{ obj.Data.Trigger_1}]";
+                                    var msg = $"下达从{obj.Data.StartPosition_1}移动至{obj.Data.DestPosition_1}的RGV PLC指令。";
+                                    msg += $"[{task.ID}][{obj.Data.StartPosition_1}][{obj.Data.DestPosition_1}[{obj.Data.Trigger_1}]";
 
                                     task.CreateStatusLog(db, msg, this.GetType());
                                 }
@@ -277,8 +287,8 @@ namespace WCS.Service.Works.RGV
 
                                 foreach (var task in tasks)
                                 {
-                                    var msg = $"下达从{obj.Data.StartPosition_1}移动至{ obj.Data.DestPosition_1}的RGV PLC指令。";
-                                    msg += $"[{ task.ID}][{obj.Data.StartPosition_1}][{obj.Data.DestPosition_1}[{ obj.Data.Trigger_1}]";
+                                    var msg = $"下达从{obj.Data.StartPosition_1}移动至{obj.Data.DestPosition_1}的RGV PLC指令。";
+                                    msg += $"[{task.ID}][{obj.Data.StartPosition_1}][{obj.Data.DestPosition_1}[{obj.Data.Trigger_1}]";
 
                                     task.CreateStatusLog(db, msg, this.GetType());
                                 }