From d6883f7f2dc6f60b4378b6c4d456750de7084c77 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:53:57 +0800
Subject: [PATCH] 修改
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs | 10 ++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs | 14 +++---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs | 26 ++++++------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 10 ++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs | 4 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs | 6 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs | 2
9 files changed, 38 insertions(+), 38 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 9af5e09..2e4091c 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>
@@ -381,7 +381,7 @@
}
/// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇寰�鏉ュ叧绯荤殑Excel瀵煎叆妯℃澘
+ /// 鏍规嵁鐗堟湰涓嬭浇寰�鏉ュ崟浣嶇殑Excel瀵煎叆妯℃澘
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -389,7 +389,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 };
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
index 037feb8..154b253 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
@@ -7,7 +7,7 @@
{
/// <summary>
- /// 寰�鏉ュ叧绯绘煡璇㈠弬鏁�
+ /// 寰�鏉ュ崟浣嶆煡璇㈠弬鏁�
/// </summary>
public class BaseCustomerSearch : PageInputBase
{
@@ -104,7 +104,7 @@
}
/// <summary>
- /// 寰�鏉ュ叧绯讳笉鍒嗛〉鏌ヨ鍙傛暟
+ /// 寰�鏉ュ崟浣嶄笉鍒嗛〉鏌ヨ鍙傛暟
/// </summary>
public class BaseCustomerSearchNonPage : PageInputNonPageBase
{
@@ -201,7 +201,7 @@
}
/// <summary>
- /// 寰�鏉ュ叧绯昏緭鍏ュ弬鏁�
+ /// 寰�鏉ュ崟浣嶈緭鍏ュ弬鏁�
/// </summary>
public class BaseCustomerInput
{
@@ -279,21 +279,21 @@
}
/// <summary>
- /// 寰�鏉ュ叧绯绘柊澧炲弬鏁�
+ /// 寰�鏉ュ崟浣嶆柊澧炲弬鏁�
/// </summary>
public class AddBaseCustomerInput : BaseCustomerInput
{
}
/// <summary>
- /// 寰�鏉ュ叧绯诲垹闄ゅ弬鏁�
+ /// 寰�鏉ュ崟浣嶅垹闄ゅ弬鏁�
/// </summary>
public class DeleteBaseCustomerInput : BaseId
{
}
/// <summary>
- /// 寰�鏉ュ叧绯绘洿鏂板弬鏁�
+ /// 寰�鏉ュ崟浣嶆洿鏂板弬鏁�
/// </summary>
public class UpdateBaseCustomerInput : BaseCustomerInput
{
@@ -306,7 +306,7 @@
}
/// <summary>
- /// 寰�鏉ュ叧绯昏幏鍙栧崟涓弬鏁�
+ /// 寰�鏉ュ崟浣嶈幏鍙栧崟涓弬鏁�
/// </summary>
public class QueryeBaseCustomerInput : BaseId
{
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
index 7605247..bcabfb7 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
@@ -4,7 +4,7 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 寰�鏉ュ叧绯昏緭鍑哄弬鏁�
+ /// 寰�鏉ュ崟浣嶈緭鍑哄弬鏁�
/// </summary>
public class BaseCustomerOutput
{
@@ -81,7 +81,7 @@
/// <summary>
/// Id涓婚敭
/// </summary>
- public long? Id { get; set; }
+ public long Id { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
index 0505eef..59b3ddd 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -452,14 +452,14 @@
/// </summary>
public List<AddWmsSubstituteGoodInput> SubstituteGoodList { get; set; }
- /// <summary>
- /// 寰�鏉ュ叧绯�
- /// </summary>
- public List<BaseCustomerInput> BaseCustomerList { get; set; }
+ ///// <summary>
+ ///// 寰�鏉ュ崟浣�
+ ///// </summary>
+ //public List<BaseCustomerInput> BaseCustomerList { get; set; }
/// <summary>
- /// 瀹㈡埛妗ｆID鍒楄〃
+ /// 瀹㈡埛妗ｆ锛堝線鏉ュ崟浣嶏級ID鍒楄〃
/// </summary>
public List<long> BaseCustomerList { get; set; }
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
index 181de85..2c39b09 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
@@ -163,7 +163,7 @@
public List<WmsSubstituteGoodOutput> SubstituteGoodList { get; set; }
/// <summary>
- /// 寰�鏉ュ叧绯�
+ /// 寰�鏉ュ崟浣�
/// </summary>
public List<BaseCustomerOutput> BaseCustomerList { get; set; }
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
index 4d6c0c2..8513c17 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -248,13 +248,13 @@
var wmsMaterialType = (await _wmsMaterialTypeRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == wmsMaterial.MaterialType)).Adapt<WmsMaterialTypeOutput>();
if(wmsMaterialType==null) throw Oops.Oh($"ID{wmsMaterial.MaterialType}鐗╂枡绫诲瀷涓嶅瓨鍦�");
- wmsMaterial.MaterialTypeName = wmsMaterialType.MaterialTypeName;
+ wmsMaterial.MaterialTypeName = wmsMaterialType.MaterialTypeName;
- //寰�鏉ュ叧绯讳俊鎭�
- var baseCustomerList = input.BaseCustomerList.Adapt<List<BaseCustomer>>();
+ //寰�鏉ュ崟浣�
+ var wmsBaseCustomerList = await _baseCustomerRep.DetachedEntities.Where(u => input.BaseCustomerList.Contains(u.Id) && u.IsDeleted == false && u.IsDisabled == false).ProjectToType<BaseCustomerOutput>().ToListAsync();
//鐗╂枡瀹㈡埛鍏宠仈鍏崇郴
var materialCustomerList=new List<WmsMaterialCustomer>();
- foreach (var baseCustomer in baseCustomerList)
+ foreach (var baseCustomer in wmsBaseCustomerList)
{
materialCustomerList.Add(new WmsMaterialCustomer()
{
@@ -350,7 +350,7 @@
}
- //寰�鏉ュ叧绯讳俊鎭�
+ //寰�鏉ュ崟浣嶄俊鎭�
var baseCustomerList = input.BaseCustomerList.Adapt<List<BaseCustomer>>();
//鐗╂枡瀹㈡埛鍏宠仈鍏崇郴
var materialCustomerList = new List<WmsMaterialCustomer>();
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
index 2a7c378..c781e60 100755
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs
@@ -5,15 +5,15 @@
/*
* @author : 鍒樻枃濂�
* @date : 2024/4/23涓嬪崍4:07:57
- * @desc : 寰�鏉ュ叧绯�
+ * @desc : 寰�鏉ュ崟浣�
*/
namespace Admin.NET.Core
{
/// <summary>
- /// 寰�鏉ュ叧绯�
+ /// 寰�鏉ュ崟浣�
/// </summary>
[Table("base_customer")]
- [Comment("寰�鏉ュ叧绯�")]
+ [Comment("寰�鏉ュ崟浣�")]
public class BaseCustomer : DEntityBase
{
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs
index 1794ee2..ca79870 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs
@@ -3,7 +3,7 @@
namespace Admin.NET.Core
{
/// <summary>
- /// 寰�鏉ュ叧绯荤被鍨�
+ /// 寰�鏉ュ崟浣嶇被鍨�
/// </summary>
public enum BaseCustomerTypeEnum
{
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
index bb817d7..05646f0 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
@@ -82,7 +82,7 @@
new SysDictType{Id=539751788187717, Name="鐗╂枡ABC鍒嗙被", Code="abc_class_type", Sort=100, Remark="", Status=0 },
- new SysDictType{Id=540028296155205, Name="寰�鏉ュ叧绯荤被鍨�", Code="base_customer_type", Sort=100, Remark="", Status=0 },
+ new SysDictType{Id=540028296155205, Name="寰�鏉ュ崟浣嶇被鍨�", Code="base_customer_type", Sort=100, Remark="", Status=0 },
};
}
}
--
Gitblit v1.9.3