From d59b540dd78d49ddf1f2e1c6dfb7b19a7d3e3d7c Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期日, 19 一月 2025 11:19:24 +0800
Subject: [PATCH] 优化代码结构和错误处理
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 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 52cf203..ca89b74 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
@@ -9,6 +9,7 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_Tasks.ConveyorLineJob;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
namespace WIDESEAWCS_Tasks
{
@@ -60,18 +61,20 @@
case 9:
case 11:
case 12:
- var task = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode);
+ var task = _taskService.QueryExecutingTaskByBarcode(command.ConveyorLineBarcode, childDeviceCode);
if (task != null)
{
ExecuteStationAction(stationManager, conveyorLine, command, childDeviceCode);
}
break;
-
case 1:
case 6:
case 10:
ExecuteStationAction(stationManager, conveyorLine, command, childDeviceCode);
break;
+ //case 16:
+ // ExecuteStationAction(stationManager, conveyorLine, command, childDeviceCode);
+ // break;
}
#region
@@ -159,7 +162,9 @@
case 6:
CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode);
break;
-
+ case 16:
+ AbNormalStationBZTask(conveyorLine, command, childDeviceCode);
+ break;
case 1:
//if (stationManager.stationArea.Contains("GW"))
@@ -170,13 +175,13 @@
// command.ConveyorLineBarcode = taskGW.PalletCode;
//}
//}
- //濡傞珮娓╁嚭搴撳悗浠诲姟鏍囪NG寮傚父鍒欏皢浠诲姟鏇存柊涓哄紓甯告帓鍑轰换鍔�
- Dt_Task NGtask = _taskRepository.QueryFirst(x => x.Remark == "NG" && x.Roadway == stationManager.Roadway && x.Roadway.Contains("GW"));
- if (NGtask != null)
- {
- CreateAbNormalOutbound(conveyorLine, command, childDeviceCode, NGtask);
- break;
- }
+ //濡傞珮娓╁嚭搴撳悗浠诲姟鏍囪NG寮傚父鍒欏皢浠诲姟鏇存柊涓哄紓甯告帓鍑轰换鍔� --鍐犲畤鍙栨秷瓒呮椂妫�娴嬪悗 鎵樼洏瓒呮椂涓嶅湪鍑哄簱鑷冲紓甯稿彛
+ //Dt_Task NGtask = _taskRepository.QueryFirst(x => x.Remark == "NG" && x.Roadway == stationManager.Roadway && x.Roadway.Contains("GW"));
+ //if (NGtask != null)
+ //{
+ // CreateAbNormalOutbound(conveyorLine, command, childDeviceCode, NGtask);
+ // break;
+ //}
RequestWmsTask(conveyorLine, command, childDeviceCode);
break;
@@ -233,6 +238,29 @@
{
if (command.ConveyorLineBarcode != "NoRead")
{
+ //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)
@@ -253,6 +281,7 @@
_taskService.UpdateTaskStatusToNext(task);
}
}
+ //}
}
}
@@ -346,5 +375,34 @@
//Dt_Task task= _taskRepository.QueryFirst(x=>)
//_taskRepository.QueryFirst()
}
+
+ /// <summary>
+ /// 鍖呰寮傚父鎺掑嚭鍙ｉ�昏緫
+ /// </summary>
+ /// <param name="conveyorLine"></param>
+ /// <param name="command"></param>
+ /// <param name="childDeviceCode"></param>
+ private void AbNormalStationBZTask(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
+ {
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode && x.stationPLC == conveyorLine.DeviceCode);
+
+ if (command.ConveyorLineBarcode.IsNullOrEmpty())
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 2, childDeviceCode);
+ return;
+ }
+
+
+ if (conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode).ObjToInt() == 0) //鎵樼洏姝ｅ弽淇″彿
+ {
+
+ };
+
+ conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode); //鎵樼洏鏈夋棤鐢佃姱淇″彿
+
+
+
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3