From ce1292c9cf37195b6abd2699dfc5d6cb3e143c9b Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期日, 12 四月 2026 23:38:19 +0800
Subject: [PATCH] feat(MES): 添加MES接口相关实体和DTO JS扩展文件至JSX格式并更新配置
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index c6c5522..1032614 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -655,8 +655,42 @@
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)
--
Gitblit v1.9.3