From fad50ce39766a37d95eed4d7c5df01b9caa5143c Mon Sep 17 00:00:00 2001 From: liuwf Date: Sat, 31 Aug 2024 11:54:06 +0800 Subject: [PATCH] . --- src/Khd.Core.Api/Controllers/RecieveRcsController.cs | 2 +- src/Khd.Core.Application/WcsTaskApplication.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Khd.Core.Api/Controllers/RecieveRcsController.cs b/src/Khd.Core.Api/Controllers/RecieveRcsController.cs index 8e68c16..3474a03 100644 --- a/src/Khd.Core.Api/Controllers/RecieveRcsController.cs +++ b/src/Khd.Core.Api/Controllers/RecieveRcsController.cs @@ -54,7 +54,7 @@ namespace Khd.Core.Api.Controllers [HttpPost("agvComplete")] public AgvCompeletedResponse MesToAgvComplete(AgvCompeleted agvCompeletedRequest) { - LogManager.Info($"RecieveRcsController接口信息:{agvCompeletedRequest.ToJsonString()}"); + LogManager.Info($"agvComplete接口信息:{agvCompeletedRequest.ToJsonString()}"); return _application.MesToAgvComplete(agvCompeletedRequest); } diff --git a/src/Khd.Core.Application/WcsTaskApplication.cs b/src/Khd.Core.Application/WcsTaskApplication.cs index f8de10a..ce42d71 100644 --- a/src/Khd.Core.Application/WcsTaskApplication.cs +++ b/src/Khd.Core.Application/WcsTaskApplication.cs @@ -166,10 +166,11 @@ namespace Khd.Core.Application { var wcsTask = _dbContext.WcsTask .Where(t => (t.taskType == 32 || t.taskType == 48) && (t.endPointId == baseEquip.objid || t.currPointId == baseEquip.objid)) - .OrderByDescending(t => t.createTime) + .OrderBy(t => t.createTime) .FirstOrDefault(); if (wcsTask != null) { + LogManager.Info($"agvComplete接口找到任务:{wcsTask.ToJsonString()}"); if (wcsTask.taskType != 48 && wcsTask.taskStatus != 0) { wcsTask.taskStatus = 7; @@ -178,6 +179,7 @@ namespace Khd.Core.Application _dbContext.SaveChanges(); agvCompeletedResponse.code = "0"; agvCompeletedResponse.message = "成功"; + LogManager.Info($"agvComplete更新任务状态7{wcsTask.ToJsonString()}"); } else if (wcsTask.taskStatus != 0) {