From 0d4d2290d26d47a0767ef39524936beab40142fe Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 31 10月 2025 09:09:01 +0800
Subject: [PATCH] 增加 明显物料号重复显示
---
DEmon/WebWIPAPI/Controllers/MesIntegrController.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
index ed7842f..79a661a 100644
--- a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
+++ b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
@@ -111,15 +111,42 @@
};
return ApiResponseHelper.ReturnApiResponse(responseMessage, "importInOrder", "");
}
- if (importMaterials.GroupBy(x => x.Code).Any(g => g.Count() > 1))
+ //if (importMaterials.GroupBy(x => x.Code).Any(g => g.Count() > 1))
+ //{
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 500,
+ // Success = false,
+ // Message = "鏈璇锋眰涓墿鏂欏彿涓嶈兘閲嶅",
+ // Data = null,
+ // };
+ // return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
+ //}
+ // 鎸夌墿鏂欏彿鍒嗙粍锛屽苟鎵惧嚭鏈夐噸澶嶇殑缁�
+ var duplicateGroups = importMaterials
+ .GroupBy(x => x.Code)
+ .Where(g => g.Count() > 1)
+ .ToList();
+
+ if (duplicateGroups.Any())
{
- responseMessage = new ApiResponse<string>()
+ // 鏀堕泦鎵�鏈夐噸澶嶇殑鐗╂枡鍙�
+ var duplicateCodes = duplicateGroups
+ .Select(g => g.Key) // 姣忎釜缁勭殑Key灏辨槸鐗╂枡鍙凤紙Code锛�
+ .OrderBy(code => code) // 鍙�夛細鎺掑簭锛岃杈撳嚭鏇存暣榻�
+ .ToList();
+
+ // 鏋勯�犲弸濂界殑鎻愮ず淇℃伅
+ var message = $"鏈鍏ュ簱璇锋眰涓墿鏂欏彿涓嶈兘閲嶅锛岄噸澶嶇墿鏂欏彿鏈夛細{string.Join("銆�", duplicateCodes)}";
+
+ responseMessage = new ApiResponse<string>
{
Code = 500,
Success = false,
- Message = "鏈璇锋眰涓墿鏂欏彿涓嶈兘閲嶅",
+ Message = message,
Data = null,
};
+
return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
}
#endregion
@@ -310,15 +337,31 @@
};
return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
}
- if (inputmaterials.GroupBy(x => x.Code).Any(g => g.Count() > 1))
+ // 鎸夌墿鏂欏彿鍒嗙粍锛屽苟鎵惧嚭鏈夐噸澶嶇殑缁�
+ var duplicateGroups = inputmaterials
+ .GroupBy(x => x.Code)
+ .Where(g => g.Count() > 1)
+ .ToList();
+
+ if (duplicateGroups.Any())
{
- responseMessage = new ApiResponse<string>()
+ // 鏀堕泦鎵�鏈夐噸澶嶇殑鐗╂枡鍙�
+ var duplicateCodes = duplicateGroups
+ .Select(g => g.Key) // 姣忎釜缁勭殑Key灏辨槸鐗╂枡鍙凤紙Code锛�
+ .OrderBy(code => code) // 鍙�夛細鎺掑簭锛岃杈撳嚭鏇存暣榻�
+ .ToList();
+
+ // 鏋勯�犲弸濂界殑鎻愮ず淇℃伅
+ var message = $"鏈鍑哄簱璇锋眰涓墿鏂欏彿涓嶈兘閲嶅锛岄噸澶嶇墿鏂欏彿鏈夛細{string.Join("銆�", duplicateCodes)}";
+
+ responseMessage = new ApiResponse<string>
{
Code = 500,
Success = false,
- Message = "鏈璇锋眰涓墿鏂欏彿涓嶈兘閲嶅",
+ Message = message,
Data = null,
};
+
return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
}
#endregion
--
Gitblit v1.9.3