From 1eb08ced0ef966804e96c9b792bba45ca6eb6601 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:25:45 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs | 140 +++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
index c4da487..0f9c112 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
@@ -16,7 +16,7 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 瀹㈡埛妗ｆ鏈嶅姟
+ /// 寰�鏉ュ叧绯绘湇鍔�
/// </summary>
[ApiDescriptionSettings("WmsBase", Name = "BaseCustomer", Order = 100)]
[Route("api")]
@@ -42,7 +42,7 @@
}
/// <summary>
- /// 鍒嗛〉鏌ヨ瀹㈡埛妗ｆ
+ /// 鍒嗛〉鏌ヨ寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -74,10 +74,10 @@
}
/// <summary>
- /// 涓嶅垎椤垫煡璇㈠鎴锋。妗堝垪琛�
+ /// 涓嶅垎椤垫煡璇㈠線鏉ュ叧绯诲垪琛�
/// </summary>
- /// <param name="input">瀹㈡埛妗ｆ鏌ヨ鍙傛暟</param>
- /// <returns>(瀹㈡埛妗ｆ)瀹炰緥鍒楄〃</returns>
+ /// <param name="input">寰�鏉ュ叧绯绘煡璇㈠弬鏁�</param>
+ /// <returns>(寰�鏉ュ叧绯�)瀹炰緥鍒楄〃</returns>
[HttpGet("BaseCustomer/listNonPage")]
public async Task<List<BaseCustomerOutput>> ListNonPageAsync([FromQuery] BaseCustomerSearchNonPage input)
{
@@ -123,7 +123,7 @@
}
/// <summary>
- /// 鑾峰彇瀹㈡埛妗ｆ
+ /// 鑾峰彇寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -134,7 +134,7 @@
}
/// <summary>
- /// 鑾峰彇瀹㈡埛妗ｆ鍒楄〃
+ /// 鑾峰彇寰�鏉ュ叧绯诲垪琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -147,7 +147,7 @@
#region 澧炪�佸垹銆佹敼
/// <summary>
- /// 澧炲姞瀹㈡埛妗ｆ
+ /// 澧炲姞寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -167,7 +167,7 @@
}
/// <summary>
- /// 鍒犻櫎瀹㈡埛妗ｆ
+ /// 鍒犻櫎寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -180,7 +180,7 @@
}
/// <summary>
- /// 鏇存柊瀹㈡埛妗ｆ
+ /// 鏇存柊寰�鏉ュ叧绯�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -205,7 +205,7 @@
#region 瀵煎叆
/// <summary>
- /// Excel妯℃澘瀵煎叆瀹㈡埛妗ｆ鍔熻兘
+ /// Excel妯℃澘瀵煎叆寰�鏉ュ叧绯诲姛鑳�
/// </summary>
/// <param name="file">Excel妯℃澘鏂囦欢</param>
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
@@ -382,7 +382,7 @@
}
/// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇瀹㈡埛妗ｆ鐨凟xcel瀵煎叆妯℃澘
+ /// 鏍规嵁鐗堟湰涓嬭浇寰�鏉ュ叧绯荤殑Excel瀵煎叆妯℃澘
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -390,7 +390,7 @@
public IActionResult DownloadExcelTemplate([FromQuery] string version)
{
string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\BaseCustomer{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
- var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(瀹㈡埛妗ｆ).xlsx", Encoding.GetEncoding("UTF-8"));
+ var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(寰�鏉ュ叧绯�).xlsx", Encoding.GetEncoding("UTF-8"));
return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
}
@@ -404,78 +404,78 @@
/// <param name="input"></param>
/// <param name="isEdit"></param>
/// <returns></returns>
- private async Task CheckExisit( BaseCustomer input,bool isEdit=false)
+ private async Task CheckExisit(BaseCustomer input, bool isEdit = false)
{
-
-
- bool isExist = false;
- if (!isEdit)//鏂板
- {
- //鏁版嵁鏄惁瀛樺湪閲嶅
- isExist = await _baseCustomerRep.AnyAsync(u =>
- u.CustChinaName.Equals(input.CustChinaName)
- ,false);
- }
- else//缂栬緫
- {
-
-
- //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
- isExist = await _baseCustomerRep.AnyAsync(u =>
- u.Id != input.Id
- &&u.CustChinaName.Equals(input.CustChinaName)
- ,false);
- }
-
-
+
+ bool isExist = false;
+ if (!isEdit)//鏂板
+ {
+ //鏁版嵁鏄惁瀛樺湪閲嶅
+ isExist = await _baseCustomerRep.AnyAsync(u =>
+ u.CustChinaName.Equals(input.CustChinaName)
+ , false);
+ }
+ else//缂栬緫
+ {
+
+
+
+ //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
+ isExist = await _baseCustomerRep.AnyAsync(u =>
+ u.Id != input.Id
+ && u.CustChinaName.Equals(input.CustChinaName)
+ , false);
+ }
+
+
if (isExist) throw Oops.Oh(ErrorCode.E0001);
- }
-
+ }
+
/// <summary>
/// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
/// </summary>
/// <param name="inputs"></param>
/// <returns></returns>
private async Task CheckExisitForImport(List<BaseCustomer> inputs)
- {
+ {
//鏍规嵁鑱斿悎涓婚敭楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- if (inputs?.Count <= 0)
- {
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏁版嵁鏄惁閲嶅
- var existExcelItem = inputs.GroupBy(g => new {
- g.CustChinaName
- })
- .Where(g => g.Count() > 1)
- .Select(s => new {
- s.Key.CustChinaName
- }).FirstOrDefault();
- if (existExcelItem != null)
- {
- var item= existExcelItem.Adapt<BaseCustomer>();
- throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,瀹㈡埛涓枃鍚嶇О[{item.CustChinaName}]宸插瓨鍦�");
- }
-
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏁版嵁鏄惁閲嶅
+ var existExcelItem = inputs.GroupBy(g => new {
+ g.CustChinaName
+ })
+ .Where(g => g.Count() > 1)
+ .Select(s => new {
+ s.Key.CustChinaName
+ }).FirstOrDefault();
+ if (existExcelItem != null)
+ {
+ var item = existExcelItem.Adapt<BaseCustomer>();
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,瀹㈡埛涓枃鍚嶇О[{item.CustChinaName}]宸插瓨鍦�");
+ }
- //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- var existDBItem = await _baseCustomerRep.DetachedEntities.FirstOrDefaultAsync(w=>
- inputs.Select(s=>""
- +s.CustChinaName
- )
- .Contains(""
- +w.CustChinaName
- ));
- if (existDBItem != null)
- {
- var item= existDBItem.Adapt<BaseCustomer>();
- throw Oops.Oh($"绯荤粺涓�,瀹㈡埛涓枃鍚嶇О[{item.CustChinaName}]宸插瓨鍦�");
- }
+
+ //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+ var existDBItem = await _baseCustomerRep.DetachedEntities.FirstOrDefaultAsync(w =>
+ inputs.Select(s => ""
+ + s.CustChinaName
+ )
+ .Contains(""
+ + w.CustChinaName
+ ));
+ if (existDBItem != null)
+ {
+ var item = existDBItem.Adapt<BaseCustomer>();
+ throw Oops.Oh($"绯荤粺涓�,瀹㈡埛涓枃鍚嶇О[{item.CustChinaName}]宸插瓨鍦�");
+ }
}
#endregion
--
Gitblit v1.9.3