From 7f42a3ef9bc83bdc199317d12c1905d8696dac4f Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 20 八月 2025 17:23:05 +0800
Subject: [PATCH] 代码提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 1090389..24c5e66 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -107,8 +107,6 @@
try
{
ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
- var Barcodea = conveyorLine.Communicator.Read("DB1103.2",5);
- string x=Encoding.UTF8.GetString(Barcodea);
if (command != null)
{
#region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
@@ -132,7 +130,7 @@
foreach (var item in deviceProtocolDetails)
{
int itemValue = Convert.ToInt32(item.ProtocalDetailValue);
- _noticeService.LineData(userIds?.FirstOrDefault(), userTokenIds, new { station.stationChildCode,InStock= structs[itemValue] , Roadway =station.Roadway});
+ _noticeService.LineData(userIds?.FirstOrDefault(), userTokenIds, new { station.stationChildCode, InStock = structs[itemValue], Roadway = station.Roadway + station.stationFloor });
if (structs[itemValue] == true)
{
MethodInfo? method = GetType().GetMethod(item.ProtocolDetailType);
@@ -167,8 +165,8 @@
if (station.stationChildCode == "3004")
{
- var taskIn = _taskRepository.QueryFirst(x => x.TaskNum == command.TaskNum && x.NextAddress == station.stationChildCode && x.TaskType == (int)TaskInboundTypeEnum.Inbound&&x.TaskState==(int)TaskInStatusEnum.HoistInExecuting);
- if(taskIn != null)
+ var taskIn = _taskRepository.QueryFirst(x => x.TaskNum == command.TaskNum && x.NextAddress == station.stationChildCode && x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState == (int)TaskInStatusEnum.HoistInExecuting);
+ if (taskIn != null)
{
Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.Roadway == taskIn.Roadway && x.stationType == 3 && x.stationFloor == taskIn.Floor);
taskIn.CurrentAddress = station.stationChildCode;
@@ -179,7 +177,7 @@
}
var task = _taskService.QueryConveyorLineTask(station.stationChildCode, command.TaskNum);
-
+
await HandleNewTaskAsync(conveyorLine, command, station.stationChildCode, task);
}
catch (Exception ex)
@@ -205,7 +203,7 @@
var task = _taskService.QueryConveyorLineFinishTask(stationManager.stationChildCode, command.TaskNum);
//鏀规煡璇㈡柟娉�
- if(stationManager.stationType==5||stationManager.stationType==4)
+ if (stationManager.stationType == 5 || stationManager.stationType == 4)
{
// 濡傛灉浠诲姟瀛樺湪
if (task != null)
@@ -251,7 +249,7 @@
{
Thread.Sleep(1000);
_taskService.UpdateTaskStatusToNext(task);
-
+
}
}
}
--
Gitblit v1.9.3