From 7db419acdd2c02950b67c081dd2d7f61fdb2cb89 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 30 三月 2026 16:09:07 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheShenKu
---
项目代码/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 49d7a14..7c08374 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -4,7 +4,6 @@
using Newtonsoft.Json;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
@@ -19,12 +18,9 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
-using WIDESEAWCS_QuartzJob.DeviceBase;
-using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
-using WIDESEAWCS_QuartzJob.DTO;
namespace WIDESEAWCS_TaskInfoService
{
@@ -97,6 +93,7 @@
task.CarType = item.CarType;
task.PVI = item.PVI;
task.NextAddress = item.NextAddress;
+ task.RoadwayNo = item.RoadwayNo;
// 鍒ゆ柇浠诲姟绫诲瀷鏄惁涓哄嚭搴撲换鍔�
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
@@ -665,7 +662,7 @@
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
{
- if(task.NextAddress == task.TargetAddress)
+ if (task.NextAddress == task.TargetAddress)
{
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -674,11 +671,11 @@
task.TaskState = nextStatus;
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
- //task_Hty.CarType = task.CarType;
+ task_Hty.CarType = task.CarType;
task_Hty.PVI = task.PVI;
+ task_Hty.RoadwayNo = task.RoadwayNo;
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
-
}
else
{
@@ -695,8 +692,6 @@
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
}
-
-
//鏆備笉鑰冭檻澶氫釜鍑哄簱鍙�
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
@@ -708,7 +703,6 @@
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
-
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
@@ -716,10 +710,8 @@
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
{
task.TaskState = (int)TaskStatusGroup.Completed;
-
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
-
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ搴撳畬鎴�");
--
Gitblit v1.9.3