fix

WCS.WorkEngineering/Systems/SrmSystems.cs

@@ -43,10 +43,10 @@ namespace WCS.WorkEngineering.Systems
             {
                 //取货设备
                 var srm = item.Targets.Where(v => v.HasFlag(DeviceFlags.堆垛机)).FirstOrDefault();
-                PickUpDevices.Add(srm.Code, item.Targets.Where(v => v.HasFlag(DeviceFlags.输送机)).Select(v => new Station(v, this.World)).ToList());
+                PickUpDevices.Add(srm.Code, item.Sources.Where(v => v.HasFlag(DeviceFlags.输送机)).Select(v => new Station(v, this.World)).ToList());
                 //放货设备
                 srm = item.Sources.Where(v => v.HasFlag(DeviceFlags.堆垛机)).FirstOrDefault();
-                PutDevices.Add(srm.Code, item.Sources.Where(v => v.HasFlag(DeviceFlags.输送机)).Select(v => new Station(v, this.World)).ToList());
+                PutDevices.Add(srm.Code, item.Targets.Where(v => v.HasFlag(DeviceFlags.输送机)).Select(v => new Station(v, this.World)).ToList());
             }
         }
 

WCS.WorkEngineering/Systems/一楼叠盘机入库.cs

@@ -4,7 +4,6 @@ using System.ComponentModel;
 using WCS.Core;
 using WCS.Entity;
 using WCS.WorkEngineering.Extensions;
-using WCS.WorkEngineering.Protocol.BCR;
 using WCS.WorkEngineering.Protocol.Station;
 using WCS.WorkEngineering.WebApi.Controllers;
 using WCS.WorkEngineering.WebApi.Models.WMS.Request;
@@ -73,21 +72,28 @@ namespace WCS.WorkEngineering.Systems
                         if (res.ResCode == WebApi.Models.WMS.Response.ResponseStatusCodeEnum.Sucess) return;
                     }
                     //找到对应的任务
-                    task = db.Queryable<WCS_TaskInfo>().First(v => v.BarCode == barcode);
-                    if (task.Status == Entity.TaskStatus.WaitingToExecute)
+                    var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.BarCode == barcode);
+                    if (taskInfo.Status == Entity.TaskStatus.WaitingToExecute)
                     {
                         var tunnel = obj.Entity.Targets.Where(v => v.HasFlag(Extensions.DeviceFlags.巷道)).FirstOrDefault();
                         //开始对任务进行处理
-                        task.Status = Entity.TaskStatus.ConveyorExecution;
-                        task.StartTime = DateTime.Now;
-                        task.SrmStation = task.AddrFrom;
-                        task.LastInteractionPoint = obj.Entity.Code;
-                        task.Tunnel = tunnel.Code;
-                        task.Height = 2;
-
-                        task.AddWCS_TASK_DTL(_db, obj.Entity.Code, "开始执行入库任务");
-                        db.Updateable(task).ExecuteCommand();
-                        task.updateRedisHash();
+                        taskInfo.Status = Entity.TaskStatus.ConveyorExecution;
+                        taskInfo.StartTime = DateTime.Now;
+                        taskInfo.SrmStation = taskInfo.AddrFrom;
+                        taskInfo.LastInteractionPoint = obj.Entity.Code;
+                        taskInfo.Tunnel = tunnel.Code;
+                        taskInfo.Height = 2;
+                        switch (obj.Entity.Code)
+                        {
+                            case "2527": taskInfo.Device = "SRM1"; break;
+                            case "2727": taskInfo.Device = "SRM2"; break;
+                            case "2528": taskInfo.Device = "SRM1"; break;
+                            case "2728": taskInfo.Device = "SRM2"; break;
+                        };
+                        taskInfo.AddWCS_TASK_DTL(_db, obj.Entity.Code, "开始执行入库任务");
+                        db.Updateable(taskInfo).ExecuteCommand();
+                        taskInfo.updateRedisHash();
+                        task = taskInfo;
                     }
                     else return;
                 });