From ca54eceeebeceea3b6c75e3dbfa3b715806c6106 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期五, 15 十一月 2024 16:38:23 +0800
Subject: [PATCH] 1
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 78 +++++++++++---------------------------
1 files changed, 23 insertions(+), 55 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index 16dccc6..3bd8816 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -196,26 +196,30 @@
}
}
+ #region 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
+
/// <summary>
/// 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
/// </summary>
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
- {
- Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
- if (task != null)
- {
- Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
- if (newTask != null)
- {
- ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
- taskCommand.InteractiveSignal = command.InteractiveSignal;
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
- }
- }
- }
+ //public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
+ //{
+ // Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
+ // if (task != null)
+ // {
+ // Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
+ // if (newTask != null)
+ // {
+ // ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
+ // taskCommand.InteractiveSignal = command.InteractiveSignal;
+ // conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ // }
+ // }
+ //}
+
+ #endregion
/// <summary>
/// 杈撻�佺嚎鍏ュ簱瀹屾垚
@@ -234,7 +238,7 @@
//conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode);
WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
- Console.Out.WriteLine(content.Serialize());
+ //Console.Out.WriteLine(content.Serialize());
}
}
@@ -304,16 +308,14 @@
taskCommand.TargetAddress = 0;
}
-
conveyorLine.SendCommand(taskCommand, childDeviceCode);
ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
content = _taskService.UpdateTaskStatusToNext(task);
}
}
-
/// <summary>
- /// 闄堝寲绌烘墭鐩樺嚭搴�
+ /// 鐩戞祴绌烘墭鐩樺疄鐩樺嚭搴�
/// </summary>
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
@@ -332,45 +334,8 @@
}
catch (Exception)
{
-
}
}
-
- #region
- ///// <summary>
- ///// 闄堝寲瀹炵洏鍑哄簱)
- ///// </summary>
- ///// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
- ///// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
- ///// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- ///// <param name="index">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
- //public void ChuanhuaOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
- //{
- // CheckAndCreateTask(TaskOutboundTypeEnum.Outbound, childDeviceCode, "CHSC01", "001-001-001");
- //}
-
- ///// 闈欑疆绌烘墭鐩樺嚭搴�
- ///// </summary>
- ///// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
- ///// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
- ///// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- ///// <param name="index">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
- //public void EmptyTrayOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index)
- //{
- // CheckAndCreateTask(TaskOutboundTypeEnum.OutTray, childDeviceCode, index, "JZSC01", "002-020-001");
- //}
- ///// <summary>
- ///// 闈欑疆瀹炵洏鍑哄簱
- ///// </summary>
- ///// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
- ///// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
- ///// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- ///// <param name="index">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
- //public void JingzhiOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index)
- //{
- // CheckAndCreateTask(TaskOutboundTypeEnum.Outbound, childDeviceCode, index, "JZSC01", "002-000-001");
- //}
- #endregion
/// <summary>
/// 妫�鏌ヤ换鍔″苟鍒涘缓鏂颁换鍔�
@@ -381,6 +346,7 @@
if (tasks.Count < index)
{
#region 璋冪敤WMS鑾峰彇鍑哄簱浠诲姟
+
WMSTaskDTO taskDTO = new WMSTaskDTO();
object dynamic = new
{
@@ -398,6 +364,7 @@
return;
taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
+
#endregion
CreateAndSendTask(taskDTO);
@@ -416,6 +383,7 @@
}
return content;
}
+
/// <summary>
/// 杈撻�佺嚎浜や簰瀹屾垚
/// </summary>
--
Gitblit v1.9.3