fix

分拣库/WCS.Entity.Protocol/SRM/ISRM520.cs

@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Entity.Protocol.SRM
+{
+    /// <summary>
+    ///  堆垛机DB520
+    /// </summary>
+    public interface ISRM520 : IProtocol
+    {
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        short Res1 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        short Res2 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        short Res3 { get; set; }
+
+        /// <summary>
+        ///  货物类型
+        /// </summary>
+        [Description("货物类型")]
+        short GoodsType { get; set; }
+
+        /// <summary>
+        ///  运行速度
+        /// </summary>
+        [Description("运行速度")]
+        SrmRunSpeedEnum RunSpeed { get; set; }
+
+        /// <summary>
+        ///  任务起始行
+        /// </summary>
+        [Description("任务起始行")]
+        short RowPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始列
+        /// </summary>
+        [Description("任务起始列")]
+        short TravelPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始层
+        /// </summary>
+        [Description("任务起始层")]
+        short LiftPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始深度
+        /// </summary>
+        [Description("任务起始深度")]
+        ForkPosition ForkStartPos1 { get; set; }
+
+        /// <summary>
+        ///  任务目标行
+        /// </summary>
+        [Description("任务目标行")]
+        short RowPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标列
+        /// </summary>
+        [Description("任务目标列")]
+        short TravelPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标层
+        /// </summary>
+        [Description("任务目标层")]
+        short LiftPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标深度
+        /// </summary>
+        [Description("任务目标深度")]
+        ForkPosition ForkStartPos2 { get; set; }
+
+        /// <summary>
+        ///  任务号
+        /// </summary>
+        [Description("任务号")]
+        int TaskNumber { get; set; }
+
+        /// <summary>
+        ///  凭证号
+        /// </summary>
+        [Description("凭证号")]
+        short VoucherNo { get; set; }
+
+        /// <summary>
+        ///  完成任务确认清除信号
+        /// </summary>
+        [Description("完成任务确认清除信号")]
+        short OkAck { get; set; }
+
+        /// <summary>
+        ///  任务类型
+        /// </summary>
+        [Description("任务类型")]
+        SrmTaskTypeEnum TaskType { get; set; }
+
+        /// <summary>
+        ///  指令类型
+        /// </summary>
+        [Description("指令类型")]
+        short Cmd { get; set; }
+
+    }
+}

分拣库/WCS.Entity.Protocol/SRM/ISRM521.cs

@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Entity.Protocol.SRM
+{
+    /// <summary>
+    ///  堆垛机DB521
+    /// </summary>
+    public interface ISRM521 : IProtocol
+    {
+        /// <summary>
+        ///  状态
+        /// </summary>
+        [Description("状态")]
+        SrmStatus Status { get; set; }
+
+        /// <summary>
+        ///  自动状态
+        /// </summary>
+        [Description("自动状态")]
+        SrmAutoStatus AutoStatus { get; set; }
+
+        /// <summary>
+        ///  运行状态
+        /// </summary>
+        [Description("运行状态")]
+        SrmRunStatus RunStatus { get; set; }
+
+        /// <summary>
+        ///  任务起始行
+        /// </summary>
+        [Description("任务起始行")]
+        short RowPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始列
+        /// </summary>
+        [Description("任务起始列")]
+        short TravelPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始层
+        /// </summary>
+        [Description("任务起始层")]
+        short LiftPos1 { get; set; }
+
+        /// <summary>
+        ///  任务起始深度
+        /// </summary>
+        [Description("任务起始深度")]
+        ForkPosition ForkDestPos1 { get; set; }
+
+        /// <summary>
+        ///  任务目标行
+        /// </summary>
+        [Description("任务目标行")]
+        short RowPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标列
+        /// </summary>
+        [Description("任务目标列")]
+        short TravelPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标层
+        /// </summary>
+        [Description("任务目标层")]
+        short LiftPos2 { get; set; }
+
+        /// <summary>
+        ///  任务目标深度
+        /// </summary>
+        [Description("任务目标深度")]
+        ForkPosition ForkDestPos2 { get; set; }
+
+        /// <summary>
+        ///  任务号
+        /// </summary>
+        [Description("任务号")]
+        int TaskNumber { get; set; }
+
+        /// <summary>
+        ///  凭证号
+        /// </summary>
+        [Description("凭证号")]
+        short VoucherNo { get; set; }
+
+        /// <summary>
+        ///  当前行
+        /// </summary>
+        [Description("当前行")]
+        short SrmRow { get; set; }
+
+        /// <summary>
+        ///  当前列
+        /// </summary>
+        [Description("当前列")]
+        short SrmTravel { get; set; }
+
+        /// <summary>
+        ///  当前层
+        /// </summary>
+        [Description("当前层")]
+        short SrmLayer { get; set; }
+
+        /// <summary>
+        ///  完成任务号
+        /// </summary>
+        [Description("完成任务号")]
+        int TaskFinishiId { get; set; }
+
+        /// <summary>
+        ///  行走当前位置 MM
+        /// </summary>
+        [Description("行走当前位置 MM")]
+        int TravelPos { get; set; }
+
+        /// <summary>
+        ///  提升当前位置 MM
+        /// </summary>
+        [Description("提升当前位置 MM")]
+        int LiftPos { get; set; }
+
+        /// <summary>
+        ///  货叉当前位置 MM
+        /// </summary>
+        [Description("货叉当前位置 MM")]
+        int ForkPos1 { get; set; }
+
+        /// <summary>
+        ///  运行速度
+        /// </summary>
+        [Description("运行速度")]
+        SrmRunSpeedEnum RunSpeed { get; set; }
+
+        /// <summary>
+        ///  任务类型
+        /// </summary>
+        [Description("任务类型")]
+        SrmTaskTypeEnum TaskType { get; set; }
+
+        /// <summary>
+        ///  运行总里程
+        /// </summary>
+        [Description("运行总里程")]
+        float TotalKm { get; set; }
+
+        /// <summary>
+        ///  货物类型
+        /// </summary>
+        [Description("货物类型")]
+        short GoodsType { get; set; }
+
+        /// <summary>
+        ///  运行总时长
+        /// </summary>
+        [Description("运行总时长")]
+        float RunTime { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        int Res3 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        int Res4 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        int Res5 { get; set; }
+
+        /// <summary>
+        ///  备用
+        /// </summary>
+        [Description("备用")]
+        int Res6 { get; set; }
+
+    }
+}

分拣库/WCS.Entity.Protocol/SRM/ISRM523.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel;
+
+namespace WCS.Entity.Protocol.SRM
+{
+    /// <summary>
+    ///  堆垛机DB523
+    /// </summary>
+    public interface ISRM523 : IProtocol
+    {
+        /// <summary>
+        ///  报警内容
+        /// </summary>
+        [Description("报警内容")]
+        long Alarm { get; set; }
+    }
+}

分拣库/WCS.Entity.Protocol/SRM/SrmEnum.cs

@@ -0,0 +1,237 @@
+using System;
+
+namespace WCS.Entity.Protocol.SRM
+{
+    /// <summary>
+    /// 运行模式
+    /// </summary>
+    public enum SrmRunSpeedEnum : short
+    {
+        /// <summary>
+        ///  默认
+        /// </summary>
+        Default = 0,
+
+        /// <summary>
+        ///  低速
+        /// </summary>
+        LowSpeed = 1,
+    }
+
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    public enum SrmTaskTypeEnum : short
+    {
+        /// <summary>
+        ///  默认 出入库移库使用该任务类型
+        /// </summary>
+        Default = 0,
+
+        /// <summary>
+        ///  完成任务
+        /// </summary>
+        FinishTask = 1,
+
+        /// <summary>
+        ///  删除任务
+        /// </summary>
+        DeleteTask = 2,
+
+        /// <summary>
+        ///  移动任务
+        /// </summary>
+        MoveTask = 3,
+    }
+
+    /// <summary>
+    /// 货叉位置
+    /// </summary>
+    public enum ForkPosition : short
+    {
+        /// <summary>
+        ///  中位
+        /// </summary>
+        Centr = 0,
+
+        /// <summary>
+        ///  一深度
+        /// </summary>
+        OneDepth = 1,
+
+        /// <summary>
+        /// 二深度
+        /// </summary>
+        TwoDepth = 2
+    }
+
+    /// <summary>
+    /// 运行模式
+    /// </summary>
+    public enum SrmAutoStatus : short
+    {
+        /// <summary>
+        ///  自动
+        /// </summary>
+        Automatic = 0,
+
+        /// <summary>
+        ///  半自动
+        /// </summary>
+        SemiAutomatic = 1,
+
+        /// <summary>
+        ///  手动
+        /// </summary>
+        Manual = 2,
+
+        /// <summary>
+        ///  保持维修
+        /// </summary>
+        KeepInRepair
+    }
+
+    /// <summary>
+    /// 运行状态
+    /// </summary>
+    public enum SrmRunStatus : short
+    {
+        /// <summary>
+        ///  空闲
+        /// </summary>
+        Idle = 1,
+
+        /// <summary>
+        ///  取货行走
+        /// </summary>
+        GetGoodsWalk = 2,
+
+        /// <summary>
+        ///  取货伸叉
+        /// </summary>
+        GetGoodsOutstretchFork = 3,
+
+        /// <summary>
+        ///  取货抬叉
+        /// </summary>
+        GetGoodsLiftFork = 4,
+
+        /// <summary>
+        ///  取货收叉
+        /// </summary>
+        GetGoodsRetractFork = 5,
+
+        /// <summary>
+        ///  放货行走
+        /// </summary>
+        PutGoodsWalk = 6,
+
+        /// <summary>
+        ///  放货伸叉
+        /// </summary>
+        PutGoodsOutstretchFork = 7,
+
+        /// <summary>
+        ///  放货降叉
+        /// </summary>
+        PutGoodsDropFork = 6,
+
+        /// <summary>
+        ///  放货收叉
+        /// </summary>
+        PutGoodsRetractFork = 7,
+    }
+
+    /// <summary>
+    /// 堆垛机状态
+    /// </summary>
+    public enum SrmStatus : ushort
+    {
+        /// <summary>
+        ///  PLC的握手信号
+        /// </summary>
+        HandshakeTowcs = 1 << 0,
+
+        /// <summary>
+        ///  完成取货信号
+        /// </summary>
+        GetFinishi = 1 << 1,
+
+        /// <summary>
+        ///  完成放货信号
+        /// </summary>
+        PutFinishi = 1 << 2,
+
+        /// <summary>
+        ///  报警信号
+        /// </summary>
+        Alarm = 1 << 3,
+
+        /// <summary>
+        ///  任务完成信号
+        /// </summary>
+        TaskFinish = 1 << 4,
+
+        /// <summary>
+        ///  设备有货
+        /// </summary>
+        Loaded = 1 << 5,
+
+        /// <summary>
+        ///  货叉在原位
+        /// </summary>
+        ForkCenter = 1 << 6,
+
+        /// <summary>
+        ///  可以下发任务
+        /// </summary>
+        CanTaskIssued = 1 << 7,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES1 = 1 << 8,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES2 = 1 << 9,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES3 = 1 << 10,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES4 = 1 << 11,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES5 = 1 << 12,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES6 = 1 << 13,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES7 = 1 << 14,
+
+        /// <summary>
+        ///  保留
+        /// </summary>
+        RES8 = 1 << 15,
+    }
+
+    /// <summary>
+    /// 堆垛机报警项
+    /// </summary>
+    [Flags]
+    public enum SrmAlarm : ulong { 
+    }
+}

分拣库/WCS.Entity.Protocol/WCS.Entity.Protocol.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WCS.Entity" Version="1.0.0.9" />
+    <PackageReference Include="WCS.Entity" Version="1.0.0.10" />
   </ItemGroup>
 
 </Project>

分拣库/WCS.WorkEngineering/Extensions/DeviceExtension.cs

@@ -1,4 +1,6 @@
-using WCS.Core;
+using System.Collections.Concurrent;
+using WCS.Core;
+using WCS.Entity;
 using WCS.Entity.Protocol.Station;
 
 namespace WCS.WorkEngineering.Extensions
@@ -12,5 +14,175 @@ namespace WCS.WorkEngineering.Extensions
         {
             return source.HasProtocol(typeof(IStation521)) || source.HasProtocol(typeof(IStation520)) || source.HasProtocol(typeof(IStation522));
         }
+
+        #region WCS_DEVICE扩展数据
+
+        private static ConcurrentDictionary<string, object> DeviceValues = new ConcurrentDictionary<string, object>();
+
+        public static void AddFlag(this Device source, DF flag)
+        {
+            var df = source.Get<DF>("DeviceFlag");
+            df = df | flag;
+            source.Set("DeviceFlag", df);
+        }
+
+        public static bool Is(this Device source, DF flag)
+        {
+            var df = source.Get<DF>("DeviceFlag");
+            return (df & flag) == flag;
+        }
+
+        public static void Set<T>(this Device source, string key, T value)
+        {
+            DeviceValues[source.Code + key] = value;
+        }
+
+        public static T Get<T>(this Device source, string key)
+        {
+            if (!DeviceValues.ContainsKey(source.Code + key))
+                return default(T);
+            return (T)DeviceValues[source.Code + key];
+        }
+
+        public static short Code(this Device source)
+        {
+            return short.Parse(source.Code);
+        }
+
+        public static string Tunnel(this Device source)
+        {
+            return source.Get<string>("Tunnel");
+        }
+
+        public static int TunnelNum(this Device source)
+        {
+            return int.Parse(source.Tunnel().Last().ToString());
+        }
+
+        public static int Floor(this Device source)
+        {
+            return source.Get<int>("Floor");
+        }
+
+        public static Device SC(this Device source)
+        {
+            return source.Get<Device>("SC");
+        }
+
+        public static Device RGV(this Device source)
+        {
+            return source.Get<Device>("RGV");
+        }
+
+        //public static LocInfo LocInfo(this WCS_DEVICEHdr source)
+        //{
+        //    return source.Get<LocInfo>("LocInfo");
+        //}
+
+        //public static bool WakeupOn(this WCS_DEVICEHdr source, int sec, string key)
+        //{
+        //    var str = "WakeupOn" + key;
+        //    var last = source.Get<DateTime>(str);
+        //    if ((DateTime.Now - last).TotalMilliseconds > sec)
+        //    {
+        //        source.Set(str, DateTime.Now);
+        //        return true;
+        //    }
+        //    else
+        //    {
+        //        Ltc.Log("OnSleep");
+        //        return false;
+        //    }
+        //}
+
+        //public static bool WakeupOn(this WCS_DEVICEHdr source, int sec)
+        //{
+        //    return source.WakeupOn(sec, "");
+        //}
+
+        #endregion WCS_DEVICE扩展数据
+
+        //#region 静态方法
+
+        //public static WCS_DEVICEHdr[] Where(Func<WCS_DEVICEHdr, bool> func)
+        //{
+        //    var arr = LogicHandler.AllObjects.OfType<WCS_DEVICEHdr>().Where(func).ToArray();
+        //    return arr;
+        //}
+
+        //public static WCS_DEVICEHdr Find(string code)
+        //{
+        //    return Where(v => v.CODE == code).Single();
+        //}
+
+        //public static WCS_DEVICEHdr[] Find(params string[] codes)
+        //{
+        //    return Where(v => codes.Contains(v.CODE)).ToArray();
+        //}
+
+        //public static void Set<T>(string key, T value, params string[] devices)
+        //{
+        //    var arr = LogicHandler.AllObjects.OfType<WCS_DEVICEHdr>().Where(v => devices.Contains(v.CODE)).ToArray();
+        //    Parallel.ForEach(arr, v =>
+        //    {
+        //        v.Set(key, value);
+        //    });
+        //}
+
+        //public static void Set<T>(string key, T value, Func<WCS_DEVICEHdr, bool> func)
+        //{
+        //    var arr = LogicHandler.AllObjects.OfType<WCS_DEVICEHdr>().Where(func).ToArray();
+        //    Parallel.ForEach(arr, v =>
+        //    {
+        //        v.Set(key, value);
+        //    });
+        //}
+
+        //public static void AddFlag(DF flag, params string[] devices)
+        //{
+        //    var arr = LogicHandler.AllObjects.OfType<WCS_DEVICEHdr>().Where(v => devices.Contains(v.CODE)).ToArray();
+        //    Parallel.ForEach(arr, v =>
+        //    {
+        //        v.AddFlag(flag);
+        //    });
+        //}
+
+        //public static void AddFlag(DF flag, Action<WCS_DEVICEHdr> callbck, params string[] devices)
+        //{
+        //    var arr = LogicHandler.AllObjects.OfType<WCS_DEVICEHdr>().Where(v => devices.Contains(v.CODE)).ToArray();
+        //    Parallel.ForEach(arr, v =>
+        //    {
+        //        v.AddFlag(flag);
+        //        callbck?.Invoke(v);
+        //    });
+        //}
+
+        //#endregion 静态方法
+    }
+
+    /// <summary>
+    /// 设备配置
+    /// </summary>
+    [Flags]
+    public enum DF
+    {
+        无 = 0,
+        SRM = 1 << 0,
+        SRM二级品取货 = 1 << 1,
+        SRM涂布取货 = 1 << 2,
+        SRM月台放货 = 1 << 3,
+        一楼RGV放货 = 1 << 4,
+        月台 = 1 << 5,
+        涂布RGV = 1 << 6,
+        BOPPRGV = 1 << 7,
+        涂布RGV取货设备组 = 1 << 8,
+        涂布RGV放货设备组 = 1 << 9,
+        涂布出库RGV取货站台 = 1 << 10,
+        涂布入库RGV取货站台 = 1 << 11,
+        SRM涂布放货 = 1 << 12,
+        涂布RGV取货站台 = 1 << 13,
+        BOPPRGV取货设备组 = 1 << 14,
+        BOPPRGV放货设备组 = 1 << 15,
+        SRMBOPP取货 = 1 << 16,
     }
 }

分拣库/WCS.WorkEngineering/Extensions/TaskExtension.cs

@@ -0,0 +1,54 @@
+using DBHelper;
+using WCS.Entity;
+
+namespace WCS.WorkEngineering.Extensions
+{
+    /// <summary>
+    /// 任务扩展
+    /// </summary>
+    public static class TaskExtension
+    {
+        /// <summary>
+        /// 更新任务执行记录
+        /// </summary>
+        /// <param name="task">任务信息</param>
+        /// <param name="db">数据库上下文</param>
+        /// <param name="curPoint">当前地址</param>
+        /// <param name="desc">描述</param>
+        public static void AddWCS_TASK_DTL(this WCS_TASK task, Db db, string curPoint, string desc)
+        {
+            db.Default.Insertable(new WCS_TASK_DTL
+            {
+                ParentTaskCode = task.ID,
+                CurPoint = "",
+                NextPoint = "",
+                Desc = "",
+                UPDATETIME = DateTime.Now,
+                ExecTime = DateTime.Now,
+                UPDATEUSER = "WCS"
+            }).AddQueue();
+        }
+
+        /// <summary>
+        /// 更新任务执行记录
+        /// </summary>
+        /// <param name="task">任务信息</param>
+        /// <param name="db">数据库上下文</param>
+        /// <param name="curPoint">当前地址</param>
+        /// <param name="NextPoint">下一个地址</param>
+        /// <param name="desc">描述</param>
+        public static void AddWCS_TASK_DTL(this WCS_TASK task, Db db, string curPoint, string NextPoint, string desc)
+        {
+            db.Default.Insertable(new WCS_TASK_DTL
+            {
+                ParentTaskCode = task.ID,
+                CurPoint = "",
+                NextPoint = "",
+                Desc = "",
+                UPDATETIME = DateTime.Now,
+                ExecTime = DateTime.Now,
+                UPDATEUSER = "WCS"
+            }).AddQueue();
+        }
+    }
+}

分拣库/WCS.WorkEngineering/Systems/SrmSystems.cs

@@ -1,6 +1,11 @@
-using System.ComponentModel;
+using DBHelper;
+using ServiceCenter.Extensions;
+using System.ComponentModel;
 using WCS.Core;
+using WCS.Entity;
+using WCS.Entity.Protocol.SRM;
 using WCS.Entity.Protocol.Station;
+using WCS.WorkEngineering.Extensions;
 using WCS.WorkEngineering.Worlds;
 
 namespace WCS.WorkEngineering.Systems
@@ -10,18 +15,34 @@ namespace WCS.WorkEngineering.Systems
     /// </summary>
     [BelongTo(typeof(MainWorld))]
     [Description("堆垛机系统")]
-    public class SrmSystems : DeviceSystem<Device<IStation520, IStation521, IStation522>>
+    public class SrmSystems : DeviceSystem<Device<ISRM520, ISRM521, ISRM523>>
     {
-        //TODO:堆垛机相关信息未完善等待完善之后再处理
-
         /// <summary>
         /// 取货点设备集合
         /// </summary>
         private List<Device<IStation520, IStation521, IStation522>> PickUpDevices;
 
+        /// <summary>
+        /// 放货设备
+        /// </summary>
+        private List<Device<IStation520, IStation521, IStation522>> PutDevices;
+
         public SrmSystems()
         {
-            PickUpDevices = World.Devices.Where(v => v.Code is "1601" or "1603" or "1605" or "1611" or "1613" or "1615" or "2527" or "2528" or "2727" or "")
+            //分拣库1
+            PickUpDevices = World.Devices.Where(v => v.Code is "" or "")
+                                         .Select(v => new Device<IStation520, IStation521, IStation522>(v)).ToList();
+            PutDevices = World.Devices.Where(v => v.Code is "" or "")
+                                         .Select(v => new Device<IStation520, IStation521, IStation522>(v)).ToList();
+            //分拣库2
+            PickUpDevices = World.Devices.Where(v => v.Code is "" or "")
+                                         .Select(v => new Device<IStation520, IStation521, IStation522>(v)).ToList();
+            PutDevices = World.Devices.Where(v => v.Code is "" or "")
+                                         .Select(v => new Device<IStation520, IStation521, IStation522>(v)).ToList();
+            //分拣库3
+            PickUpDevices = World.Devices.Where(v => v.Code is "" or "")
+                                         .Select(v => new Device<IStation520, IStation521, IStation522>(v)).ToList();
+            PutDevices = World.Devices.Where(v => v.Code is "" or "")
                                          .Select(v => new Device<IStation520, IStation521, IStation522>(v)).ToList();
         }
 
@@ -29,14 +50,148 @@ namespace WCS.WorkEngineering.Systems
 
         protected override bool SaveLogsToFile => true;
 
-        public override void Do(Device<IStation520, IStation521, IStation522> obj)
+        public override void Do(Device<ISRM520, ISRM521, ISRM523> obj)
         {
-            throw new NotImplementedException();
+            //判断堆垛机是否报警
+            if (obj.Data2.Status.HasFlag(SrmStatus.Alarm)) throw new KnownException(obj.Data3.Alarm.ToString(), LogLevel.High);
+
+            //判断DB520 完成任务确认清除信号 是否为1
+            if (obj.Data.OkAck == 1) throw new KnownException("任务完成确认信号未清除", LogLevel.Mid);
+
+            //判断完成任务号是否大于0
+            if (obj.Data2.TaskFinishiId > 0)
+            {
+                Db.Do(db =>
+                {
+                    //根据DB521任务号获取对应任务
+                    var task = db.Default.Queryable<WCS_TASK>().First(v => v.ID == obj.Data2.TaskFinishiId) ?? throw new KnownException($"未找到任务{obj.Data2.TaskFinishiId}", LogLevel.High);
+                    if (task.STATUS != Entity.TaskStatus.StackerExecution)
+                        throw new KnownException($"任务{task.ID}状态是{task.STATUS.Description()}.堆垛机完成任务需要对应任务状态处于堆垛机执行中", LogLevel.High);
+                    //根据任务类型做不同的处理
+                    switch (task.TYPE)
+                    {
+                        case TaskType.EnterDepot:
+                            //完成任务
+                            task.STATUS = Entity.TaskStatus.Finish;
+                            task.UPDATETIME = DateTime.Now;
+                            task.ENDTIME = DateTime.Now;
+                            task.AddWCS_TASK_DTL(db, task.ADDRTO, "入库任务结束");
+                            break;
+
+                        case TaskType.OutDepot:
+                            task.STATUS = Entity.TaskStatus.ConveyorInProgress;
+                            task.UPDATETIME = DateTime.Now;
+                            task.AddWCS_TASK_DTL(db, task.SRMSTATION, "出库任务到达放货站台");
+                            break;
+
+                        case TaskType.TransferDepot:
+                            task.STATUS = Entity.TaskStatus.Finish;
+                            task.UPDATETIME = DateTime.Now;
+                            task.ENDTIME = DateTime.Now;
+                            task.AddWCS_TASK_DTL(db, task.ADDRTO, "移库任务结束");
+                            break;
+                    }
+
+                    db.Default.Updateable(task).AddQueue();
+                    db.Default.SaveQueues();
+                    obj.Data.OkAck = 1;
+                });
+            }
+
+            //堆垛机是否可以下发任务
+            if (obj.Data2.VoucherNo != obj.Data.VoucherNo) throw new KnownException($"凭证号不一致,DB520:{obj.Data.VoucherNo},DB521:{obj.Data2.VoucherNo}", LogLevel.Mid);
+            if (obj.Data2.AutoStatus != SrmAutoStatus.Automatic) throw new KnownException($"堆垛机处于{obj.Data2.AutoStatus}模式", LogLevel.Low);
+            if (obj.Data2.RunStatus != SrmRunStatus.Idle) throw new KnownException($"堆垛机处于{obj.Data2.RunStatus}状态", LogLevel.High);
+
+            //默认没有移库任务
+            bool isTransfer = false;
+
+            //出入库优先级任务 1:无优先 2:入库 3:出库
+            int enterOrOut = 1;
+
+            //再检查是否有等待执行的货物
+            Db.Do(db =>
+            {
+                //获取当前堆垛机的所有未完成任务
+                var tasks = db.Default.Queryable<WCS_TASK>().Where(v => v.STATUS < Entity.TaskStatus.Finish && (v.DEVICE == obj.Entity.Code));
+                //任务集合是否有处于堆垛机执行状态的任务
+                if (tasks.Any(v => v.STATUS == Entity.TaskStatus.StackerExecution)) throw new KnownException($"有任务处于堆垛机执行状态", LogLevel.High);
+
+                //判断是否存在调整优先级任务
+                if (!tasks.Any(v => v.TYPE != TaskType.TransferDepot && v.STATUS < Entity.TaskStatus.StackerExecution && v.Priority > 0))
+                {
+                    //不存在调整优先级任务,判断是否存在移库任务
+                    isTransfer = tasks.Any(v => v.TYPE == TaskType.TransferDepot && v.STATUS == Entity.TaskStatus.NewBuild);
+                }
+                else //存在调整优先级任务
+                {
+                    //获取出库任务中新建状态最大优先级
+                    var outPriorityNewBuild = tasks.Where(v => v.TYPE == TaskType.OutDepot && v.STATUS == Entity.TaskStatus.NewBuild).Max(v => v.Priority);
+                    //获取入库任务中最后一个交互点是取货点任务的最大优先级
+                    var enterPriority = tasks.Where(v => v.TYPE == TaskType.EnterDepot && v.STATUS < Entity.TaskStatus.StackerExecution && PickUpDevices.Any(p => p.Entity.Code == v.LastInteractionPoint))
+                                             .Max(v => v.Priority);
+                    //出入库最大优先级相加大于零
+                    if (outPriorityNewBuild + enterPriority > 0)
+                    {
+                        //出入库优先级任务 1:无优先 2:入库 3:出库
+                        enterOrOut = enterPriority > outPriorityNewBuild ? 2 : 3;
+                    }
+                }
+            });
+
+            #region 移库
+
+            if (isTransfer)
+            {
+                Db.Do(db =>
+                {
+                    //获取一条当前堆垛机优先级最高的新建移库任务
+                    var task = db.Default.Queryable<WCS_TASK>().Where(v => v.DEVICE == obj.Entity.Code && v.TYPE == TaskType.TransferDepot && v.STATUS == Entity.TaskStatus.NewBuild)
+                                                               .OrderByDescending(v => v.Priority)
+                                                               .First() ?? throw new KnownException("未找到移库任务", LogLevel.High);
+                    //任务状态改为堆垛机执行中
+                    task.STATUS = Entity.TaskStatus.StackerExecution;
+                    task.STARTTIME = DateTime.Now;
+                    task.UPDATETIME = DateTime.Now;
+                    task.AddWCS_TASK_DTL(db, task.ADDRFROM, task.DEVICE, $"堆垛机{obj.Entity.Code}开始执行任务");
+                    db.Default.Updateable(task).AddQueue();
+                    db.Default.SaveQueues();
+                    var addrFrom = task.ADDRFROM.Split("-");
+                    var addrTo = task.ADDRTO.Split("-");
+                    //下发任务
+                    obj.Data.TaskNumber = task.ID;
+                    obj.Data.RowPos1 = addrFrom[0].ToShort();
+                    obj.Data.TravelPos1 = addrFrom[1].ToShort();
+                    obj.Data.LiftPos1 = addrFrom[2].ToShort();
+                    obj.Data.RowPos2 = addrTo[0].ToShort();
+                    obj.Data.TravelPos2 = addrTo[1].ToShort();
+                    obj.Data.LiftPos2 = addrTo[2].ToShort();
+                    obj.Data.VoucherNo++;
+                });
+            }
+
+            #endregion 移库
+
+            #region 出入库
+
+            //上一个周期是不是出库任务 第一次获取返回结果会是false
+            var lastIsOut = obj.Entity.Get<bool>("LastIsOut");
+            obj.Entity.Set("LastIsOut", !lastIsOut);
+
+            //入库任务优先 或 上一个周期是出库任务并且出库任务无优先
+            if (enterOrOut == 2 || (lastIsOut && enterOrOut == 1)) //入库任务
+            {
+            }
+            else if (enterOrOut == 3 || !lastIsOut)
+            {
+            }
+
+            #endregion 出入库
         }
 
         public override bool Select(Device dev)
         {
-            throw new NotImplementedException();
+            return dev.Code.Contains("SRM");
         }
     }
 }

分拣库/WCS.WorkEngineering/WCS.WorkEngineering.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
-    <PackageReference Include="ServiceCenter" Version="1.0.0.12" />
+    <PackageReference Include="ServiceCenter" Version="1.0.0.16" />
   </ItemGroup>
 
   <ItemGroup>

分拣库/WCS.WorkEngineering/WebApi/Controllers/AgvController.cs

@@ -1,9 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using WCS.WorkEngineering.WebApi.Models;
 
 namespace WCS.WorkEngineering.WebApi.Controllers
@@ -21,8 +16,25 @@ namespace WCS.WorkEngineering.WebApi.Controllers
         /// <param name="reqDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public AgvCallbackResponse agvCallback(AgvCallbackRequest reqDto)
+        public AgvCallbackResponse AgvCallback(AgvCallbackRequest reqDto)
         {
+            switch (reqDto.method)
+            {
+                case "申请":
+                    break;
+                case "申请放货":
+                    break;
+
+                case "申请取货":
+                    break;
+
+                case "取放完成":
+                    break;
+
+                default:
+                    break;
+            }
+
             var res = new AgvCallbackResponse() { code = "0", message = "成功" };
 
             return res;

分拣库/WCS.WorkEngineering/WebApi/Models/agvCallbackRequest.cs

@@ -48,7 +48,7 @@
         public string stgBinCode { get; set; }
 
         /// <summary>
-        /// 方法名, 可使用任务类型做为方法名
+        /// 方法名，申请放货、请求取货、
         /// </summary>
         public string method { get; set; }
 

分拣库/WCS.WorkEngineering/WebApi/Models/agvCallbackResponse.cs

@@ -7,7 +7,7 @@ namespace WCS.WorkEngineering.WebApi.Models
     public class AgvCallbackResponse
     {
         /// <summary>
-        /// 返回码
+        /// 返回码 1:允许执行 0:不允许执行
         /// </summary>
         public string code { get; set; } = "0";
         /// <summary>