gkj 2 년 전
부모
커밋
53e4b2205c
3개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 2
      ServiceCenter/Redis/RedisHub.cs
  2. 1 1
      WCS.WorkEngineering/Systems/AgvSystems.cs
  3. 4 3
      WCS.WorkEngineering/Systems/DataCollectionSysyem.cs

+ 1 - 2
ServiceCenter/Redis/RedisHub.cs

@@ -121,8 +121,7 @@ namespace ServiceCenter.Redis
             get
             {
                 {
-                    if (WMS == null)
-                        throw new Exception("请先设置WMSRedisDB库,调用静态方法SetWMSContextTypee()");
+                    if (WMSContextType == null) throw new Exception("请先设置WMSRedisDB库,调用静态方法SetWMSContextTypee()");
                     return Context(WMSContextType);
                 }
             }

+ 1 - 1
WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -42,7 +42,7 @@ namespace WCS.WorkEngineering.Systems
                 {
                     //获取所有未结束的叫料及背负式补空AGV任务
                     var agvTaks = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => (v.TaskType == AGVTaskType.CallMaterial || v.TaskType == AGVTaskType.CallForMaterial))
-                                                                         .Where(v => v.Status < AGVTaskStatus.MissionCompleted && v.Status > AGVTaskStatus.NewBuild)
+                                                                         .Where(v => v.Status < AGVTaskStatus.MissionCompleted)
                                                                          .SplitTable(tabs => tabs.Take(2)).ToList();
                     foreach (var agv in agvTaks)
                     {

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

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Microsoft.OpenApi.Extensions;
+using Newtonsoft.Json;
 using ServiceCenter;
 using ServiceCenter.Extensions;
 using ServiceCenter.Redis;
@@ -74,7 +75,7 @@ namespace WCS.Service.Systems
                         var d81 = Bcrs.First(v => v.Entity.Code == item.Entity.Code);
                         dev.D81 = TypeExtension.Mapper<WCS_BCR81, IBCR81>(d81.Data);
                     }
-                    //RedisHub.WMS.Set(item.Entity.Code, item.Data2.Mode);
+                    RedisHub.WMS.Set(item.Entity.Code, item.Data2.Mode);
 
                     DevList.Add(dev);
                 }
@@ -91,7 +92,7 @@ namespace WCS.Service.Systems
                         D521 = TypeExtension.Mapper<WCS_SRM521, ISRM521>(item.Data2),
                         D537 = TypeExtension.Mapper<WCS_SRM537, ISRM537>(item.Data3),
                     };
-                    //RedisHub.WMS.Set(item.Entity.Code, item.Data2.AutoStatus);
+                    RedisHub.WMS.Set(item.Entity.Code, item.Data2.AutoStatus);
                     srmList.Add(dev);
                 }
                 pack.SRMDatas = new DeviceDataCollection<SRMData>(DateTime.Now, srmList.ToArray());