fix

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

@@ -156,9 +156,9 @@ namespace WCS.Service.Works
                     dev.Data2.DestPosition_1 = dev.Data2.StartPosition_1;
                     dev.Data.RES = dev.Data2.StartPosition_1;
                     dev.Data2.Trigger_1 = 1;
-                    
+
                 }
-                else if (dev.Data.PH_Status_2 && dev.Data.TaskType_2 != DRGVTaskType.放货 )//工位二需要放货
+                else if (dev.Data.PH_Status_2 && dev.Data.TaskType_2 != DRGVTaskType.放货)//工位二需要放货
                 {
                     if (dev.Data.TaskID_2 < 10000) throw new Exception("有光电无任务号");
 
@@ -191,7 +191,9 @@ namespace WCS.Service.Works
                              .Where(v => //是否可以进行取货，主要用于判断放货位是否有货
                              {
                                  var end = Device.Find(v.Data.GOODSEND.ToString()).Device<IStation521>();
-                                 var res = end.Data.TASKNUM == 0 && end.Data.PH_STATUS == false;
+                                 var res = true;
+                                 if (end.Data.TASKNUM == 0) res = false;
+                                 else if (end.Data.PH_STATUS == false) res = false;
                                  return res;
                              });
             if (!validPickupPoints.Any()) return;//不需要取货
@@ -204,7 +206,7 @@ namespace WCS.Service.Works
             else if (dev.Data.RES is 3041 or 3040) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "3041" or "3040");
             else if (dev.Data.RES is 3047 or 3048) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "3047" or "3048");
             //else if (dev.Data.RES is 2108 or 2359) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "2108" or "2114");
-            else if(dev.Data.RES is 2114 or 2359 or 2108) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "2114" or "2108");
+            else if (dev.Data.RES is 2114 or 2359 or 2108) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "2114" or "2108");
             //当前站点没有需要取货的
             if (validPickupPoint == null) validPickupPoint = validPickupPoints.OrderBy(v => v.UpdateTime).FirstOrDefault() ?? throw new Exception("没有站台需要取货");
 
@@ -213,7 +215,7 @@ namespace WCS.Service.Works
             {
                 dev.Data2.TaskID_1 = validPickupPoint.Data.TASKNUM;//dev.Data.TaskID_1;
                 dev.Data2.TaskType_1 = Convert.ToInt16(DRGVTaskType.取货);
-                dev.Data2.StartPosition_1 =  Convert.ToInt16(next1.CODE);
+                dev.Data2.StartPosition_1 = Convert.ToInt16(next1.CODE);
                 dev.Data2.DestPosition_1 = Convert.ToInt16(validPickupPoint.Entity.CODE);
                 dev.Data2.Trigger_1 = 1;
             }

Projects/永冠/WCS.Service/Works/Stations/成品车间.cs

@@ -372,9 +372,6 @@ namespace WCS.Service.Works.Stations
 
             if (Ltc.Do(dev, v => v.Data.TASKNUM == 0))
                 return;
-
-            if (Ltc.Do(dev, v => v.Data.GOODSEND != dev.Entity.Code()))
-                return;
             if (!dev.Data.REQUEST) return;
             if (!dev.Data.PH_STATUS) return;
 
@@ -392,7 +389,7 @@ namespace WCS.Service.Works.Stations
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return new string[] { "2359" }.Contains(dev.CODE);
+            return new string[] { "2359","2114" }.Contains(dev.CODE);
         }
     }
 }