13

src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs

@@ -36,6 +36,6 @@ namespace Khd.Core.Domain.Models
 
         [Column("remark")]
         public string Remark { get; set; }
-        public string Status { get; set; }
+        //public string Status { get; set; }
     }
 }

src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs

@@ -150,7 +150,10 @@ namespace Khd.Core.Wcs.Wcs
                         {
                             if (task.taskType == StaticTaskType.FiveAccessoryOut)
                             {
-                                dbContext.WcsTask.Where(t => t.objid == task.objid).Delete();
+                                //dbContext.WcsTask.Where(t => t.objid == task.objid).Delete();
+                                List<WcsTask> wcsTasks = dbContext.WcsTask.Where(t => t.taskType == StaticTaskType.FiveAccessoryOut)
+                                    .Where(t => t.taskStatus == 6).ToList();
+                                dbContext.RemoveRange(wcsTasks);
                                 //根据rfid找到库位
                                 //生成入库任务
                                 var wmsBaseLocation = dbContext.WmsBaseLocation.FirstOrDefault(t => t.containerCode == rfid);
@@ -398,13 +401,7 @@ namespace Khd.Core.Wcs.Wcs
                                     Console.WriteLine(DateTime.Now + ":五楼CTU线程开始任务" + item.currPointNo + "," + item.endPointNo);
                                     item.taskCode = reponseMessage.data;
                                     item.taskStatus = 1;
-                                    #region 如果已经开始入库,还有出库任务，删除出库任务
+             
-                                    var outTaskList = taskList.Where(x => x.taskType == 30).ToList();
-                                    if (outTaskList.Count > 0)
-                                    {
-                                        dbContext.Remove(outTaskList);
-                                    }
-                                    #endregion
                                     dbContext.Update(item);
                                     dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 1 });
                                     dbContext.SaveChanges();

src/Khd.Core.Wcs/Wcs/SystemTimer.cs

@@ -6,6 +6,7 @@ using Khd.Core.Library.Mapper;
 using Khd.Core.Plc.S7;
 using Khd.Core.Wcs.Global;
 using Masuit.Tools;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
@@ -99,7 +100,8 @@ namespace Khd.Core.Wcs.Wcs
                                     };
                     foreach (var item in agvStatus)
                     {
-                        var dmsBaseAlarmRule = StaticData.DmsBaseAlarmRuleList.Where(t => t.Status == item.Status).FirstOrDefault();
+                        //var dmsBaseAlarmRule = StaticData.DmsBaseAlarmRuleList.Where(t => t.Status == item.Status).FirstOrDefault();
+                        var dmsBaseAlarmRule = StaticData.DmsBaseAlarmRuleList.FirstOrDefault();
                         if (dmsBaseAlarmRule != null)
                         {
                             DmsRecordAlarmTime alarmTime = new DmsRecordAlarmTime
@@ -563,7 +565,7 @@ namespace Khd.Core.Wcs.Wcs
                 CtuCmdLogic();
                 UpdatePlcPointValue();
                 BasePlcPointUpdateLogic();
-                Thread.Sleep(3000);
+                Thread.Sleep(500);
             }
         }
 
@@ -752,8 +754,8 @@ namespace Khd.Core.Wcs.Wcs
             {
                 using var scope = host.Services.CreateScope();
                 using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
-                var baseEquip = StaticData.BaseEquip.First(t => t.objid == 8);
                 dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
+                var baseEquip = StaticData.BaseEquip.First(t => t.objid == 8);
                 var basePlcs = StaticData.basePlcs.Where(t => t.Station == "2楼AGV").ToList();
                 var data = new
                 {