From de00bb6fbb81f4716e4b14e5964e9181be14c185 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 07 六月 2025 11:23:49 +0800
Subject: [PATCH] 1
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 104 ++++++++++++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 16bde53..b33b54a 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -183,7 +183,7 @@
// break;
//}
- RequestWmsTask(conveyorLine, command, childDeviceCode);
+ RequestWmsTask(conveyorLine, command, childDeviceCode,stationManager);
break;
}
}
@@ -238,50 +238,50 @@
{
if (command.ConveyorLineBarcode != "NoRead")
{
- var config = _sys_ConfigService.GetByConfigKey("SYS_BASE", "ISFRINTRAY");
- if (config.ConfigValue == "1")
+ //var config = _sys_ConfigService.GetByConfigKey("SYS_BASE", "ISFRINTRAY");
+ //if (config.ConfigValue == "1")
+ //{
+ // Random random = new Random();
+ // var task = new Dt_Task()
+ // {
+ // CurrentAddress = childDeviceCode,
+ // Grade = 1,
+ // NextAddress = "2066",
+ // PalletCode = command.ConveyorLineBarcode,
+ // Roadway = "FR",
+ // SourceAddress = childDeviceCode,
+ // TargetAddress = "2066",
+ // TaskNum = random.Next(1,9999),
+ // TaskType = (int)TaskInboundTypeEnum.InTray,
+ // TaskState = (int)TaskInStatusEnum.Line_InExecuting,
+ // WMSId = 0
+ // };
+ // var taskCommand = MapTaskCommand(task, command);
+ // conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ //}
+ //else
+ //{
+ var taskDTO = CreateEmptyTrayTaskDto(command.ConveyorLineBarcode, childDeviceCode);
+
+ if (_taskRepository.QueryFirst(x => x.PalletCode == taskDTO.PalletCode) != null)
{
- Random random = new Random();
- var task = new Dt_Task()
- {
- CurrentAddress = childDeviceCode,
- Grade = 1,
- NextAddress = "2066",
- PalletCode = command.ConveyorLineBarcode,
- Roadway = "FR",
- SourceAddress = childDeviceCode,
- TargetAddress = "2066",
- TaskNum = random.Next(1,9999),
- TaskType = (int)TaskInboundTypeEnum.InTray,
- TaskState = (int)TaskInStatusEnum.Line_InExecuting,
- WMSId = 0
- };
- var taskCommand = MapTaskCommand(task, command);
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ WriteInfo(conveyorLine.DeviceName, "褰撳墠鎵樼洏瀛樺湪浠诲姟");
+ return;
}
- else
+
+ var content = CreateAndSendTask(taskDTO);
+ if (content.Status)
{
- var taskDTO = CreateEmptyTrayTaskDto(command.ConveyorLineBarcode, childDeviceCode);
-
- if (_taskRepository.QueryFirst(x => x.PalletCode == taskDTO.PalletCode) != null)
+ var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode, command.ConveyorLineBarcode);
+ if (task != null)
{
- WriteInfo(conveyorLine.DeviceName, "褰撳墠鎵樼洏瀛樺湪浠诲姟");
- return;
- }
-
- var content = CreateAndSendTask(taskDTO);
- if (content.Status)
- {
- var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
- if (task != null)
- {
- var taskCommand = MapTaskCommand(task, command);
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
- //ConveyorLineSendFinish(conveyorLine, childDeviceCode, true);
- _taskService.UpdateTaskStatusToNext(task);
- }
+ var taskCommand = MapTaskCommand(task, command);
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ //ConveyorLineSendFinish(conveyorLine, childDeviceCode, true);
+ _taskService.UpdateTaskStatusToNext(task);
}
}
+ //}
}
}
@@ -318,7 +318,7 @@
/// <summary>
/// 璇锋眰WMS浠诲姟
/// </summary>
- private async void RequestWmsTask(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
+ private async void RequestWmsTask(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode, Dt_StationManager stationManager)
{
//var taskGW = _taskRepository.QueryFirst(x => x.TargetAddress == childDeviceCode && (x.TaskState == (int)TaskOutStatusEnum.OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutPending));
//if (taskGW != null)
@@ -333,18 +333,29 @@
//conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, task.TaskNum, childDeviceCode);
//conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, task.NextAddress, childDeviceCode);
//conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, command.ConveyorLineBarcode, childDeviceCode);
+ var GWTask = _taskRepository.QueryData(x => x.Roadway.Contains("GWSC2") && x.SourceAddress == "1039" && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskInStatusEnum.Line_InFinish)).ToList();
+ if (GWTask.Count >= 2 && childDeviceCode == "1039" && task.Roadway.Contains("GWSC2"))
+ {
+ ConsoleHelper.WriteErrorLine($"鎵樼洏鍙凤細銆恵command.ConveyorLineBarcode}銆戦珮娓╀簩宸插瓨鍦ㄣ�恵GWTask.Count}銆戜釜浠诲姟澶т簬2涓换鍔′笉鍙笅鍙�");
+ return;
+ }
ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
conveyorLine.SendCommand(taskCommand, childDeviceCode);
- //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
+
_taskService.UpdateTaskStatusToNext(task);
}
}
else
{
- WriteInfo(conveyorLine.DeviceName, content.Message);
- ConsoleHelper.WriteErrorLine($"銆恵conveyorLine.DeviceName}銆戞墭鐩樺彿锛氥�恵command.ConveyorLineBarcode}銆戣姹傜偣浣嶏細銆恵childDeviceCode}銆戝紓甯镐俊鎭�恵content.Message}銆�");
- //_taskRepository.AddData(taskGW);
+ if (content.Message != "璇锋眰杩囦簬棰戠箒锛岃绋嶅悗鍐嶈瘯")
+ {
+ WriteInfo(conveyorLine.DeviceName, content.Message);
+ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, stationManager.stationNGChildCode, childDeviceCode);
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
+ ConsoleHelper.WriteErrorLine($"銆恵conveyorLine.DeviceName}銆戞墭鐩樺彿锛氥�恵command.ConveyorLineBarcode}銆戣姹傜偣浣嶏細銆恵childDeviceCode}銆戝紓甯镐俊鎭�恵content.Message}銆�");
+ WriteInfo(conveyorLine.DeviceName, $"銆恵conveyorLine.DeviceName}銆戞墭鐩樺彿锛氥�恵command.ConveyorLineBarcode}銆戣姹傜偣浣嶏細銆恵childDeviceCode}銆戝紓甯镐俊鎭�恵content.Message}銆�");
+ }
}
}
@@ -399,9 +410,6 @@
};
conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode); //鎵樼洏鏈夋棤鐢佃姱淇″彿
-
-
-
}
}
--
Gitblit v1.9.3