林豪 左 1 year ago
parent
commit
37744a40f5

+ 4 - 3
WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -6,6 +6,7 @@ using ServiceCenter.SqlSugars;
 using System.ComponentModel;
 using WCS.Core;
 using WCS.Entity;
+using WCS.Entity.Protocol.Protocol.Station;
 using WCS.WorkEngineering.Extensions;
 using WCS.WorkEngineering.Worlds;
 using DeviceFlags = WCS.WorkEngineering.Extensions.DeviceFlags;
@@ -18,7 +19,7 @@ namespace WCS.WorkEngineering.Systems
     /// </summary>
     [BelongTo(typeof(NoInteractionWorld))]
     [Description("无交互系统")]
-    public class NoInteractionSystems : DeviceSystem<Station>
+    public class NoInteractionSystems : DeviceSystem<Device<IStation520>>
     {
         public NoInteractionSystems()
         {
@@ -28,7 +29,7 @@ namespace WCS.WorkEngineering.Systems
 
         protected override bool SaveLogsToFile => true;
 
-        public override void Do(Station obj)
+        public override void Do(Device<IStation520> obj)
         {
             var key = $"WCS:Lock:无交互系统{obj.Entity.Code}";
             try
@@ -192,7 +193,7 @@ namespace WCS.WorkEngineering.Systems
 
         public override bool Select(Device dev)
         {
-            return dev.Code == "2532";
+            return dev.Code == nameof(NoInteractionSystems);
         }
     }
 }

+ 2 - 0
WCS.WorkEngineering/Systems/RGVSystems.cs

@@ -44,6 +44,7 @@ namespace WCS.WorkEngineering.Systems
 
         public override void Do(Device<IRGV520, IRGV521, IBCR81> obj)
         {
+
             if (obj.Data.VoucherNo != obj.Data2.VoucherNo) throw new KnownException($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}", LogLevelEnum.High);
             if (obj.Data2.WorkMode != RGVWorkMode.Automatic) return;
 
@@ -74,6 +75,7 @@ namespace WCS.WorkEngineering.Systems
                             {
                                 //开始处理对应的搬运任务信息
                                 var task = db.Queryable<WCS_TaskInfo>().First(x => x.Type == TaskType.Delivery && x.ID == obj.Data2.TaskNumber && x.AddrTo == obj.Data2.DestPosition.ToString());
+                                if (task == null) throw new KnownException($"未找到对应的任务{obj.Data2.TaskNumber}", LogLevelEnum.Mid);
                                 task.BarCode = bcrCode;
                                 db.Updateable(task).ExecuteCommand();
                                 task.AddWCS_TASK_DTL(db, obj.Entity.Code, obj.Data2.DestPosition.ToString(), $"环形库码垛位{obj.Data2.DestPosition}搬运任务绑定条码信息{bcrCode}");

+ 0 - 4
WCS.WorkEngineering/Systems/环形库/环形库码垛结束.cs

@@ -28,10 +28,6 @@ namespace WCS.WorkEngineering.Systems.环形库
 
         public override void Do(Device<IStation520, IStation521, IStation523, IRobot530, IRobot531> obj)
         {
-            if (obj.Entity.Code == "1666")
-            {
-                obj.Data.GoodsEnd = 1604;
-            }
             if (!obj.Data5.CmdType.HasFlag(RobotCmdType.End)) obj.Data4.CmdType = 0;
             if (!obj.Data3.Status.HasFlag(StationStatus.PH_Status)) return;
             if (!obj.Data5.CmdType.HasFlag(RobotCmdType.End)) return;

+ 1 - 1
WCS.WorkEngineering/WorkStart.cs

@@ -28,7 +28,7 @@ namespace WCS.WorkEngineering
         {
             #region 无交互触发设备
 
-            var devs = new List<string>() { nameof(分线计算09), nameof(桁架码垛区补空托盘任务生成), "出库AGV", "入库AGV","任务初始化" };
+            var devs = new List<string>() { nameof(分线计算09), nameof(桁架码垛区补空托盘任务生成), "出库AGV", "入库AGV",nameof(NoInteractionSystems) };
             foreach (var conv in devs.Select(code => new Device(code)))
             {
                 conv.AddProtocol<IStation520>(0, 520, "1");