From 201f679225383f21d6fcce0d60d17a1b9c4cd36f Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期六, 24 一月 2026 09:49:51 +0800
Subject: [PATCH] 优化巷道逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index e51535e..c7bbfbe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -15,6 +15,7 @@
*----------------------------------------------------------------*/
#endregion << 鐗� 鏈� 娉� 閲� >>
+using Autofac.Core;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System;
@@ -40,19 +41,28 @@
{
IRepository<Dt_Task> Repository { get; }
-
+ WebResponseContent CESTEXT();
//浠诲姟鍙嶉
WebResponseContent TaskCompleted(WCSTaskDTO wCSTask);
//WCS鍏ュ簱鑾峰彇
WebResponseContent PalletInboundTask(WCSTaskDTO wCSTask);
+ //涓婁紶MES锛屾墜鍔ㄥ畬鎴�
+ WebResponseContent MESManualUpload(SaveModel saveModel);
+
+ //鎭㈠浠诲姟
+ WebResponseContent WMSTaskRecovery(SaveModel saveModel);
+
+
+
+
#region WCS浠诲姟妯″潡
//涓嬪彂WCS杈撻�佺嚎浠诲姟
- WCSginseng PLC_IssueTasks(int TaskId, int AreaNo, string ContainerNo, int ContainerType, string FromPoint, string ToPoint);
+ WCSginseng PLC_IssueTasks(int TaskId, int AreaNo, string TransNo, string ContainerNo, int ContainerType, string FromPoint, string ToPoint, string ToStation);
//涓嬪彂WCS鍫嗗灈鏈轰换鍔�
- WCSginseng SC_IssueTasks(int TaskId, int AreaNo, string ContainerNo, int ContainerType, string FromPoint, string ToPoint);
+ WCSginseng SC_IssueTasks(int TaskId, int AreaNo, string TransNo, string ContainerNo, int ContainerType, string FromPoint, string ToPoint, string ToStation);
#endregion
@@ -79,7 +89,7 @@
//鍏ュ簱浠诲姟鍙嶉鎺ュ彛
MES_parameter InStoreDocCallback(string TransNo, string Result, string ResultMsg, string ContainerNo, string LocationCode);
//鍑哄簱浠诲姟鍙嶉鎺ュ彛
- MES_parameter OutStoreDocCallback(string TransNo, string Result, string ResultMsg, string ContainerNo, string LocationCode);
+ MES_parameter OutStoreDocCallback(string TransNo, string Result, string ResultMsg);
//鍌ㄤ綅寮傚姩鐢宠
MES_parameter ApplicationChangeStorageLocation(string ContainerNo, string OriginalLocationCode, string NewLocationCode);
@@ -88,5 +98,23 @@
/// 浠诲姟寮傚父
MES_parameter ToMES_TaskException(string TransNo, string EquipmentType, string EquipmentNumber, string ErrorInfo);
#endregion
+
+
+ #region 浠诲姟闃熷垪锛岃幏鍙栦换鍔℃ā鍧�
+ //鑾峰彇浠诲姟闃熷垪
+ List<Dt_Task> GetaskQueue(string deviceId);
+
+ //鏍规嵁璁惧鑾峰彇鏄惁鏈夊湪鎵ц鐨勪换鍔�
+ bool CurrentTaskProgress(string deviceId);
+
+ //鑾峰彇杈撻�佺嚎闇�瑕佷笅鍙戠殑浠诲姟
+ List<Dt_Task> GetaskQueuePLC();
+
+ //鑾峰彇鏄惁鏈夌Щ搴撲换鍔�
+ Dt_Task GeRelocationTaskQueue(string LocationCode);
+
+ //鍒ゆ柇褰撳墠鍫嗗灈鏈烘槸鍚︽湁绉诲簱浠诲姟
+ bool RelocationTaskProgress(string deviceId);
+ #endregion
}
}
--
Gitblit v1.9.3