From 968d603a08117e7e6707ffe07c6da9c325e36c08 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 12 五月 2025 17:04:17 +0800
Subject: [PATCH] 完成并测试抽检出库的逻辑，修复相关问题
---
Services/AgvService.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/Services/AgvService.cs b/Services/AgvService.cs
index 593c21f..544a88d 100644
--- a/Services/AgvService.cs
+++ b/Services/AgvService.cs
@@ -11,6 +11,8 @@
using static HH.WCS.Mobox3.DSZSH.Dtos.Request.AgvRequest;
using static HH.WCS.Mobox3.DSZSH.Dtos.Response.AgvResponse;
+using System.Threading.Tasks;
+using HH.WCS.Mobox3.DSZSH.ServiceCore;
namespace HH.WCS.Mobox3.DSZSH.Services {
public class AgvService {
@@ -55,7 +57,7 @@
}
/// <summary>
- /// 鎵ц AGV 浠诲姟锛屾煡璇笉鍒颁换鍔¤繑鍥�<see langword="false"/>锛堢鏈夋柟娉曪紝鍐呴儴璋冪敤锛�+ /// 鎵ц AGV 浠诲姟锛屾煡璇笉鍒颁换鍔¤繑鍥�<see langword="false"/>
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -81,7 +83,11 @@
TaskHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚"); // 浠诲姟鐘舵�鏀规垚鍙栬揣瀹屾垚
TaskHelper.OperateStatus(TN_Task, 4); // 璧风偣瀹瑰櫒璐т綅瑙ｇ粦,瑙ｉ攣璧风偣
-
+ if (TN_Task.S_TYPE == TaskName.鎴愬搧鑳跺嚭搴� {
+ var nextOutboundTask = Task.Run(() => {
+ OutboundCore.UpdateTaskState(SpotStateCode.浠诲姟鎵ц瀹屾垚);
+ });
+ }
break;
case AgvStateCode.寮�鍗歌揣:
@@ -93,6 +99,13 @@
break;
case AgvStateCode.瀹屾垚:
TaskHelper.End(TN_Task); // 浠诲姟鐘舵�鏀规垚缁撴潫
+
+ if (TN_Task.S_TYPE == TaskName.鎶芥) {
+ var checkCompleteTask = Task.Run(() => {
+ CheckCore.UpdateTaskState(SpotStateCode.浠诲姟鎵ц瀹屾垚);
+ });
+ }
+
break;
case AgvStateCode.寮傚父:
TaskHelper.OperateStatus(TN_Task, 7); // 寮傚父澶勭悊
@@ -115,15 +128,17 @@
ModbusHelper.Relink();
try {
+
+
var prodLineInfo = AppStart.Settings.Config.ProductionLines[0];
var prodLineDevice = new ProductionLineDevice(prodLineInfo.PlcIp, prodLineInfo.PlcPort);
if (!prodLineDevice.LoadDeviceStateOk()) {
LogHelper.Info("鍔犺浇璁惧淇℃伅澶辫触");
}
- var tn_task = db.Queryable<TN_Task>().First(a => a.S_CODE == model.task_no);
+ var tn_task = db.Queryable<TN_Task>().First(a => a.S_CODE == model.TaskNo);
if (tn_task == null) {
- LogHelper.Info($"浠诲姟鍙�'{model.task_no}' 涓嶅瓨鍦�);
+ LogHelper.Info($"浠诲姟鍙�'{model.TaskNo}' 涓嶅瓨鍦�);
}
// 寰呬慨鏀癸細琛ュ厖涓嶅悓鍒嗘敮AGV鍒ゆ柇
--
Gitblit v1.9.1