fix

Projects/永冠OPP/WCS.Service/Works/Station/一楼入库.cs

@@ -129,7 +129,7 @@ namespace WCS.Service.Works.Station
                         task.HEIGHT = dev.Data2.GoodsSize;
 
                         db.Default.Set<WCS_TASK>().Add(task);
-                        finishTaskList.Add(new Tuple<int, StationDevice>(task.ID, dev.Entity.Create<StationDevice>()));
+                        finishTaskList.Add(new Tuple<int, StationDevice>(task.WMSTASK, dev.Entity.Create<StationDevice>()));
 
                         var msg = $"下达从{dev.Entity.CODE}移动至{next}的PLC指令。";
                         msg += $"[{dev.Data.Tasknum}][{dev.Data.Goodsstart}][{dev.Data.Goodsend}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
@@ -144,8 +144,8 @@ namespace WCS.Service.Works.Station
                 {
                     foreach (var finishTask in finishTaskList)
                     {
-                        var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == finishTask.Item1);
-                        if (task != null) continue;
+                        var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finishTask.Item1);
+                        if (task == null) continue;
 
                         finishTask.Item2.Data.Tasknum = task.ID;
                         finishTask.Item2.Data.Goodsstart = task.ADDRFROM.ToShort();

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

@@ -81,7 +81,7 @@ namespace WCS.Service.Works.Station
                                 if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态))) continue;
                                 if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) continue;
                                 if (obj.Items.Any(v => v.Data2.Tasknum > 10000)) continue;
-                                if (db.Default.Set<WCS_AGVTask>().Any(v => v.Station == agvtask.Station && v.Status == agvtask.Status && v.ID != agvtask.ID)) continue;
+                                if (db.Default.Set<WCS_AGVTask>().Any(v => v.Station == agvtask.Station && v.Status == agvtask.AGVStatus && v.ID != agvtask.ID)) continue;
 
                                 agvtask.Status = agvtask.AGVStatus;
                                 agvtask.UpdateTime = DateTime.Now;

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

@@ -118,14 +118,14 @@ namespace WCS.Service.Works.Station
                     {
                         var Station1343 = Device.Find("1343").Create<StationDevice>();
                         addNext = "1343";
-                        if (Station1343.Data2.Status.HasFlag(IstationStatus.光电状态) && Station1343.Data3.Status.HasFlag(StationStatus.运行状态位))
+                        if (!Station1343.Data3.Status.HasFlag(StationStatus.自动) || Station1343.Data2.Tasknum > 10000)
                             addNext = "1340";
                     }
                     else if (obj.Entity.CODE == "1341")
                     {
                         var Station1344 = Device.Find("1344").Create<StationDevice>();
                         addNext = "1344";
-                        if (Station1344.Data2.Status.HasFlag(IstationStatus.光电状态) && Station1344.Data3.Status.HasFlag(StationStatus.运行状态位))
+                        if (!Station1344.Data3.Status.HasFlag(StationStatus.自动) || Station1344.Data2.Tasknum > 10000)
                             addNext = "1341";
                     }