From c5c3e4e538a11f2a6391e6b2613375b1f92eb20a Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 15 四月 2026 14:39:18 +0800
Subject: [PATCH] feat: 添加Quartz日志助手类并重构任务服务日志记录
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 105 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 15 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 3dd7db2..478ba06 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -101,22 +101,31 @@
try
{
List<Dt_Task> tasks = new List<Dt_Task>();
+ List<Dt_Task> duplicates = new List<Dt_Task>();
foreach (var item in taskDTOs)
{
- if (BaseDal.QueryFirst(x => x.TaskNum == item.TaskNum || x.PalletCode == item.PalletCode) != null)
+ Dt_Task existingTask = BaseDal.QueryFirst(x => x.TaskNum == item.TaskNum || x.PalletCode == item.PalletCode);
+ if (existingTask != null)
{
+ duplicates.Add(existingTask);
continue;
}
Dt_Task task = _mapper.Map<Dt_Task>(item);
task.Creater = "WMS";
- InitializeTaskOnReceive(task, item);
+ content = InitializeTaskOnReceive(task, item);
+ if (!content.Status)
+ return content;
tasks.Add(task);
}
+ // TOOD: 杩欓噷娉ㄦ剰娣诲姞閿欒瑕佽繑鍥為敊璇�
BaseDal.AddData(tasks);
_taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskNum).ToList(), "鎺ユ敹WMS浠诲姟");
- content = WebResponseContent.Instance.OK("鎴愬姛", tasks);
+ // 灏嗛噸澶嶄换鍔′俊鎭篃涓�骞惰繑鍥�
+ tasks.AddRange(duplicates);
+ var result = tasks;
+ content = WebResponseContent.Instance.OK("鎴愬姛", result);
}
catch (Exception ex)
{
@@ -163,24 +172,20 @@
/// </summary>
/// <param name="task">浠诲姟瀹炰綋銆�</param>
/// <param name="source">WMS鍘熷浠诲姟瀵硅薄銆�</param>
- private void InitializeTaskOnReceive(Dt_Task task, WMSTaskDTO source)
+ private WebResponseContent InitializeTaskOnReceive(Dt_Task task, WMSTaskDTO source)
{
switch (task.TaskType.GetTaskTypeGroup())
{
case TaskTypeGroup.OutbondGroup:
- _outboundTaskFlowService.InitializeOnReceive(task, source);
- break;
+ return _outboundTaskFlowService.InitializeOnReceive(task, source);
case TaskTypeGroup.InboundGroup:
- _inboundTaskFlowService.InitializeOnReceive(task, source);
- break;
+ return _inboundTaskFlowService.InitializeOnReceive(task, source);
case TaskTypeGroup.RelocationGroup:
- _relocationTaskFlowService.InitializeOnReceive(task, source);
- break;
+ return _relocationTaskFlowService.InitializeOnReceive(task, source);
case TaskTypeGroup.OtherGroup:
- _robotTaskFlowService.InitializeOnReceive(task, source);
- break;
+ return _robotTaskFlowService.InitializeOnReceive(task, source);
default:
- break;
+ return WebResponseContent.Instance.Error("WCS涓嶅瓨鍦ㄥ綋鍓嶄换鍔＄殑浠诲姟绫诲瀷");
}
}
@@ -391,7 +396,9 @@
&& result.Data is List<WMSTaskDTO> wmsTasks
&& wmsTasks.Count > 0)
{
- return ReceiveWMSTask(wmsTasks);
+ WebResponseContent content = ReceiveWMSTask(wmsTasks);
+ if (!content.Status)
+ return content;
}
// 鏇存柊浠诲姟鏁版嵁
@@ -637,6 +644,74 @@
{
return BaseDal.QueryFirst(x => x.TaskNum == taskNum);
}
+
+ /// <summary>
+ /// 鎺ユ敹WMS鎵嬪姩鍒涘缓鐨勪换鍔★紝鍒涘缓WCS浠诲姟
+ /// </summary>
+ /// <param name="taskDTOs">WMS浠诲姟瀵硅薄闆嗗悎</param>
+ /// <returns>杩斿洖澶勭悊缁撴灉</returns>
+ public WebResponseContent ReceiveManualTask([NotNull] List<WMSTaskDTO> taskDTOs)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ // 鏀堕泦閲嶅浠诲姟鐨勪俊鎭�
+ var duplicateTasks = new List<DuplicateTaskDto>();
+ // 鍊掑簭閬嶅巻锛屽畨鍏ㄥ垹闄ゅ苟鏀堕泦琚Щ闄ょ殑椤�
+ for (int i = taskDTOs.Count - 1; i >= 0; i--)
+ {
+ var item = taskDTOs[i];
+ var exists = BaseDal.QueryFirst(x => x.TaskNum == item.TaskNum || x.PalletCode == item.PalletCode);
+ if (exists != null)
+ {
+ duplicateTasks.Add(new DuplicateTaskDto
+ {
+ TaskNum = exists.TaskNum,
+ PalletCode = exists.PalletCode,
+ TaskType = exists.TaskType,
+ TaskStatus = exists.TaskStatus
+ });
+ taskDTOs.RemoveAt(i);
+ }
+ }
+
+ // 璋冪敤 ReceiveWMSTask 鍒涘缓 WCS 浠诲姟
+ content = ReceiveWMSTask(taskDTOs);
+
+ // 濡傛灉鏈夐噸澶嶄换鍔★紝淇敼杩斿洖缁撴灉
+ if (duplicateTasks.Count > 0 && content.Status)
+ {
+ var result = new ReceiveTaskResultDto
+ {
+ Success = true,
+ Message = content.Message + $"锛屽叾涓瓄duplicateTasks.Count}涓换鍔″湪WCS涓凡瀛樺湪",
+ CreatedCount = taskDTOs.Count,
+ DuplicateTasks = duplicateTasks
+ };
+ content.Data = result;
+ }
+
+ return content;
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error($"鎵嬪姩浠诲姟鎺ユ敹閿欒,閿欒淇℃伅:{ex.Message}");
+ return content;
+ }
+ }
+
+ /// <summary>
+ /// 鏌ヨ鎸囧畾璧风偣鍦板潃鐨勬柊寤烘墜鍔ㄥ叆搴撲换鍔�
+ /// </summary>
+ /// <param name="sourceAddress">璧风偣鍦板潃</param>
+ /// <returns>浠诲姟瀹炰綋</returns>
+ public Dt_Task QueryManualInboundTask(string sourceAddress)
+ {
+ return BaseDal.QueryFirst(x =>
+ x.TaskType == (int)TaskInboundTypeEnum.Inbound &&
+ x.TaskStatus == (int)TaskInStatusEnum.InNew &&
+ x.SourceAddress == sourceAddress);
+ }
}
public enum ConveyorLineDBNameNew
@@ -726,4 +801,4 @@
[DataLength(22)]
public string Barcode { get; set; }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3