fix

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -636,7 +636,7 @@ namespace WCS.Service.Extensions
                             Uploader.Upload(db);
                         }
                     }
-                    else throw new Exception($"[{Entity.CODE}]任务类型错误");
+                    else throw new Exception($"[{Entity.CODE}]任务类型错误,{task.ID}");
 
                     task.CreateStatusLog(db, $"状态由[{TaskStatus.堆垛机执行}]变更为[{task.STATUS}]", this.GetType());
                 }
@@ -654,27 +654,8 @@ namespace WCS.Service.Extensions
                     var ELine = i == 0 ? Data.ELine_1.ToString() : Data.ELine_2.ToString();
                     task = db.Default.Set<WCS_TASK>().Single(v => taskIds[i] == v.ID);
 
-                    if (task.TYPE == TaskType.入库 && task.STATUS == TaskStatus.已完成)
-                    {
-                        if (i == 0) Data.FinishedACK_1 = 1;
-                        else Data.FinishedACK_2 = 1;
-                    }
-                    else if (task.TYPE == TaskType.出库 && task.STATUS == TaskStatus.堆垛机完成)
-                    {
-                        var target = Device.Find(ELine).Create<StationDevice>();
-                        target.Data.Tasknum = task.ID;
-                        target.Data.Goodsstart = ELine.ToShort();
-                        target.Data.Goodsend = task.ADDRNEXT.ToShort();
-
                         if (i == 0) Data.FinishedACK_1 = 1;
                         else Data.FinishedACK_2 = 1;
-                    }
-                    else if (task.TYPE == TaskType.移库 && task.STATUS == TaskStatus.堆垛机完成)
-                    {
-                        if (i == 0) Data.FinishedACK_1 = 1;
-                        else Data.FinishedACK_2 = 1;
-                    }
-                    else throw new Exception($"[{Entity.CODE}]任务类型错误");
 
                     task.CreateStatusLog(db, $"状态由[{TaskStatus.堆垛机执行}]变更为[{task.STATUS}]", this.GetType());
                 }

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

@@ -29,7 +29,7 @@ namespace WCS.Service.Works.Station
                 {
                     //找到所有的AGV任务
                     var agvTasks = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库)
-                    .Where(v => v.Status < AGVTaskStatus.完成).Where(v => v.Station == obj.Entity.CODE).ToArray();
+                    .Where(v => v.Status < AGVTaskStatus.完成).ToArray();
 
                     foreach (var agvtask in agvTasks)
                     {
@@ -76,6 +76,7 @@ namespace WCS.Service.Works.Station
                         {
                             if (agvtask.AGVStatus == AGVTaskStatus.请求_允许)
                             {
+                                if (agvtask.Station != obj.Entity.CODE) continue;
                                 if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.高位))) continue;
                                 if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动))) continue;
                                 if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态))) continue;