From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 276 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 159 insertions(+), 117 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 edccca3..bc4f8f6 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -4,13 +4,11 @@
using Quartz;
using SqlSugar;
using System.Reflection;
-using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
-using WIDESEAWCS_Core.Caches;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core.HttpContextUser;
using WIDESEAWCS_DTO.MOM;
@@ -26,7 +24,6 @@
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_SignalR;
using WIDESEAWCS_Tasks.ConveyorLineJob;
-using static System.Collections.Specialized.BitVector32;
using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
namespace WIDESEAWCS_Tasks
@@ -61,7 +58,7 @@
_noticeService = noticeService;
}
- public async Task Execute(IJobExecutionContext context)
+ public Task Execute(IJobExecutionContext context)
{
try
{
@@ -71,20 +68,28 @@
List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
foreach (string childDeviceCode in childDeviceCodes)
{
- await ProcessDeviceAsync(conveyorLine, childDeviceCode);
+ ProcessDeviceAsync(conveyorLine, childDeviceCode);
}
List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
foreach (var station in stationManagers)
{
- ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
- ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(station.stationChildCode, "DeviceCommand");
- if (command != null && commandWrite != null)
+ if (station.stationType == 11)
{
- var structs = BitConverter.GetBytes(commandWrite.WriteInteractiveSignal).Reverse().ToArray().ToBoolArray();
- if (structs[0] == true)
+ ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
+ ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(station.stationChildCode, "DeviceCommand");
+ if (command != null && commandWrite != null)
{
- NGRequestTaskInbound(conveyorLine, command, station.stationChildCode, 0, station.stationLocation);
+ var structs = BitConverter.GetBytes(commandWrite.WriteInteractiveSignal).Reverse().ToArray().ToBoolArray();
+ if (structs[0] == true)
+ {
+ ConsoleHelper.WriteWarningLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵station.stationChildCode}銆戠┖鎵樼洏璇锋眰鎵爜鍏ュ簱");
+ NGRequestTaskInbound(conveyorLine, command, station.stationChildCode, 0, station.stationLocation);
+ }
+ else
+ {
+ ConveyorLineSendFinish(conveyorLine, station.stationChildCode, 0, false);
+ }
}
}
}
@@ -94,9 +99,10 @@
{
Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
}
+ return Task.CompletedTask;
}
- private async Task ProcessDeviceAsync(CommonConveyorLine conveyorLine, string childDeviceCode)
+ private void ProcessDeviceAsync(CommonConveyorLine conveyorLine, string childDeviceCode)
{
ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(childDeviceCode, "DeviceCommand");
@@ -116,22 +122,32 @@
MethodInfo? method = GetType().GetMethod(item.ProtocolDetailType);
if (method != null)
{
- command.InteractiveSignal = commandWrite.WriteInteractiveSignal;
- method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, item.ProtocalDetailValue.ObjToInt() });
+ var numRead = item.ProtocalDetailValue.ObjToInt();
+ var numWrite = item.ProtocalDetailValue.ObjToInt() + 1;
+ ConsoleHelper.WriteWarningLine($"銆恵conveyorLine.DeviceName}銆戙�恵childDeviceCode}銆戙�恵numRead.ToString()}銆戜綅杈撻�佺嚎璇诲彇淇″彿锛氥�恵structs[item.ProtocalDetailValue.ObjToInt()]}銆� 銆恵numWrite}銆戜綅WCS鍐欏叆淇″彿锛氥�恵structs[item.ProtocalDetailValue.ObjToInt() + 1]}銆�");
+ if (structs[item.ProtocalDetailValue.ObjToInt() + 1] != structs[item.ProtocalDetailValue.ObjToInt()])
+ {
+ command.InteractiveSignal = commandWrite.WriteInteractiveSignal;
+ method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, item.ProtocalDetailValue.ObjToInt() });
+ }
}
}
else
{
- DeviceProDTO? devicePro = conveyorLine.DeviceProDTOs.Where(x => x.DeviceProParamType == nameof(DeviceCommand) && x.DeviceChildCode == childDeviceCode).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- string[] x = devicePro.DeviceProAddress.Split('.');
- x[x.Length - 1] = (item.ProtocalDetailValue.ObjToInt() + 1).ToString();
- string DeviceProAddress = string.Join(".", x);
- var writeRead = conveyorLine.Communicator.Read<bool>(DeviceProAddress);
- if (writeRead)
- {
- conveyorLine.Communicator.Write(DeviceProAddress, false);
- //ConveyorLineSendFinish(conveyorLine, childDeviceCode, item.ProtocalDetailValue.ObjToInt(), false);
- }
+
+
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, item.ProtocalDetailValue.ObjToInt(), false);
+
+ //DeviceProDTO? devicePro = conveyorLine.DeviceProDTOs.Where(x => x.DeviceProParamType == nameof(DeviceCommand) && x.DeviceChildCode == childDeviceCode).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ //string[] x = devicePro.DeviceProAddress.Split('.');
+ //x[x.Length - 1] = (item.ProtocalDetailValue.ObjToInt() + 1).ToString();
+ //string DeviceProAddress = string.Join(".", x);
+ //var writeRead = conveyorLine.Communicator.Read<bool>(DeviceProAddress);
+ //if (writeRead)
+ //{
+ // conveyorLine.Communicator.Write(DeviceProAddress, false);
+ // //ConveyorLineSendFinish(conveyorLine, childDeviceCode, item.ProtocalDetailValue.ObjToInt(), false);
+ //}
}
}
}
@@ -174,7 +190,6 @@
}
}
-
#region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
@@ -188,17 +203,17 @@
object obj = new
{
- childDeviceCode,
command,
commandWrite
};
- _noticeService.LineData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });
+ _noticeService.LineData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, childDeviceCode, data = obj });
#endregion 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
}
}
#region 鍏ュ簱
+
/// <summary>
/// 杈撻�佺嚎璇锋眰鍏ュ簱
/// </summary>
@@ -210,14 +225,24 @@
{
try
{
- //ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�");
+ ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�");
var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
- HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);
-
- if (task == null && command.Barcode != "NoRead" && command.Barcode.IsNotEmptyOrNull())
+ if (task != null)
{
- HandleNewTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ if (task.TaskType == (int)TaskOutboundTypeEnum.OutTray || task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ {
+ HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);
+ }
+ }
+ else
+ {
+ if (task == null && command.Barcode != "NoRead" && command.Barcode.IsNotEmptyOrNull())
+ {
+ task = _taskService.QueryBarcodeTask(command.Barcode, childDeviceCode);
+ if (task == null)
+ HandleNewTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
+ }
}
}
catch (Exception ex)
@@ -239,23 +264,26 @@
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
{
- Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
- if (newTask != null)
+ if (command.Barcode == task.PalletCode)
{
- //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
- //taskCommand.InteractiveSignal = command.InteractiveSignal;
- var next = newTask.NextAddress;
- var taskCommand = MapTaskCommand(newTask, command);
- newTask.NextAddress = next;
+ Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
+ if (newTask != null)
+ {
+ //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
+ //taskCommand.InteractiveSignal = command.InteractiveSignal;
+ var next = newTask.NextAddress;
+ var taskCommand = MapTaskCommand(newTask, command);
+ newTask.NextAddress = next;
- ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傚叆搴撲笅涓�鍦板潃,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
+ ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傚叆搴撲笅涓�鍦板潃,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ }
}
}
}
- #endregion
+ #endregion 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
/// <summary>
/// 杈撻�佺嚎鍏ュ簱瀹屾垚
@@ -266,37 +294,41 @@
/// <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)
{
- ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆愮瓑寰呭垎閰嶈揣浣嶃��");
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
+ if (command.Barcode == task.PalletCode)
{
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
+ ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆愮瓑寰呭垎閰嶈揣浣嶃��");
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- 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());
- }
+ 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());
+ }
+ }
}
}
- #endregion
+ #endregion 鍏ュ簱
#region 鍑哄簱
+
/// <summary>
/// 杈撻�佺嚎璇锋眰鍑轰俊鎭�
/// </summary>
@@ -307,26 +339,30 @@
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)
{
- //task.NextAddress = task.NextAddress.Replace("-1", "");
- //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
- //taskCommand.InteractiveSignal = command.InteractiveSignal;
-
- //ConveyorLineTaskCommand taskCommand = MapTaskCommand(task, command);
-
- 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);
- if (task.TargetAddress == "1020-1")
+ //if (command.Barcode == task.PalletCode)
{
+ //task.NextAddress = task.NextAddress.Replace("-1", "");
+ //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
+ //taskCommand.InteractiveSignal = command.InteractiveSignal;
+
+ //ConveyorLineTaskCommand taskCommand = MapTaskCommand(task, command);
+
+ 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);
+ if (task.TargetAddress == "1020-1")
+ {
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
}
}
@@ -342,22 +378,25 @@
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
{
- Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
- if (newTask != null)
+ if (command.Barcode == task.PalletCode)
{
- //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
- //taskCommand.InteractiveSignal = command.InteractiveSignal;
+ Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
+ if (newTask != null)
+ {
+ //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
+ //taskCommand.InteractiveSignal = command.InteractiveSignal;
- //ConveyorLineTaskCommand taskCommand = MapTaskCommand(newTask, command);
+ //ConveyorLineTaskCommand taskCommand = MapTaskCommand(newTask, command);
- var next = newTask.NextAddress;
- var taskCommand = MapTaskCommand(newTask, command);
- newTask.NextAddress = next;
+ var next = newTask.NextAddress;
+ var taskCommand = MapTaskCommand(newTask, command);
+ newTask.NextAddress = next;
- ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱涓嬩竴鍦板潃,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
+ ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱涓嬩竴鍦板潃,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
}
}
}
@@ -373,33 +412,36 @@
var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
{
- WebResponseContent content = new WebResponseContent();
- //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
- //taskCommand.InteractiveSignal = command.InteractiveSignal;
- //ConveyorLineTaskCommand taskCommand = MapTaskCommand(task, command);
-
- var next = task.NextAddress;
- var taskCommand = MapTaskCommand(task, command);
- task.NextAddress = next;
-
- if (task.PalletCode != command.Barcode || task.Remark == "NG")
+ if (command.Barcode == task.PalletCode)
{
- var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
- taskCommand.TargetAddress = NGAddress;
- }
- else
- {
- taskCommand.TargetAddress = 1000;
- }
+ WebResponseContent content = new WebResponseContent();
+ //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
+ //taskCommand.InteractiveSignal = command.InteractiveSignal;
+ //ConveyorLineTaskCommand taskCommand = MapTaskCommand(task, command);
- ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�");
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- content = _taskService.UpdateTaskStatusToNext(task);
+ var next = task.NextAddress;
+ var taskCommand = MapTaskCommand(task, command);
+ task.NextAddress = next;
+
+ if (task.PalletCode != command.Barcode || task.Remark == "NG")
+ {
+ var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
+ taskCommand.TargetAddress = NGAddress;
+ }
+ else
+ {
+ 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);
+ }
}
}
- #endregion
+ #endregion 鍑哄簱
/// <summary>
/// 杈撻�佺嚎浜や簰瀹屾垚
@@ -418,6 +460,7 @@
}
#region 妫�娴嬬┖鐩樺疄鐩樹换鍔�
+
/// <summary>
/// 鐩戞祴绌烘墭鐩樺疄鐩樺嚭搴�
/// </summary>
@@ -449,7 +492,8 @@
var tasks = _taskRepository.QueryData(x => x.TaskType == (int)taskType && x.TargetAddress == childDeviceCode);
if (tasks.Count < index)
{
- ConsoleHelper.WriteErrorLine($"銆恵childDeviceCode}銆戣姹傘�恵taskType.ToString()}銆戜换鍔�,宸叉湁銆恵taskType.ToString()}銆戜换鍔°�恵tasks.Count}銆�,鏈�澶氭嫢鏈夈�恵index - 1}銆�");
+ //ConsoleHelper.WriteErrorLine($"銆恵childDeviceCode}銆戣姹傘�恵taskType.ToString()}銆戜换鍔�,宸叉湁銆恵taskType.ToString()}銆戜换鍔°�恵tasks.Count}銆�,鏈�澶氭嫢鏈夈�恵index - 1}銆�");
+
#region 璋冪敤WMS鑾峰彇鍑哄簱浠诲姟
WMSTaskDTO taskDTO = new WMSTaskDTO();
@@ -464,7 +508,6 @@
}
var wmsIpAddress = wmsBase + requestTrayOutTask;
-
var result = await HttpHelper.PostAsync(wmsIpAddress, new { position = childDeviceCode, tag = (int)taskType, areaCdoe = roadWay, platform.ProductionLine }.ToJsonString());
//var result = await HttpHelper.PostAsync("http://localhost:5000/api/Task/RequestTrayOutTaskAsync", dynamic.ToJsonString());
@@ -476,7 +519,7 @@
taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
- #endregion
+ #endregion 璋冪敤WMS鑾峰彇鍑哄簱浠诲姟
CreateAndSendTask(taskDTO);
}
@@ -494,8 +537,8 @@
}
return content;
}
- #endregion
+ #endregion 妫�娴嬬┖鐩樺疄鐩樹换鍔�
#region 鍖栨垚NG鍙ｅ叆搴�
@@ -575,7 +618,6 @@
}
}
-
- #endregion
+ #endregion 鍖栨垚NG鍙ｅ叆搴�
}
}
\ No newline at end of file
--
Gitblit v1.9.3