From a15d996584733d60d0adddcd791f029d608c4fae Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期日, 03 十一月 2024 09:57:56 +0800
Subject: [PATCH] 2222
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 175 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 insertions(+), 26 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 cab27ea..f2b2880 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -19,7 +19,7 @@
using AutoMapper;
using HslCommunication;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using Newtonsoft.Json;
using Quartz;
using SqlSugar;
using System.Reflection;
@@ -43,6 +43,7 @@
{
private readonly List<string> _deviceCodes1 = new List<string>() { "1063", "1061", "1060" };
private readonly List<string> _deviceCodes2 = new List<string>() { "1067", "1069", "1068" };
+ private readonly string[] HCTrayCode = { "1012", "1013" };
private readonly ITaskService _taskService;
private readonly ITaskRepository _taskRepository;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
@@ -127,6 +128,14 @@
// EmptyTrayReturn(conveyorLine, command, _deviceCodes2[_deviceCodes1.Count - 1], i);
// }
//}
+ foreach (var item in HCTrayCode)
+ {
+ ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(item);
+ if (command.InteractiveSignal != 2)
+ {
+ ChuanhuaOutbound(conveyorLine, command, HCTrayCode[0], 0);
+ }
+ }
Task.WaitAll(tasks.ToArray());
}
}
@@ -136,7 +145,7 @@
}
finally
{
- WriteDebug("CommonConveyorLineJob", "test");
+ //WriteDebug("CommonConveyorLineJob", "test");
//Console.Out.WriteLine(DateTime.Now);
}
return Task.CompletedTask;
@@ -152,39 +161,86 @@
public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
var taskNew = _taskService.QueryCraneConveyorLineTask(command.Barcode.ObjToInt(), childDeviceCode);
- var TaskTray = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
- if (TaskTray != null && TaskTray.TaskType == (int)TaskOutboundTypeEnum.OutTray)
+ var Taskout = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
+ if (Taskout != null)
{
// 绌烘墭鐩樹换鍔�
- if (TaskTray.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
+ if (Taskout.TaskType == (int)TaskOutboundTypeEnum.OutTray)
{
- ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(TaskTray);
- taskCommand.InteractiveSignal = command.InteractiveSignal;
- if (command.Barcode == "")
+ if (Taskout.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
{
- taskCommand.TargetAddress = 1092;
- }
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- _taskService.UpdateTaskStatusToNext(TaskTray);
- }
- else if(TaskTray.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
- {
- if(command.Barcode == "")
- {
- ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(TaskTray);
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
taskCommand.InteractiveSignal = command.InteractiveSignal;
- taskCommand.TargetAddress = 1092;
+ if (command.Barcode == "")
+ {
+ taskCommand.TargetAddress = 1092;
+ }
conveyorLine.SendCommand(taskCommand, childDeviceCode);
ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- _taskService.UpdateTaskStatusToNext(TaskTray);
+
+ _taskService.UpdateTaskStatusToNext(Taskout);
+ }
+ else if (Taskout.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
+ {
+ if (command.Barcode == "")
+ {
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
+ taskCommand.InteractiveSignal = command.InteractiveSignal;
+ taskCommand.TargetAddress = 1092;
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ _taskService.UpdateTaskStatusToNext(Taskout);
+ }
+ }
+ }
+ else if (Taskout.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ {
+ if (Taskout.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
+ {
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
+ taskCommand.InteractiveSignal = command.InteractiveSignal;
+ if (command.Barcode == "")
+ {
+ //todo 娌℃湁鏄庣‘寮傚父鍙ｏ紝閫佸埌鐩爣宸烽亾鐨凬G鍙�
+ //taskCommand.TargetAddress = 1092;
+ }
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+
+ _taskService.UpdateTaskStatusToNext(Taskout);
+ }
+ else if (Taskout.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
+ {
+ if (command.Barcode == "")
+ {
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
+ taskCommand.InteractiveSignal = command.InteractiveSignal;
+ // todo 閫佸埌鐩爣宸烽亾鐨凬G鍙�
+ taskCommand.TargetAddress = 1092;
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ _taskService.UpdateTaskStatusToNext(Taskout);
+ }
+ else
+ {
+ // todo 璋冪敤WMS浠诲姟瀹屾垚鎺ュ彛
+ var x = new { taskNum = Taskout.TaskNum };
+ var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result;
+ WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (content.Status)
+ {
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ _taskService.UpdateTaskStatusToNext(Taskout);
+ }
+ }
}
}
}
- if( taskNew == null)
+ if (taskNew == null)
{
if (_taskService.RequestWMSTask(command.Barcode, childDeviceCode).Status)
{
@@ -210,7 +266,7 @@
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- /// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
+ /// <param name="index">璇诲彇鐨勭涓�涓綅缃�</param>
public void EmptyTrayReturn(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index)
{
var tasks = _taskRepository.QueryData(x => (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) && x.TaskType == (int)TaskOutboundTypeEnum.OutTray);
@@ -228,10 +284,78 @@
Id = 0,
TaskType = (int)TaskOutboundTypeEnum.OutTray
};
+
+ #region 鐪熷疄鏁版嵁
+
+ // TODO: 璋冪敤鎺ュ彛鑾峰彇涓嬩竴涓湴鍧�
+ //RequestTaskDto request = new RequestTaskDto()
+ //{
+ // Position = sourceAddress,
+ // PalletCode = palletCode,
+ //};
+
+ //// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ //var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", request.ToJsonString()).Result;
+
+ //// 鍙嶅簭鍒楀寲鍝嶅簲鍐呭
+ //WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+
+ //// 妫�鏌ョ姸鎬佸苟杩斿洖
+ ////if (!content.Status)
+ //// return content;
+
+ //// 鍙嶅簭鍒楀寲浠诲姟鏁版嵁
+ //WMSTaskDTO task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
+
+ #endregion
+
var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
if (content.Status)
{
Console.WriteLine("绌烘墭鐩樺懠鍙垚鍔�");
+ }
+ }
+ }
+
+ /// <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, int index)
+ {
+ var tasks = _taskRepository.QueryData(x => (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) && x.TaskType == (int)TaskOutboundTypeEnum.Outbound);
+ if (tasks.Count <= index)
+ {
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
+ Grade = 1,
+ PalletCode = DateTime.Now.ToString("MMddHHmmss"),
+ RoadWay = "CHSC01",
+ SourceAddress = "001-001-001",
+ TargetAddress = childDeviceCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ Id = 0,
+ TaskType = (int)TaskOutboundTypeEnum.Outbound,
+ };
+
+ var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
+ if (content.Status)
+ {
+ Console.WriteLine("鍑哄簱鍛煎彨鎴愬姛");
+ }
+ }
+ else
+ {
+ Dt_Task task = tasks[index];
+ if (task != null)
+ {
+ ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
+ taskCommand.InteractiveSignal = command.InteractiveSignal;
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
}
}
}
@@ -270,7 +394,6 @@
if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
{
ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
//conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode);
WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
--
Gitblit v1.9.3