From 073a38d08332a26389cfeac77358795475085e42 Mon Sep 17 00:00:00 2001 From: liuwf Date: Tue, 13 Aug 2024 14:28:22 +0800 Subject: [PATCH 1/2] . --- src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs b/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs index b5f0480..7a13af6 100644 --- a/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs +++ b/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs @@ -36,6 +36,7 @@ namespace Khd.Core.Domain.Models [Column("remark")] public string Remark { get; set; } + [Column("status")] public string Status { get; set; } } } From c318c49fc2a7248c27f4b056b93fa69108481687 Mon Sep 17 00:00:00 2001 From: liuwf Date: Tue, 13 Aug 2024 15:59:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?change-=E6=94=BE=E5=BC=80=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99=E5=8F=8A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?ctu=E5=88=A0=E9=99=A4=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs | 17 ++++++++++------- src/Khd.Core.Wcs/Wcs/SystemTimer.cs | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs index 509c126..e7dbbf1 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs +++ b/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 @@ -151,6 +152,13 @@ namespace Khd.Core.Wcs.Wcs if (task.taskType == StaticTaskType.FiveAccessoryOut) { dbContext.WcsTask.Where(t => t.objid == task.objid).Delete(); + #region 如果已经开始入库,还有出库任务，删除出库任务 + List 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); @@ -398,13 +406,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(); @@ -460,6 +462,7 @@ namespace Khd.Core.Wcs.Wcs ExecuteInTask(baseEquip); } } + dbContext.SaveChanges(); } else diff --git a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs index b499983..80410cc 100644 --- a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs +++ b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs @@ -563,7 +563,7 @@ namespace Khd.Core.Wcs.Wcs CtuCmdLogic(); UpdatePlcPointValue(); BasePlcPointUpdateLogic(); - Thread.Sleep(3000); + Thread.Sleep(500); } }