fix

Projects/永冠/WCS.Service/Works/RGV/RGVWork.cs

@@ -282,10 +282,10 @@ namespace WCS.Service.Works
             var station = Device.Find("3012").Device<IStation521, IStation520>();
             var station_3028 = Device.Find("3028").Device<IStation521, IStation520>();
             var station_3019 = Device.Find("3019").Device<IStation521, IStation520>();
-            if (station.Data.PH_STATUS && station.Data.GOODSEND == 3012)
+            if (station.Data.PH_STATUS && station.Data.GOODSEND == 3012 && station.Data.TASKNUM > 10000)
             {
                 short outTemp = 3060;
-                var arr = Device.Find("3006", "3060", "3001", "3005").Select(v => v.Device<IStation521, IStation520>()).ToArray();
+                var arr = Device.Find("3006", "3060", "3001", "3005", "3004").Select(v => v.Device<IStation521, IStation520>()).ToArray();
                 if (arr.Where(v => v.Data.GOODSEND == outTemp).Any())
                     throw new Exception("交通管制,提升机被入库任务占用");
                 if (arr.Where(v => v.Data.PH_STATUS && v.Data.TASKNUM == 0).Any()) throw new Exception("有光电无任务，交通管制,提升机被入库任务占用");
@@ -302,7 +302,7 @@ namespace WCS.Service.Works
                     station.Data2.GOODSEND = outTemp;
                 });
             }
-            if (station_3028.Data.PH_STATUS && station_3028.Data.GOODSEND == 3028)
+            if (station_3028.Data.PH_STATUS && station_3028.Data.GOODSEND == 3028 && station_3028.Data.TASKNUM > 10000)
             {
                 var station_3020 = Device.Find("3020").Device<IStation521, IStation520>();
                 if (!station_3020.Data.PH_STATUS && station_3020.Data.TASKNUM == 0)
@@ -312,7 +312,7 @@ namespace WCS.Service.Works
                         var task = db.Default.Set<WCS_TASK>().Find(station_3028.Data.TASKNUM);
                         if (task == null)
                             throw new Exception($"任务号{station.Data.TASKNUM}不存在");
-                        task.ADDRNEXT = station_3020.ToString();
+                        task.ADDRNEXT = station_3020.Entity.CODE;
                         task.UPDATETIME = DateTime.Now;
                         db.Default.SaveChanges();
                         station.Data2.TASKNUM = station.Data.TASKNUM;
@@ -320,7 +320,7 @@ namespace WCS.Service.Works
                     });
                 }
             }
-            if (station_3019.Data.PH_STATUS && station_3019.Data.GOODSEND == 3019)
+            if (station_3019.Data.PH_STATUS && station_3019.Data.GOODSEND == 3019 && station_3019.Data.TASKNUM > 10000)
             {
                 var station_3029 = Device.Find("3029").Device<IStation521, IStation520>();
                 if (!station_3029.Data.PH_STATUS && station_3029.Data.TASKNUM == 0)
@@ -330,7 +330,7 @@ namespace WCS.Service.Works
                         var task = db.Default.Set<WCS_TASK>().Find(station_3019.Data.TASKNUM);
                         if (task == null)
                             throw new Exception($"任务号{station_3019.Data.TASKNUM}不存在");
-                        task.ADDRNEXT = station_3029.ToString();
+                        task.ADDRNEXT = station_3029.Entity.CODE;
                         task.UPDATETIME = DateTime.Now;
                         db.Default.SaveChanges();
                         station_3019.Data2.TASKNUM = station.Data.TASKNUM;
@@ -352,12 +352,7 @@ namespace WCS.Service.Works
                              });
             if (!validPickupPoints.Any()) return;//不需要取货
 
-            Device<IStation521, IStation520, IStation523> validPickupPoint = null;
-
-            //是否包含小车当前所在站点，写死，如有变动必须改代码
-            //这一块的作用主要是用于解决小车就近取货问题
-            //当前站点没有需要取货的
-            if (validPickupPoint == null) validPickupPoint = validPickupPoints.OrderBy(v => v.UpdateTime).FirstOrDefault() ?? throw new Exception("没有站台需要取货");
+            var validPickupPoint = validPickupPoints.OrderBy(v => v.UpdateTime).FirstOrDefault() ?? throw new Exception("没有站台需要取货");
 
             dev.Data2.TaskID = validPickupPoint.Data.TASKNUM;
             dev.Data2.StartPosition = Convert.ToInt16(validPickupPoint.Entity.CODE);