فهرست منبع

Merge branch 'master' of http://120.77.11.229:3000/zuolinhao/ZT_1C

xu.lu 2 سال پیش
والد
کامیت
25552964cb

+ 0 - 1
成品库/WCS.WorkEngineering/Protocol/Station/IStation523.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using WCS.Entity;
 using WCS.Entity.Protocol.Station;
-using static Dm.net.buffer.ByteArrayBuffer;
 
 namespace WCS.WorkEngineering.Protocol.Station
 {

+ 0 - 118
成品库/WCS.WorkEngineering/Systems/一楼叠盘机入库.cs

@@ -1,118 +0,0 @@
-using ServiceCenter.Logs;
-using ServiceCenter.SqlSugars;
-using System.ComponentModel;
-using WCS.Core;
-using WCS.Entity;
-using WCS.WorkEngineering.Extensions;
-using WCS.WorkEngineering.Protocol.Station;
-using WCS.WorkEngineering.WebApi.Controllers;
-using WCS.WorkEngineering.WebApi.Models.WMS.Request;
-using WCS.WorkEngineering.Worlds;
-
-namespace WCS.WorkEngineering.Systems
-{
-    /// <summary>
-    ///  一楼叠盘机入库
-    /// </summary>
-    [BelongTo(typeof(MainWorld))]
-    [Description("一楼叠盘机入库")]
-    public class 一楼叠盘机入库 : DeviceSystem<Device<IStation520, IStation521, IStation523>>
-    {
-        protected override bool ParallelDo => true;
-
-        protected override bool SaveLogsToFile => true;
-
-        public override void Do(Device<IStation520, IStation521, IStation523> obj)
-        {
-            obj.入库站点是否被禁止();
-            obj.入库站点是否满足执行条件();
-
-            WCS_TaskInfo task = null;//处理完成的任务
-            try
-            {
-                var device = "";
-                var barcode = "";
-
-                switch (obj.Entity.Code)
-                {
-                    case "2527":
-                        device = "SRM1";
-                        barcode = "TPA";
-                        break;
-
-                    case "2528":
-                        device = "SRM1";
-                        barcode = "TPA";
-                        break;
-
-                    case "2727":
-                        device = "SRM2";
-                        barcode = "TPA";
-                        break;
-
-                    case "2728":
-                        device = "SRM2";
-                        barcode = "TPA";
-                        break;
-                };
-
-                SqlSugarHelper.Do(_db =>
-                {
-                    var db = _db.Default;
-
-                    //验证是否有对应的任务
-                    if (!db.Queryable<WCS_TaskInfo>().Any(v => v.BarCode == barcode))
-                    {
-                        var res = WmsApi.OneFloorWorkerBuildEmptyPalletsStock(new OneFloorWorkerBuildEmptyPalletsStockRequest()
-                        {
-                            PalletCode = barcode,
-                            StartLoc = obj.Entity.Code,
-                            Height = 2
-                        });
-                        if (res.ResCode == WebApi.Models.WMS.Response.ResponseStatusCodeEnum.Sucess) return;
-                    }
-                    //找到对应的任务
-                    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();
-                        //开始对任务进行处理
-                        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;
-                });
-            }
-            catch (Exception ex)
-            {
-                throw new KnownException(ex.Message, LogLevelEnum.High);
-            }
-            if (task == null) return;
-
-            World.Log($"任务处理:开始-DB520[{obj.Data.TaskNumber}]-[{obj.Data.VoucherNo}]-DB521[{obj.Data2.TaskNumber}]-[{obj.Data2.VoucherNo}]");
-            obj.Data.TaskNumber = task.ID;
-            obj.Data.VoucherNo++;
-            World.Log($"任务处理:结束-DB520[{obj.Data.TaskNumber}]-[{obj.Data.VoucherNo}]-DB521[{obj.Data2.TaskNumber}]-[{obj.Data2.VoucherNo}]");
-        }
-
-        public override bool Select(Device dev)
-        {
-            return dev.HasFlag(Extensions.DeviceFlags.一楼叠盘机);
-        }
-    }
-}

+ 0 - 98
成品库/WCS.WorkEngineering/Systems/一楼扫码入库.cs

@@ -1,98 +0,0 @@
-using ServiceCenter.Logs;
-using ServiceCenter.SqlSugars;
-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;
-using WCS.WorkEngineering.Worlds;
-
-namespace WCS.WorkEngineering.Systems
-{
-    /// <summary>
-    ///  一楼入库工位处理系统
-    /// </summary>
-    [BelongTo(typeof(MainWorld))]
-    [Description("一楼扫码入库")]
-    public class 一楼扫码入库 : DeviceSystem<Device<IStation520, IStation521, IStation523, IStation91, IBCR81>>
-    {
-        protected override bool ParallelDo => true;
-
-        protected override bool SaveLogsToFile => true;
-
-        public 一楼扫码入库()
-        {
-        }
-
-        public override void Do(Device<IStation520, IStation521, IStation523, IStation91, IBCR81> obj)
-        {
-            obj.入库站点是否被禁止();
-            obj.入库站点是否满足执行条件();
-
-            WCS_TaskInfo task = null;//处理完成的任务
-            try
-            {
-                SqlSugarHelper.Do(_db =>
-                {
-                    var db = _db.Default;
-                    //获取托盘条码
-                    var barcode = obj.Data5.GetBCRCode();
-                    //var barcode = "TAP00001";
-                    //验证是否有对应的任务
-                    if (!db.Queryable<WCS_TaskInfo>().Any(v => v.BarCode == barcode))
-                    {
-                        var res = WmsApi.OneFloorWorkerBuildEmptyPalletsStock(new OneFloorWorkerBuildEmptyPalletsStockRequest()
-                        {
-                            PalletCode = barcode,
-                            StartLoc = obj.Entity.Code,
-                            Height = 1
-                        });
-                        if (res.ResCode == WebApi.Models.WMS.Response.ResponseStatusCodeEnum.Sucess) return;
-                    }
-                    //找到对应的任务
-                    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();
-                        //开始对任务进行处理
-                        taskInfo.Status = Entity.TaskStatus.ConveyorExecution;
-                        taskInfo.StartTime = DateTime.Now;
-                        taskInfo.SrmStation = taskInfo.AddrFrom;
-                        taskInfo.LastInteractionPoint = obj.Entity.Code;
-                        taskInfo.Tunnel = tunnel.Code;
-                        taskInfo.Height = 1;
-                        switch (obj.Entity.Code)
-                        {
-                            case "2532": taskInfo.Device = "SRM1"; break;
-                            case "2732": taskInfo.Device = "SRM2"; break;
-                        };
-                        taskInfo.AddWCS_TASK_DTL(_db, obj.Entity.Code, "开始执行入库任务");
-                        db.Updateable(taskInfo).ExecuteCommand();
-                        taskInfo.updateRedisHash();
-                        task = taskInfo;
-                    }
-                    else return;
-                });
-            }
-            catch (Exception ex)
-            {
-                throw new KnownException(ex.Message, LogLevelEnum.High);
-            }
-            if (task == null) return;
-
-            World.Log($"任务处理:开始-DB520[{obj.Data.TaskNumber}]-[{obj.Data.VoucherNo}]-DB521[{obj.Data2.TaskNumber}]-[{obj.Data2.VoucherNo}]-[{obj.Data2.Request}]");
-            obj.Data.TaskNumber = task.ID;
-            obj.Data.VoucherNo++;
-            World.Log($"任务处理:结束-DB520[{obj.Data.TaskNumber}]-[{obj.Data.VoucherNo}]-DB521[{obj.Data2.TaskNumber}]-[{obj.Data2.VoucherNo}]");
-        }
-
-        public override bool Select(Device dev)
-        {
-            //return dev.Code == "2532";
-            return dev.HasFlag(Extensions.DeviceFlags.一楼扫码);
-        }
-    }
-}

+ 0 - 120
成品库/WCS.WorkEngineering/Systems/主线分流点.cs

@@ -1,120 +0,0 @@
-using Newtonsoft.Json;
-using ServiceCenter.Extensions;
-using ServiceCenter.Logs;
-using ServiceCenter.Redis;
-using System.ComponentModel;
-using WCS.Core;
-using WCS.WorkEngineering.Extensions;
-using WCS.WorkEngineering.Protocol.BCR;
-using WCS.WorkEngineering.Protocol.Station;
-using WCS.WorkEngineering.Worlds;
-
-namespace WCS.WorkEngineering.Systems
-{
-    /// <summary>
-    ///  主线分流
-    /// </summary>
-    [BelongTo(typeof(MainWorld))]
-    [Description("主线分流点")]
-    public class 主线分流点 : DeviceSystem<Device<IStation520, IStation521, IStation523, IBCR83>>
-    {
-        protected override bool ParallelDo => true;
-
-        protected override bool SaveLogsToFile => true;
-
-        public override void Do(Device<IStation520, IStation521, IStation523, IBCR83> obj)
-        {
-            if (obj.Data.VoucherNo != obj.Data2.VoucherNo) throw new KnownException($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}", LogLevelEnum.High);
-            if (obj.Data4.index == obj.Data4.Lastindex) throw new KnownException("扫码结果未更新", LogLevelEnum.Mid);
-            if (obj.Data2.Request != 1) throw new KnownException("无请求", LogLevelEnum.Mid);
-
-            //获取条码
-            var bcr = obj.Data4.BcrCode.Trim('\0').Trim();
-            if (string.IsNullOrWhiteSpace(bcr))
-            {
-                obj.Data.TaskNumber = 1;
-                obj.Data.GoodsStart = obj.Entity.Code.ToShort();
-                obj.Data.GoodsEnd = 418;
-                obj.Data.VoucherNo++;
-                World.Log($"执行记录:条码:[{bcr}];任务号[{1}],扫码错误");
-            }
-            try
-            {
-                var key = $"AllocationWarehouseSort:{bcr}";
-                var value = RedisHub.WMS.Get(key);
-                if (value == null)
-                {
-                    obj.Data.TaskNumber = 1;
-                    obj.Data.GoodsStart = obj.Entity.Code.ToShort();
-                    obj.Data.GoodsEnd = 418;
-                    obj.Data.VoucherNo++;
-                }
-                //throw new KnownException($"{bcr}无入库信息", LogLevelEnum.Low);
-
-                //获取到仓库Id
-                var mainlineDiversion = JsonConvert.DeserializeObject<MainlineDiversion>(value);
-                //更具仓库ID来分配目标地址
-                //TODO:暂未考虑工字轮型号,统一往09走问题
-                int nextAdd = 0;
-                switch (mainlineDiversion.WarehouseCode)
-                {
-                    case "1N":
-                        nextAdd = 418;
-                        break;
-
-                    case "1S":
-                        nextAdd = 0;
-                        break;
-
-                    case "2N":
-                        nextAdd = 0;
-                        break;
-
-                    case "2S":
-                        nextAdd = 0;
-                        break;
-
-                    case "3N":
-                        nextAdd = 0;
-                        break;
-
-                    case "3S":
-                        nextAdd = 0;
-                        break;
-                }
-
-                obj.Data.TaskNumber = mainlineDiversion.TaskId;
-                obj.Data.GoodsStart = obj.Entity.Code.ToShort();
-                obj.Data.GoodsEnd = nextAdd.ToShort();
-                obj.Data.VoucherNo++;
-                World.Log($"执行记录:条码:[{bcr}];任务号[{mainlineDiversion.TaskId}]");
-                RedisHub.WMS.Del(key);
-            }
-            catch (Exception e)
-            {
-                var a = 0;
-            }
-        }
-
-        public override bool Select(Device dev)
-        {
-            return dev.HasFlag(Extensions.DeviceFlags.主线分流点);
-        }
-    }
-
-    /// <summary>
-    ///  主线分流
-    /// </summary>
-    public class MainlineDiversion
-    {
-        /// <summary>
-        ///  任务号
-        /// </summary>
-        public int TaskId { get; set; }
-
-        /// <summary>
-        ///  仓库号
-        /// </summary>
-        public string WarehouseCode { get; set; }
-    }
-}

+ 4 - 11
成品库/WCS.WorkEngineering/Systems/SrmSystems.cs → 成品库/WCS.WorkEngineering/Systems/堆垛机.cs

@@ -17,11 +17,11 @@ using TaskStatus = WCS.Entity.TaskStatus;
 namespace WCS.WorkEngineering.Systems
 {
     /// <summary>
-    /// 堆垛机系统
+    /// 堆垛机
     /// </summary>
     [BelongTo(typeof(MainWorld))]
-    [Description("堆垛机系统")]
-    public class SrmSystems : DeviceSystem<SRM>
+    [Description("堆垛机")]
+    public class 堆垛机 : DeviceSystem<SRM>
     {
         /// <summary>
         /// 取货点设备集合
@@ -33,7 +33,7 @@ namespace WCS.WorkEngineering.Systems
         /// </summary>
         private Dictionary<string, List<Station>> PutDevices = new Dictionary<string, List<Station>>();
 
-        public SrmSystems()
+        public 堆垛机()
         {
             //获取所有的巷道集合
             var devices = Device.All.Where(v => v.HasFlag(DeviceFlags.巷道));
@@ -58,13 +58,6 @@ namespace WCS.WorkEngineering.Systems
         {
             #region 处理完成任务
 
-            SqlSugarHelper.Do(db =>
-            {
-                var a = db.Default.Queryable<WCS_TaskInfo>().ToSql();
-                var c = db.Default.CurrentConnectionConfig.ConnectionString;
-                var b = db.Default.Queryable<WCS_TaskInfo>().ToList();
-            });
-
             //判断DB520 完成任务确认清除信号 是否为1
             if (obj.Data.OkAck == 1) throw new KnownException($"WCS任务完成确认信号[DB520.OkAck]未清除,请检查堆垛机处理异常原因", LogLevelEnum.Mid);
 

+ 0 - 52
成品库/WCS.WorkEngineering/Systems/桁架.cs

@@ -1,52 +0,0 @@
-using ServiceCenter.Extensions;
-using ServiceCenter.Logs;
-using System.ComponentModel;
-using WCS.Core;
-using WCS.WorkEngineering.Extensions;
-using WCS.WorkEngineering.Protocol.Station;
-using WCS.WorkEngineering.Protocol.Truss;
-using WCS.WorkEngineering.Worlds;
-
-namespace WCS.WorkEngineering.Systems
-{
-    /// <summary>
-    ///  桁架
-    /// </summary>
-    [BelongTo(typeof(MainWorld))]
-    [Description("桁架")]
-    public class 桁架 : DeviceSystem<Truss>
-    {
-        protected override bool ParallelDo => true;
-
-        protected override bool SaveLogsToFile => true;
-
-        public override void Do(Truss obj)
-        {
-            if (obj.Data.VoucherNo != obj.Data2.VoucherNo) throw new KnownException($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}", LogLevelEnum.High);
-            if (obj.Data2.Status != TrussStatus.Idle) return;
-            var devs = Device.All.Where(x => x.Code is "475" or "476" or "477" or "478" or "479").Select(x => new Device<IStation524>(x, World)).OrderBy(x => x.Entity.Code).ToArray();
-
-            //var devs1 = Device.All.Where(x => x.Code is "475" or "476" or "477" or "478" or "479").Select(x => new Device<IStation523>(x, World)).ToList();
-
-            obj.Data.DestPosition_1 = 19;
-            obj.Data.TargetPallte1 = 10;
-            obj.Data.Task1_1 = devs[0].Data.TaskNumber;
-            obj.Data.Dest1_1 = 1;
-            obj.Data.Task1_2 = devs[1].Data.TaskNumber; ;
-            obj.Data.Dest1_2 = 2;
-            obj.Data.Task1_3 = devs[2].Data.TaskNumber; ;
-            obj.Data.Dest1_3 = 3;
-            obj.Data.Task1_4 = devs[3].Data.TaskNumber; ;
-            obj.Data.Dest1_4 = 4;
-            obj.Data.Task1_5 = devs[4].Data.TaskNumber; ;
-            obj.Data.Dest1_5 = 5;
-            obj.Data.TaskSum1 = devs.Length.ToShort();
-            obj.Data.VoucherNo++;
-        }
-
-        public override bool Select(Device dev)
-        {
-            return dev.HasFlag(Extensions.DeviceFlags.桁架);
-        }
-    }
-}

+ 0 - 49
成品库/WCS.WorkEngineering/Systems/桁架分流点.cs

@@ -1,49 +0,0 @@
-using ServiceCenter.Extensions;
-using ServiceCenter.Logs;
-using ServiceCenter.SqlSugars;
-using System.ComponentModel;
-using WCS.Core;
-using WCS.Entity;
-using WCS.WorkEngineering.Protocol.Station;
-using WCS.WorkEngineering.Worlds;
-using WCS.WorkEngineering.Extensions;
-
-namespace WCS.WorkEngineering.Systems
-{
-    /// <summary>
-    ///  桁架分流点
-    /// </summary>
-    [BelongTo(typeof(MainWorld))]
-    [Description("桁架分流点")]
-    public class 桁架分流点 : DeviceSystem<Device<IStation520, IStation521, IStation523>>
-    {
-        protected override bool ParallelDo => true;
-
-        protected override bool SaveLogsToFile => true;
-
-        public override void Do(Device<IStation520, IStation521, IStation523> obj)
-        {
-            if (obj.Data.VoucherNo != obj.Data2.VoucherNo) throw new KnownException($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}", LogLevelEnum.High);
-            if (obj.Data3.Status.HasFlag(StationStatus.Run)) throw new KnownException("设备运行中", LogLevelEnum.Low);
-            if (!obj.Data3.Status.HasFlag(StationStatus.OT_Status)) throw new KnownException("站台货物信息与实际占用不一致", LogLevelEnum.Low);
-            if (obj.Data2.Request != 1) throw new KnownException("无请求", LogLevelEnum.Mid);
-
-            SqlSugarHelper.Do(_db =>
-            {
-                var db = _db.Default;
-                var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber) ?? throw new KnownException("未找到对应的WCS任务", LogLevelEnum.Mid);
-            });
-
-            obj.Data.TaskNumber = obj.Data2.TaskNumber;
-            obj.Data.GoodsStart = obj.Entity.Code.ToShort();
-            obj.Data.GoodsEnd = 475;
-            obj.Data.VoucherNo++;
-            World.Log($"执行记录:任务号[{obj.Data2.TaskNumber}][{obj.Data.VoucherNo}]");
-        }
-
-        public override bool Select(Device dev)
-        {
-            return dev.HasFlag(Extensions.DeviceFlags.桁架分流点);
-        }
-    }
-}

+ 0 - 47
成品库/WCS.WorkEngineering/Systems/桁架缓存放行点.cs

@@ -1,47 +0,0 @@
-using ServiceCenter.Extensions;
-using ServiceCenter.Logs;
-using ServiceCenter.SqlSugars;
-using System.ComponentModel;
-using WCS.Core;
-using WCS.Entity;
-using WCS.WorkEngineering.Protocol.Station;
-using WCS.WorkEngineering.Worlds;
-
-namespace WCS.WorkEngineering.Systems
-{
-    [BelongTo(typeof(MainWorld))]
-    [Description("桁架缓存放行点")]
-    public class 桁架缓存放行点 : DeviceSystem<Device<IStation520, IStation521, IStation523>>
-    {
-        protected override bool ParallelDo => true;
-
-        protected override bool SaveLogsToFile => true;
-
-        public override void Do(Device<IStation520, IStation521, IStation523> obj)
-        {
-            if (obj.Data.VoucherNo != obj.Data2.VoucherNo) throw new KnownException($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}", LogLevelEnum.High);
-            if (obj.Data3.Status.HasFlag(StationStatus.Run)) throw new KnownException("设备运行中", LogLevelEnum.Low);
-            if (obj.Data3.Status.HasFlag(StationStatus.PH_Status) && obj.Data2.Request == 0) throw new KnownException("有光电无请求", LogLevelEnum.Mid);
-            if (!obj.Data3.Status.HasFlag(StationStatus.PH_Status) && obj.Data2.Request == 1) throw new KnownException("无光电有请求", LogLevelEnum.Mid);
-            if (!obj.Data3.Status.HasFlag(StationStatus.OT_Status)) throw new KnownException("站台货物信息与实际占用不一致", LogLevelEnum.Low);
-            if (!obj.Data3.Status.HasFlag(StationStatus.PH_Status)) throw new KnownException("无光电", LogLevelEnum.Mid);
-            if (obj.Data2.Request != 1) throw new KnownException("无请求", LogLevelEnum.Mid);
-
-            SqlSugarHelper.Do(_db =>
-            {
-                var db = _db.Default;
-                var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber) ?? throw new KnownException("未找到对应的WCS任务", LogLevelEnum.Mid);
-            });
-
-            obj.Data.TaskNumber = obj.Data2.TaskNumber;
-            obj.Data.GoodsStart = obj.Entity.Code.ToShort();
-            obj.Data.GoodsEnd = 455;
-            obj.Data.VoucherNo++;
-        }
-
-        public override bool Select(Device dev)
-        {
-            return dev.HasFlag(Extensions.DeviceFlags.桁架缓存放行点);
-        }
-    }
-}

+ 0 - 37
成品库/WCS.WorkEngineering/Systems/湿拉满轮帘线芯股第一次扫码.cs

@@ -1,37 +0,0 @@
-using Newtonsoft.Json;
-using ServiceCenter.Redis;
-using System.ComponentModel;
-using WCS.Core;
-using WCS.WorkEngineering.Extensions;
-using WCS.WorkEngineering.Protocol.BCR;
-using WCS.WorkEngineering.Protocol.Station;
-using WCS.WorkEngineering.WebApi.Controllers;
-using WCS.WorkEngineering.Worlds;
-using DeviceFlags = WCS.WorkEngineering.Extensions.DeviceFlags;
-
-namespace WCS.WorkEngineering.Systems
-{
-    /// <summary>
-    ///  湿拉满轮帘线芯股第一次扫码
-    /// </summary>
-    [BelongTo(typeof(MainWorld))]
-    [Description("湿拉满轮帘线芯股第一次扫码")]
-    public class 湿拉满轮帘线芯股第一次扫码 : DeviceSystem<Device<IStation520, IStation521, IStation523, IBCR83>>
-    {
-        protected override bool ParallelDo => true;
-
-        protected override bool SaveLogsToFile => true;
-
-        public override void Do(Device<IStation520, IStation521, IStation523, IBCR83> obj)
-        {
-            var bcrCodeList = obj.Data4.GetBcrCodeList();
-            //获取当前站台对应的编码信息
-            WmsApi.EnteMainLine(bcrCodeList, obj.Entity.Code);
-        }
-
-        public override bool Select(Device dev)
-        {
-            return dev.HasFlag(DeviceFlags.满轮主线第一次扫码);
-        }
-    }
-}

+ 0 - 58
成品库/WCS.WorkEngineering/Systems/环形库分流点.cs

@@ -1,58 +0,0 @@
-using ServiceCenter.Extensions;
-using ServiceCenter.Logs;
-using ServiceCenter.SqlSugars;
-using System.ComponentModel;
-using WCS.Core;
-using WCS.Entity;
-using WCS.WorkEngineering.Extensions;
-using WCS.WorkEngineering.Protocol.Station;
-using WCS.WorkEngineering.Worlds;
-
-namespace WCS.WorkEngineering.Systems
-{
-    /// <summary>
-    ///  分流点
-    /// </summary>
-    [BelongTo(typeof(MainWorld))]
-    [Description("环形库分流点")]
-    public class 环形库分流点 : DeviceSystem<Device<IStation520, IStation521, IStation523, IStation91>>
-    {
-        protected override bool ParallelDo => true;
-
-        protected override bool SaveLogsToFile => true;
-
-        public override void Do(Device<IStation520, IStation521, IStation523, IStation91> obj)
-        {
-            if (obj.Data.VoucherNo != obj.Data2.VoucherNo) throw new KnownException($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}", LogLevelEnum.High);
-            if (obj.Data3.Status.HasFlag(StationStatus.Run)) throw new KnownException("设备运行中", LogLevelEnum.Low);
-            if (!obj.Data3.Status.HasFlag(StationStatus.OT_Status)) throw new KnownException("站台货物信息与实际占用不一致", LogLevelEnum.Low);
-            if (obj.Data2.Request != 1) throw new KnownException("无请求", LogLevelEnum.Mid);
-
-            if (obj.Data2.TaskNumber == 1)
-            {
-                obj.Data.TaskNumber = 591;
-                obj.Data.GoodsStart = obj.Entity.Code.ToShort();
-                obj.Data.GoodsEnd = 591;
-                obj.Data.VoucherNo++;
-                World.Log($"执行记录:任务号[{591}]");
-            }
-
-            SqlSugarHelper.Do(_db =>
-            {
-                var db = _db.Default;
-                var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskNumber) ?? throw new KnownException("未找到对应的WCS任务", LogLevelEnum.Mid);
-            });
-
-            obj.Data.TaskNumber = obj.Data2.TaskNumber;
-            obj.Data.GoodsStart = obj.Entity.Code.ToShort();
-            obj.Data.GoodsEnd = 455;
-            obj.Data.VoucherNo++;
-            World.Log($"执行记录:任务号[{obj.Data2.TaskNumber}]");
-        }
-
-        public override bool Select(Device dev)
-        {
-            return dev.HasFlag(Extensions.DeviceFlags.环形库分流点);
-        }
-    }
-}

+ 1 - 1
成品库/WCS.WorkEngineering/WCS.WorkEngineering.csproj

@@ -22,7 +22,7 @@
   <ItemGroup>
     <PackageReference Include="MessagePack" Version="2.5.108" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
-    <PackageReference Include="ServiceCenter" Version="1.0.5" />
+    <PackageReference Include="ServiceCenter" Version="1.0.5.1" />
   </ItemGroup>
 
 </Project>