From 5ea48455463691678b806badbee198699a878b5a Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期四, 25 十二月 2025 18:38:58 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 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 78ea147..732fba3 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"
@@ -34,9 +34,11 @@
private readonly IRouterService _routerService;
private readonly IRepository<Dt_Task> _taskRepository;
private readonly IRepository<Dt_StationManger> _stationMangerRepository;
+ private readonly ITaskHtyService _taskHtyService;
- public CommonConveyorLineJob(ICacheService cacheService, ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_StationManger> stationMangerRepository, IRepository<Dt_Task> taskRepository, IRouterRepository routerRepository, IRouterService routerService)
+
+ public CommonConveyorLineJob(ICacheService cacheService, ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_StationManger> stationMangerRepository, IRepository<Dt_Task> taskRepository, IRouterRepository routerRepository, IRouterService routerService, ITaskHtyService taskHtyService)
{
_cacheService = cacheService;
_taskService = taskService;
@@ -45,6 +47,7 @@
_routerService = routerService;
_stationMangerRepository = stationMangerRepository;
_taskRepository = taskRepository;
+ _taskHtyService = taskHtyService;
}
public Task Execute(IJobExecutionContext context)
@@ -99,6 +102,9 @@
//鍒犻櫎浠诲姟
_taskRepository.DeleteData(dt_Ta);
+
+ _taskHtyService.AddTaskHistory(dt_Ta, "鑷姩瀹屾垚");
+
}
}
}
@@ -184,7 +190,7 @@
bool res = _taskRepository.DeleteData(dt_Ta);
if (res)
{
- TaskService.AddTaskHistory(dt_Ta, "鑷姩瀹屾垚");
+ _taskHtyService.AddTaskHistory(dt_Ta, "鑷姩瀹屾垚");
}
}
}
@@ -210,18 +216,6 @@
if (conveyorLineInfoRead.TaskNo == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode)&& dt_Task != null)//閲囪喘鍏ュ簱
{
Dt_Task dt_Ta = _taskService.GetTaskIninfo(conveyorLineInfoRead.Barcode); //閫氳繃鏉＄爜鍘绘煡璇换鍔�
- //if (dt_Ta.SourceAddress == "2021" || dt_Ta.SourceAddress == "2020")
- //{
- // bool IsOccupied2008 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2008");
- // bool IsOccupied2009 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2009");
- // bool IsOccupied2015 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2015");
- // bool IsOccupied2016 = device.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.IsOccupied, "2016");
- // //鍒ゆ柇鏄惁鎴愮珛
- // if (IsOccupied2008 || IsOccupied2009 || IsOccupied2015 || IsOccupied2016)
- // {
- // return null;
- // }
- //}
if (dt_Ta != null)
{
bool endpos = device.SetValue(W_ConveyorLineDB.EndPos, dt_Ta.SourceAddress, item.StationCode);
--
Gitblit v1.9.3