fix

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

@@ -189,11 +189,19 @@ namespace WCS.Service.Works
                              .Where(v => v.Data.PH_STATUS && v.Data.TASKNUM > 10000 && !v.Data2.CONFIRM && v.Data.GOODSEND != Convert.ToInt16(v.Entity.CODE))//需要取货的站点
                              .Where(v => //是否可以进行取货，主要用于判断放货位是否有货
                              {
-                                 var end = Device.Find(v.Data.GOODSEND.ToString()).Device<IStation521>();
+                                 var code = "";
+                                 switch (v.Data.GOODSEND)
+                                 {
+                                     case 2366: code = "2359"; break; //二车间
+                                     case 2328: code = "2114"; break; //一车间
+                                     case 2385: code = "2359"; break; //三车间
+                                 };
+
+                                 var end = Device.Find(code).Device<IStation521>();
 
                                  var res = true;
-                                 if (end.Data.TASKNUM == 0) res = false;
-                                 else if (end.Data.PH_STATUS == false) res = false;
+                                 if (end.Data.TASKNUM != 0) res = false;
+                                 else if (end.Data.PH_STATUS) res = false;
                                  // RGV可以到达放货地址,此处判断取反
                                  else if (!dev.Entity.ROUTES.Any(p => p.NEXT.CODE == end.Entity.CODE)) res = false;
 
@@ -225,11 +233,11 @@ namespace WCS.Service.Works
             {
                 //if (dev.Data.RES is 2114)
                 //{
-                    dev.Data2.TaskID_2 = validPickupPoint.Data.TASKNUM;
-                    dev.Data2.TaskType_2 = Convert.ToInt16(DRGVTaskType.取货);
-                    dev.Data2.StartPosition_2 = Convert.ToInt16(next1.CODE);
-                    dev.Data2.DestPosition_2 = Convert.ToInt16(validPickupPoint.Entity.CODE);
-                    dev.Data2.Trigger_2 = 1;
+                dev.Data2.TaskID_2 = validPickupPoint.Data.TASKNUM;
+                dev.Data2.TaskType_2 = Convert.ToInt16(DRGVTaskType.取货);
+                dev.Data2.StartPosition_2 = Convert.ToInt16(next1.CODE);
+                dev.Data2.DestPosition_2 = Convert.ToInt16(validPickupPoint.Entity.CODE);
+                dev.Data2.Trigger_2 = 1;
                 //}
                 //else
                 //{