From d216edd0e9931d71664f33e625cff6d8131a0fad Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 13 三月 2026 16:00:40 +0800
Subject: [PATCH] 重构: 实现前后端分离架构
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
index 729e360..2d66fcd 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
@@ -17,7 +17,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
-using AutoMapper;
+using MapsterMapper;
using Microsoft.Extensions.Configuration;
using Quartz;
using SqlSugar;
@@ -130,14 +130,14 @@
if (command.TaskNo > 0)
{
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNo, childDeviceCode);
- if (task.IsNullOrEmpty())
+ if (!task.IsNullOrEmpty())
{
- _conveyorLineDispatch.RequestInbound(conveyorLine, command, childDeviceCode);
+ // 澶勭悊浠诲姟鐘舵��
+ ProcessTaskState(conveyorLine, command, task, childDeviceCode);
+ //_conveyorLineDispatch.RequestInbound(conveyorLine, command, childDeviceCode);
return;
}
- // 澶勭悊浠诲姟鐘舵��
- ProcessTaskState(conveyorLine, command, task, childDeviceCode);
}
}
catch (Exception innerEx)
@@ -169,7 +169,7 @@
const int InFinish = (int)TaskInStatusEnum.InFinish;
const int OutFinish = (int)TaskOutStatusEnum.OutFinish;
- int state = task.TaskState;
+ int state = task.TaskStatus;
bool isTargetAddress = task.TargetAddress == childDeviceCode;
// 澶勭悊鐘舵�侀�昏緫
@@ -199,4 +199,4 @@
}
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3