From b24ef0d9a6a572529cf7e34a0fc8de4fa24bb9e7 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期二, 24 十二月 2024 12:59:53 +0800
Subject: [PATCH] 合并
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 444 +++++++++++++++++++++++++++++++------------------------
1 files changed, 251 insertions(+), 193 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 71047ab..a2d0d4f 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -1,5 +1,6 @@
锘縰sing AutoMapper;
using HslCommunication;
+using NetTaste;
using Newtonsoft.Json;
using Quartz;
using SqlSugar;
@@ -42,6 +43,10 @@
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ICacheService _cacheService;
private readonly INoticeService _noticeService;
+
+ private static List<string>? userTokenIds;
+ private static List<int>? userIds;
+
public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService)
{
@@ -152,50 +157,62 @@
private Task ProcessDeviceAsync(CommonConveyorLine conveyorLine, string childDeviceCode)
{
- // 璇诲彇浠诲姟鍛戒护鍜岃澶囧懡浠�
- ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
- ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(childDeviceCode, "DeviceCommand");
- if (command != null && commandWrite != null)
+ try
{
- #region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
- // 鑾峰彇缂撳瓨涓殑鐢ㄦ埛淇℃伅
- var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
- if (tokenInfos != null && tokenInfos.Any())
+ // 璇诲彇浠诲姟鍛戒护鍜岃澶囧懡浠�
+ ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
+ ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(childDeviceCode, "DeviceCommand");
+ if (command != null && commandWrite != null)
{
- var userTokenIds = tokenInfos.Select(x => x.Token_ID).ToList();
- var userIds = tokenInfos.Select(x => x.UserId).ToList();
- // 鏋勯�犻�氱煡鏁版嵁
- object obj = new
+ #region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
+
+ // 鑾峰彇缂撳瓨涓殑鐢ㄦ埛淇℃伅
+ if (userTokenIds == null && userIds == null)
{
- command,
- commandWrite
- };
- // 鍙戦�侀�氱煡
- _noticeService.LineData(userIds.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, childDeviceCode, data = obj });
- }
-
- #endregion 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
-
- // 灏嗕氦浜掍俊鍙疯浆鎹负甯冨皵鏁扮粍
- var writeInteractiveSignal = commandWrite.WriteInteractiveSignal;
- var structs = BitConverter.GetBytes(writeInteractiveSignal).Reverse().ToArray().ToBoolArray();
- // 鑾峰彇璁惧鍗忚璇︽儏
- List<DeviceProtocolDetailDTO>? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.Where(x => x.DeviceProParamName == nameof(ConveyorLineTaskCommand.InteractiveSignal)).ToList();
-
- if (deviceProtocolDetails != null)
- {
- foreach (var item in deviceProtocolDetails)
- {
- int itemValue = item.ProtocalDetailValue.ObjToInt();
- if (structs[itemValue] == true)
+ var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
+ if (tokenInfos != null && tokenInfos.Any())
{
- var numRead = itemValue;
- var numWrite = itemValue + 1;
- // 杈撳嚭璀﹀憡淇℃伅
- ConsoleHelper.WriteWarningLine($"銆恵conveyorLine.DeviceName}銆戙�恵childDeviceCode}銆戙�恵numRead.ToString()}銆戜綅杈撻�佺嚎璇诲彇淇″彿锛氥�恵structs[itemValue]}銆� 銆恵numWrite}銆戜綅WCS鍐欏叆淇″彿锛氥�恵structs[itemValue + 1]}銆�");
- if (structs[itemValue + 1] != structs[itemValue])
+ userTokenIds = tokenInfos.Select(x => x.Token_ID).ToList();
+ userIds = tokenInfos.Select(x => x.UserId).ToList();
+
+ // 鏋勯�犻�氱煡鏁版嵁
+ object obj = new
+ {
+ command,
+ commandWrite
+ };
+ // 鍙戦�侀�氱煡
+ _noticeService.LineData(userIds.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, childDeviceCode, data = obj });
+ }
+ }
+ else
+ {
+ // 鏋勯�犻�氱煡鏁版嵁
+ object obj = new
+ {
+ command,
+ commandWrite
+ };
+ // 鍙戦�侀�氱煡
+ _noticeService.LineData(userIds.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, childDeviceCode, data = obj });
+ }
+
+ #endregion 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
+
+ // 灏嗕氦浜掍俊鍙疯浆鎹负甯冨皵鏁扮粍
+ var writeInteractiveSignal = commandWrite.WriteInteractiveSignal;
+ var structs = BitConverter.GetBytes(writeInteractiveSignal).Reverse().ToArray().ToBoolArray();
+ // 鑾峰彇璁惧鍗忚璇︽儏
+ List<DeviceProtocolDetailDTO>? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.Where(x => x.DeviceProParamName == nameof(ConveyorLineTaskCommand.InteractiveSignal)).ToList();
+
+ if (deviceProtocolDetails != null)
+ {
+ foreach (var item in deviceProtocolDetails)
+ {
+ int itemValue = item.ProtocalDetailValue.ObjToInt();
+ if (structs[itemValue] == true)
{
// 鑾峰彇澶勭悊鏂规硶
MethodInfo? method = GetType().GetMethod(item.ProtocolDetailType);
@@ -206,39 +223,44 @@
method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, itemValue });
}
}
- }
- else
- {
- // 鍙戦�佸畬鎴愪俊鍙�
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, itemValue, false);
- }
- }
- }
-
- // 鏌ヨ骞冲彴淇℃伅
- Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
- if (platform != null && !string.IsNullOrEmpty(platform.Location))
- {
- var strings = platform.Location.Split(',').ToList();
- foreach (var ite in strings)
- {
- // 璇诲彇浠诲姟鍛戒护
- ConveyorLineTaskCommand command1 = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(ite);
- if (command1.InteractiveSignal != 2)
- {
- command.InteractiveSignal = writeInteractiveSignal;
- int count = strings.Count;
- // 鑾峰彇澶勭悊鏂规硶
- MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);
- if (method != null)
+ else
{
- command.InteractiveSignal = commandWrite.WriteInteractiveSignal;
- // 璋冪敤澶勭悊鏂规硶
- method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
- };
+ // 鍙戦�佸畬鎴愪俊鍙�
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, itemValue, false);
+ }
}
}
+
+ // 鏌ヨ骞冲彴淇℃伅
+ Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
+ if (platform != null && !string.IsNullOrEmpty(platform.Location))
+ {
+ var strings = platform.Location.Split(',').ToList();
+ foreach (var ite in strings)
+ {
+ // 璇诲彇浠诲姟鍛戒护
+ ConveyorLineTaskCommand command1 = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(ite);
+ if (command1.InteractiveSignal != 2)
+ {
+ command.InteractiveSignal = writeInteractiveSignal;
+ int count = strings.Count;
+ // 鑾峰彇澶勭悊鏂规硶
+ MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);
+ if (method != null)
+ {
+ command.InteractiveSignal = commandWrite.WriteInteractiveSignal;
+ // 璋冪敤澶勭悊鏂规硶
+ method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
+ };
+ }
+ }
+ }
+
}
+ }
+ catch (Exception ex)
+ {
+
}
return Task.CompletedTask;
}
@@ -252,12 +274,16 @@
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
/// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
- public async Task RequestInboundAsync(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
+ public async Task RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
try
{
// 杈撳嚭璀﹀憡淇℃伅锛岃〃绀轰换鍔″凡鍒拌揪瀛愯澶囧苟璇锋眰鎵爜鍏ュ簱
- ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�");
+ var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�";
+ ConsoleHelper.WriteWarningLine(log);
+ // 鍙戦�侀�氱煡
+ await _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+ WriteInfo(conveyorLine.DeviceName, log);
// 鏌ヨ鏉＄爜瀵瑰簲鐨勪换鍔�
var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
@@ -352,37 +378,45 @@
/// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
- ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚");
- var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
- if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
+ try
{
- if (command.Barcode == task.PalletCode && childDeviceCode == task.NextAddress)
+
+ ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚");
+ var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
+ if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
{
- //conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, "1000", childDeviceCode);
-
- ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆愮瓑寰呭垎閰嶈揣浣�,骞跺啓鍏�1000銆�");
-
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ if (command.Barcode == task.PalletCode && childDeviceCode == task.NextAddress)
{
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
+ //conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, "1000", childDeviceCode);
- var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
- task.CurrentAddress = station.stationLocation;
- task.NextAddress = station.stationNGLocation;
- task.TargetAddress = task.NextAddress;
- task.TaskState = nextStatus;
- task.ModifyDate = DateTime.Now;
- task.Modifier = "System";
- _taskRepository.UpdateData(task);
- }
- else
- {
- WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
- Console.Out.WriteLine(content.ToJsonString());
+ ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆愮瓑寰呭垎閰嶈揣浣�,骞跺啓鍏�1000銆�");
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ {
+ int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
+
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
+ task.CurrentAddress = station.stationLocation;
+ task.NextAddress = station.stationNGLocation;
+ task.TargetAddress = task.NextAddress;
+ task.TaskState = nextStatus;
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ _taskRepository.UpdateData(task);
+ }
+ else
+ {
+ WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
+ Console.Out.WriteLine(content.ToJsonString());
+ }
}
}
+ }
+ catch (Exception ex)
+ {
+
}
}
@@ -399,41 +433,49 @@
/// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
- // 鏌ヨ杈撻�佺嚎浠诲姟锛屾牴鎹緭閫佺嚎璁惧鍜屽瓙璁惧浠ｇ爜鑾峰彇浠诲姟淇℃伅
- var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
-
- // 杈撳嚭鎴愬姛淇℃伅锛屽寘鎷緭閫佺嚎鍚嶇О銆佷换鍔″彿銆佹墭鐩樻潯鐮佸拰瀛愯澶囦唬鐮侊紝浠ュ強浠诲姟淇℃伅
- ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱,task{task.ToJsonString()}");
-
- // 濡傛灉浠诲姟涓嶄负绌猴紝鍒欐墽琛屼互涓嬫搷浣�
- if (task != null)
+ try
{
- // 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
- var next = task.NextAddress;
- // 灏嗕换鍔″懡浠ゆ槧灏勫埌褰撳墠浠诲姟
- var taskCommand = MapTaskCommand(task, command);
+ // 鏌ヨ杈撻�佺嚎浠诲姟锛屾牴鎹緭閫佺嚎璁惧鍜屽瓙璁惧浠ｇ爜鑾峰彇浠诲姟淇℃伅
+ var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
- // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
- task.NextAddress = next;
+ // 杈撳嚭鎴愬姛淇℃伅锛屽寘鎷緭閫佺嚎鍚嶇О銆佷换鍔″彿銆佹墭鐩樻潯鐮佸拰瀛愯澶囦唬鐮侊紝浠ュ強浠诲姟淇℃伅
+ ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱,task{task.ToJsonString()}");
- // 杈撳嚭鎴愬姛淇℃伅锛屽寘鎷緭閫佺嚎鍚嶇О銆佷换鍔″彿銆佹墭鐩樻潯鐮併�佸瓙璁惧浠ｇ爜鍜屼笅涓�鐩爣鍦板潃
- ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
-
- // 鍚戣緭閫佺嚎鍙戦�佸懡浠�
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
- // 瀹屾垚杈撻�佺嚎鍙戦�佷换鍔★紝骞舵洿鏂颁换鍔＄姸鎬�
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
- _taskService.UpdateTaskStatusToNext(task);
-
- // 濡傛灉浠诲姟鐨勭洰鏍囧湴鍧�鏄�"1020-1"锛屽垯鍐嶆鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
- if (task.TargetAddress == "1020-1")
+ // 濡傛灉浠诲姟涓嶄负绌猴紝鍒欐墽琛屼互涓嬫搷浣�
+ if (task != null)
{
+ // 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
+ var next = task.NextAddress;
+
+ // 灏嗕换鍔″懡浠ゆ槧灏勫埌褰撳墠浠诲姟
+ var taskCommand = MapTaskCommand(task, command);
+
+ // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
+ task.NextAddress = next;
+
+ // 杈撳嚭鎴愬姛淇℃伅锛屽寘鎷緭閫佺嚎鍚嶇О銆佷换鍔″彿銆佹墭鐩樻潯鐮併�佸瓙璁惧浠ｇ爜鍜屼笅涓�鐩爣鍦板潃
+ ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
+
+ // 鍚戣緭閫佺嚎鍙戦�佸懡浠�
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+
+ // 瀹屾垚杈撻�佺嚎鍙戦�佷换鍔★紝骞舵洿鏂颁换鍔＄姸鎬�
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+
+ // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
_taskService.UpdateTaskStatusToNext(task);
+
+ // 濡傛灉浠诲姟鐨勭洰鏍囧湴鍧�鏄�"1020-1"锛屽垯鍐嶆鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
+ if (task.TargetAddress == "1020-1")
+ {
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
+ }
+ catch (Exception ex)
+ {
+
}
}
@@ -493,64 +535,72 @@
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
{
- // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴�
- ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚");
-
- // 鏌ヨ姝ｅ湪鎵ц鐨勮緭閫佺嚎浠诲姟
- var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
-
- // 濡傛灉浠诲姟瀛樺湪
- if (task != null)
+ try
{
- // 濡傛灉浠诲姟涓殑鎵樼洏鏉＄爜涓庡懡浠や腑鐨勬墭鐩樻潯鐮佷竴鑷�
- if (command.Barcode == task.PalletCode)
+
+ // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴�
+ ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚");
+
+ // 鏌ヨ姝ｅ湪鎵ц鐨勮緭閫佺嚎浠诲姟
+ var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
+
+ // 濡傛灉浠诲姟瀛樺湪
+ if (task != null)
{
- // 鍒涘缓涓�涓┖鐨刉ebResponseContent瀵硅薄
- WebResponseContent content = new WebResponseContent();
-
- // 淇濆瓨浠诲姟鐨勪笅涓�鐩爣鍦板潃
- var next = task.NextAddress;
- // 灏嗕换鍔℃槧灏勪负鍛戒护
- var taskCommand = MapTaskCommand(task, command);
- // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
- task.NextAddress = next;
-
- // 濡傛灉浠诲姟鐨勬墭鐩樻潯鐮佷笌鍛戒护涓殑鎵樼洏鏉＄爜涓嶄竴鑷存垨鑰呬换鍔″娉ㄤ负"NG"
- if (task.PalletCode != command.Barcode || task.Remark == "NG")
+ // 濡傛灉浠诲姟涓殑鎵樼洏鏉＄爜涓庡懡浠や腑鐨勬墭鐩樻潯鐮佷竴鑷�
+ if (command.Barcode == task.PalletCode)
{
- // 鏌ヨ鐩爣鍦板潃鐨勫閲�
- var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
- // 璁剧疆鍛戒护鐨勭洰鏍囧湴鍧�涓篘G鍦板潃
- taskCommand.TargetAddress = NGAddress;
+ // 鍒涘缓涓�涓┖鐨刉ebResponseContent瀵硅薄
+ WebResponseContent content = new WebResponseContent();
+
+ // 淇濆瓨浠诲姟鐨勪笅涓�鐩爣鍦板潃
+ var next = task.NextAddress;
+ // 灏嗕换鍔℃槧灏勪负鍛戒护
+ var taskCommand = MapTaskCommand(task, command);
+ // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
+ task.NextAddress = next;
+
+ // 濡傛灉浠诲姟鐨勬墭鐩樻潯鐮佷笌鍛戒护涓殑鎵樼洏鏉＄爜涓嶄竴鑷存垨鑰呬换鍔″娉ㄤ负"NG"
+ if (task.PalletCode != command.Barcode || task.Remark == "NG")
+ {
+ // 鏌ヨ鐩爣鍦板潃鐨勫閲�
+ var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
+ // 璁剧疆鍛戒护鐨勭洰鏍囧湴鍧�涓篘G鍦板潃
+ taskCommand.TargetAddress = NGAddress;
+ }
+ else
+ {
+ // 璁剧疆鍛戒护鐨勭洰鏍囧湴鍧�涓�1000
+ taskCommand.TargetAddress = 1000;
+ }
+
+ // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴擄紝涓嬩竴鐩爣鍦板潃宸茬‘瀹�
+ ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
+ // 鍙戦�佸懡浠ゅ埌杈撻�佺嚎
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ // 瀹屾垚杈撻�佺嚎鍙戦��
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
+ content = _taskService.UpdateTaskStatusToNext(task);
}
else
{
- // 璁剧疆鍛戒护鐨勭洰鏍囧湴鍧�涓�1000
- taskCommand.TargetAddress = 1000;
+ // 鏌ヨ鐩爣鍦板潃鐨勫閲�
+ var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
+ // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴擄紝涓嬩竴鐩爣鍦板潃宸茬‘瀹�
+ ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆恵NGAddress}銆�");
+ // 璁剧疆杈撻�佺嚎鐨勭洰鏍囧湴鍧�涓篘G鍦板潃
+ conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, NGAddress, childDeviceCode);
+ // 瀹屾垚杈撻�佺嚎鍙戦��
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
+ _taskService.UpdateTaskStatusToNext(task);
}
+ }
+ }
+ catch (Exception ex)
+ {
- // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴擄紝涓嬩竴鐩爣鍦板潃宸茬‘瀹�
- ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
- // 鍙戦�佸懡浠ゅ埌杈撻�佺嚎
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
- // 瀹屾垚杈撻�佺嚎鍙戦��
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
- content = _taskService.UpdateTaskStatusToNext(task);
- }
- else
- {
- // 鏌ヨ鐩爣鍦板潃鐨勫閲�
- var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
- // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴擄紝涓嬩竴鐩爣鍦板潃宸茬‘瀹�
- ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆恵NGAddress}銆�");
- // 璁剧疆杈撻�佺嚎鐨勭洰鏍囧湴鍧�涓篘G鍦板潃
- conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, NGAddress, childDeviceCode);
- // 瀹屾垚杈撻�佺嚎鍙戦��
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
- _taskService.UpdateTaskStatusToNext(task);
- }
}
}
@@ -675,7 +725,7 @@
#endregion 妫�娴嬬┖鐩樺疄鐩樹换鍔�
- #region 鍖栨垚NG鍙ｅ叆搴�
+ #region 璁惧NG鍙ｅ叆搴�
public void NGRequestTaskInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue, string TargetAddress)
{
@@ -706,36 +756,44 @@
WriteInfo("鍏ョ珯鏍￠獙", $"銆恵childDeviceCode}銆戝叆绔欐牎楠岃繑鍥炲弬鏁般�恵result}銆�");
ResultTrayCellsStatus result1 = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result);
- var serialNosError = result1.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
- if (serialNosError.Count > 0)
+ if (result1.Success)
{
- return;
- }
- if (result1.SerialNos.Count <= 0)
- {
- // 绌烘墭鐩樺叆搴撻�昏緫
- Dt_Task dt_Task = new Dt_Task()
+ var serialNosError = result1.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+ if (serialNosError.Count > 0)
{
- TargetAddress = TargetAddress,
- PalletCode = command.Barcode,
- NextAddress = TargetAddress,
- TaskNum = 0
- };
+ return;
+ }
- var next = dt_Task.NextAddress;
- var taskCommand = MapTaskCommand(dt_Task, command);
- dt_Task.NextAddress = next;
+ if (result1.SerialNos.Count <= 0)
+ {
+ // 绌烘墭鐩樺叆搴撻�昏緫
+ Dt_Task dt_Task = new Dt_Task()
+ {
+ TargetAddress = TargetAddress,
+ PalletCode = command.Barcode,
+ NextAddress = TargetAddress,
+ TaskNum = 0
+ };
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ var next = dt_Task.NextAddress;
+ var taskCommand = MapTaskCommand(dt_Task, command);
+ dt_Task.NextAddress = next;
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
+ else
+ {
+ conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, 1000, childDeviceCode);
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
}
else
{
- conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, 1000, childDeviceCode);
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
}
}
--
Gitblit v1.9.3