fix:

Projects/永冠OPP/WCS.Service/DeviceExtentions.cs

@@ -41,7 +41,7 @@ namespace WCS.Service
         /// <returns></returns>
         public static List<WCS_DEVICE> GetPath(this WCS_DEVICE source, string endAddr, Func<List<WCS_DEVICE>, bool> condition = null)
         {
-            var q = source.PATHS.Where(v => v.START == source && v.END.CODE.Contains(endAddr.ToUpper()))
+            var q = source.PATHS.Where(v => v.START == source  & v.END.CODE.Contains(endAddr.ToUpper()))
                 .Select(v => v.PATH.Split('-').Select(v => Device.Find(v)).ToList());
 
             if (condition != null)
@@ -59,7 +59,7 @@ namespace WCS.Service
         /// <returns></returns>
         public static WCS_DEVICE GetPath(this WCS_DEVICE source, string endAddr)
         {
-            var q = source.PATHS.Where(v => v.START == source && v.END != null && v.END.CODE.Contains(endAddr.ToUpper()))
+            var q = source.PATHS.Where(v => v.START == source && v.END.CODE.Contains(endAddr.ToUpper()))
                 .Select(v => v.PATH.Split('-').Select(v => Device.Find(v)).ToList());
 
             return q.FirstOrDefault().FirstOrDefault();

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -425,7 +425,7 @@ namespace WCS.Service.Extensions
         /// <returns></returns>
         public StationDeviceGroup CurrentStation()
         {
-            return LocationList.Where(v => v.Entity.Is(DF.涂布出库RGV取货站台) || v.Entity.Is(DF.涂布入库RGV取货站台)).Where(v =>
+            return LocationList.Where(v => v.Entity.Is(DF.涂布RGV取货设备组)).Where(v =>
               {
                   //RGV与站台距离误差为 正负50500
                   var max = v.Position + 500;
@@ -441,8 +441,8 @@ namespace WCS.Service.Extensions
         /// <returns></returns>
         public float Distance(RGVDevice rgv)
         {
-            return Math.Abs((Position - rgv.Position + Length) % Length);
-            //return DevEX.Distance(Position, after.Position, Length);
+            //return Math.Abs((Position - rgv.Position + Length) % Length);
+            return DevEX.Distance(Position, rgv.Position, Length);
         }
 
         /// <summary>

Projects/永冠OPP/WCS.Service/WebApi/WMS/WMS.cs

@@ -196,8 +196,8 @@ namespace WCS.Service
                 var tcode = "TY" + v.TunnelNum;
 
                 var tunnel = Device.Find(tcode);
-                var next = tunnel.GetNext(devCode);
-                v.Memo1 = next.CODE;
+                //var next = tunnel.GetPath(devCode);
+                //v.Memo1 = next.CODE;
                 v.TunnelNum = tunnel.CODE;
             });
             return res.WMSTasks;

Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

@@ -110,7 +110,7 @@ namespace WCS.Service.Works.RGV
                 if (pickStation != null)
                 {
                     // 检查取货点是否需要取货
-                    pickStation.WhetherToExecute();
+                    //pickStation.WhetherToExecute();
                     // 筛选出有任务号和起始及目标地址的设备
                     var devs = pickStation.RGVGetTaskedDevice();
                     //是否需要取货
@@ -164,7 +164,7 @@ namespace WCS.Service.Works.RGV
                         //取小车的目标位置值
                         var destStation = Device.Find($"G{afterStation.Data2.DestPosition_1}").Create<StationDeviceGroup>();
                         //取被挡住小车的目标位置的下一个取货点
-                        var beforeSickStation = Device.Where(v => v.Is(DF.涂布出库RGV取货站台) || v.Is(DF.涂布入库RGV取货站台) && v.CODE != destStation.Entity.CODE)
+                        var beforeSickStation = Device.Where(v => v.Is(DF.涂布RGV取货设备组) && v.CODE != destStation.Entity.CODE)
                                       .Select(v => v.Create<StationDeviceGroup>())
                                       .OrderBy(v => destStation.Distance(v))
                                       .FirstOrDefault();

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -324,6 +324,9 @@ namespace WCS.Service.Works.SRM
                                 var fork = obj.GetFork(item, i);
                                 //获取站台及下一个地址
                                 task.GetSrmStationAndaddNext(fork);
+                                if (task.ADDRTO == "G1340") {
+                                    var a = "";
+                                }
                                 db.Default.SaveChanges();
                                 Uploader.Upload(db);
                                 var msg = "";

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

@@ -204,7 +204,7 @@ namespace WCS.Service.Works.Station
                                      TUNNEL = outTask.TunnelNum,
                                      WMSTASK = int.Parse(outTask.WMSTaskNum),
                                      UPDATEUSER = "WCS",
-                                     SRMSTATION = outTask.Memo1,
+                                     SRMSTATION = "",
                                      DEVICE = srm.CODE,
                                      //ADDRCURRENT = loc,
                                      AgvTask = agvtask.ID,