From b3ff80e45d24a821ca0731983b1546b48570cdf1 Mon Sep 17 00:00:00 2001
From: xby-y <2251528873@qq.com>
Date: 星期四, 09 四月 2026 14:28:51 +0800
Subject: [PATCH] 添加日志信息
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 63 +++++++++++++------------------
1 files changed, 26 insertions(+), 37 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 93035d2..bf897b0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -640,10 +640,12 @@
{
task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
bool res = BaseDal.UpdateData(task);
- // 娣诲姞鍏ュ簱鍘嗗彶璁板綍
- //AddTaskHistory(task);
-
-
+ //task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
+ //BaseDal.UpdateData(task);
+ //// 娣诲姞鍑哄簱鍘嗗彶璁板綍
+ //_taskHtyService.AddTaskHistory(task);
+ //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "鑷姩瀹屾垚");
+ //bool res = BaseDal.DeleteData(task);
return res;
}
@@ -831,42 +833,29 @@
public Dt_Task RequestWMSTaskMovelibrary(Dt_Task _Task)
{
WebResponseContent content = new WebResponseContent();
- try
- {
- content = HttpHelperh.Get<WebResponseContent>($"{urlWMSMovelibraryTask}?TaskNum={_Task.TaskNum}");
- Dt_Task task = new Dt_Task();
- if (content.Status)
- {
- if (content.Data != null)
- {
- //task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
- WMSTaskDTO dto = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
- if (dto != null)
- {
- // 杞崲涓篋t_Task
- task = _mapper.Map<Dt_Task>(dto);
- task.TaskState = dto.TaskStatus;
- if (task.TaskNum != _Task.TaskNum)
- {
- task.Grade = 3;
- BaseDal.AddData(task);
- return task;
- }
- else
- {
- return _Task;
- }
- }
+ content = HttpHelperh.Get<WebResponseContent>($"{urlWMSMovelibraryTask}?TaskNum={_Task.TaskNum}");
+ Dt_Task task = new Dt_Task();
+ if (content.Status)
+ {
+ if (content.Data != null)
+ {
+ task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
+ if (task.TaskNum != _Task.TaskNum)
+ {
+ task.Grade = 3;
+ task.TaskState = TaskRelocationStatusEnum.RelocationNew.ObjToInt();
+ BaseDal.AddData(task);
+ return task;
+ }
+ else
+ {
+ return _Task;
}
}
- return null;
}
- catch (Exception ex)
- {
- Console.WriteLine($"绉诲簱鎿嶄綔寮傚父锛歿ex.Message}");
- return null;
- }
+ return null;
+
}
@@ -977,7 +966,7 @@
return WebResponseContent.Instance.Error("宸烽亾缂栧彿涓嶈兘涓虹┖");
}
// 2. 涓�娆℃煡璇紝閬垮厤澶氭鏁版嵁搴�/鍐呭瓨閬嶅巻
- List<Dt_Task> taskList = BaseDal.QueryData(x => x.Roadway == roadway).ToList();
+ List<Dt_Task> taskList = BaseDal.QueryData(x => x.Roadway == roadway).ToList();
int totalTasks = taskList.Count;
int inProgressTasks = 0;
--
Gitblit v1.9.3