0813

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

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

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

@@ -10,6 +10,7 @@ using Masuit.Tools;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
+using System.Diagnostics;
 using Z.EntityFramework.Plus;
 
 namespace Khd.Core.Wcs.Wcs
@@ -150,10 +151,14 @@ namespace Khd.Core.Wcs.Wcs
                         {
                             if (task.taskType == StaticTaskType.FiveAccessoryOut)
                             {
-                                //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);
+                                dbContext.WcsTask.Where(t => t.objid == task.objid).Delete();
+                                #region 如果已经开始入库,还有出库任务，删除出库任务
+                                List<WcsTask> outTasks = dbContext.WcsTask.Where(t => t.taskType == StaticTaskType.FiveAccessoryOut && t.taskStatus == 6).ToList();
+                                if(outTasks!=null && outTasks.Count > 0)
+                                {
+                                    dbContext.RemoveRange(outTasks);
+                                }                              
+                                #endregion
                                 //根据rfid找到库位
                                 //生成入库任务
                                 var wmsBaseLocation = dbContext.WmsBaseLocation.FirstOrDefault(t => t.containerCode == rfid);
@@ -401,7 +406,7 @@ namespace Khd.Core.Wcs.Wcs
                                     Console.WriteLine(DateTime.Now + ":五楼CTU线程开始任务" + item.currPointNo + "," + item.endPointNo);
                                     item.taskCode = reponseMessage.data;
                                     item.taskStatus = 1;
-             
+
                                     dbContext.Update(item);
                                     dbContext.WcsTaskLog.Where(t => t.objid == item.objid).Update(t => new WcsTaskLog() { taskStatus = 1 });
                                     dbContext.SaveChanges();
@@ -457,6 +462,7 @@ namespace Khd.Core.Wcs.Wcs
                                                 ExecuteInTask(baseEquip);
                                             }
                                         }
+
                                         dbContext.SaveChanges();
                                     }
                                     else