drgv fix

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

@@ -153,7 +153,7 @@ namespace WCS.Service.Works
                     //TODO:放货站点有货检查
                     dev.Data2.TaskID_1 = dev.Data.TaskID_1;
                     dev.Data2.TaskType_1 = Convert.ToInt16(DRGVTaskType.放货);
-                    dev.Data2.StartPosition_1 = Convert.ToInt16(next);
+                    dev.Data2.DestPosition_1 = dev.Data2.StartPosition_1;
                     dev.Data.RES = dev.Data2.StartPosition_1;
                     dev.Data2.Trigger_1 = 1;
                     
@@ -172,7 +172,8 @@ namespace WCS.Service.Works
                     //TODO:放货站点有货检查
                     dev.Data2.TaskID_2 = dev.Data.TaskID_2;
                     dev.Data2.TaskType_2 = Convert.ToInt16(DRGVTaskType.放货);
-                    dev.Data2.StartPosition_2 = Convert.ToInt16(next);
+                    dev.Data2.DestPosition_2 = dev.Data2.StartPosition_2;
+                    //dev.Data2.StartPosition_2 = Convert.ToInt16(next);
                     dev.Data.RES = dev.Data2.StartPosition_2;
                     dev.Data2.Trigger_2 = 1;
                 }
@@ -202,31 +203,34 @@ namespace WCS.Service.Works
             if (dev.Data.RES is 3035 or 3036) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "3035" or "3036");
             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 3052 or 2108) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "3052" or "2108");
+            else if (dev.Data.RES is 2390 or 2108) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "2390" or "2108");
+            else if(dev.Data.RES is 2114) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "2114");
             //当前站点没有需要取货的
             if (validPickupPoint == null) validPickupPoint = validPickupPoints.OrderBy(v => v.UpdateTime).FirstOrDefault() ?? throw new Exception("没有站台需要取货");
 
-            if (validPickupPoint.Entity.CODE is "" or "" or "") //一工位取货点
+            var next1 = dev.Entity.GetNext(validPickupPoint.Data.GOODSEND.ToString());
+            if (validPickupPoint.Entity.CODE is "2114" or "2108" or "3046") //一工位取货点
             {
-                dev.Data2.TaskID_1 = dev.Data.TaskID_1;
+                dev.Data2.TaskID_1 = validPickupPoint.Data.TASKNUM;//dev.Data.TaskID_1;
                 dev.Data2.TaskType_1 = Convert.ToInt16(DRGVTaskType.取货);
-                dev.Data2.StartPosition_1 = Convert.ToInt16(validPickupPoint.Data.GOODSEND);
+                dev.Data2.StartPosition_1 =  Convert.ToInt16(next1.CODE);
+                dev.Data2.DestPosition_1 = Convert.ToInt16(validPickupPoint.Entity.CODE);
                 dev.Data2.Trigger_1 = 1;
             }
-            else if (validPickupPoint.Entity.CODE is "" or "" or "") //二工位取货点
-            {
-                dev.Data2.TaskID_2 = dev.Data.TaskID_2;
-                dev.Data2.TaskType_2 = Convert.ToInt16(DRGVTaskType.取货);
-                dev.Data2.StartPosition_2 = Convert.ToInt16(validPickupPoint.Data.GOODSEND);
-                dev.Data2.Trigger_2 = 1;
-            }
+            //else if (validPickupPoint.Entity.CODE is "" or "" or "") //二工位取货点
+            //{
+            //    dev.Data2.TaskID_2 = dev.Data.TaskID_2;
+            //    dev.Data2.TaskType_2 = Convert.ToInt16(DRGVTaskType.取货);
+            //    dev.Data2.StartPosition_2 = Convert.ToInt16(validPickupPoint.Data.GOODSEND);
+            //    dev.Data2.Trigger_2 = 1;
+            //}
 
             #endregion 取货任务
         }
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return dev.CODE is "RGV4" or "RGV6";
+            return dev.CODE is "RGV4";
         }
     }