From 384e823d11dabf7199b22358f5883748b054f141 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 10:50:41 +0800
Subject: [PATCH] 客户档案改为 往来关系
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs | 2 +-
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 | 4 ++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs | 2 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/BaseCustomer.cs | 6 +++---
6 files changed, 27 insertions(+), 27 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 377dc53..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 };
}
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 c23ce82..f4f854e 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
@@ -6,7 +6,7 @@
{
/// <summary>
- /// 瀹㈡埛妗ｆ鏌ヨ鍙傛暟
+ /// 寰�鏉ュ叧绯绘煡璇㈠弬鏁�
/// </summary>
public class BaseCustomerSearch : PageInputBase
{
@@ -103,7 +103,7 @@
}
/// <summary>
- /// 瀹㈡埛妗ｆ涓嶅垎椤垫煡璇㈠弬鏁�
+ /// 寰�鏉ュ叧绯讳笉鍒嗛〉鏌ヨ鍙傛暟
/// </summary>
public class BaseCustomerSearchNonPage : PageInputNonPageBase
{
@@ -200,7 +200,7 @@
}
/// <summary>
- /// 瀹㈡埛妗ｆ杈撳叆鍙傛暟
+ /// 寰�鏉ュ叧绯昏緭鍏ュ弬鏁�
/// </summary>
public class BaseCustomerInput
{
@@ -269,21 +269,21 @@
}
/// <summary>
- /// 瀹㈡埛妗ｆ鏂板鍙傛暟
+ /// 寰�鏉ュ叧绯绘柊澧炲弬鏁�
/// </summary>
public class AddBaseCustomerInput : BaseCustomerInput
{
}
/// <summary>
- /// 瀹㈡埛妗ｆ鍒犻櫎鍙傛暟
+ /// 寰�鏉ュ叧绯诲垹闄ゅ弬鏁�
/// </summary>
public class DeleteBaseCustomerInput : BaseId
{
}
/// <summary>
- /// 瀹㈡埛妗ｆ鏇存柊鍙傛暟
+ /// 寰�鏉ュ叧绯绘洿鏂板弬鏁�
/// </summary>
public class UpdateBaseCustomerInput : BaseCustomerInput
{
@@ -296,7 +296,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 3f0aea5..7605247 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
{
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 3ef7770..95ef2c7 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
@@ -453,7 +453,7 @@
public List<AddWmsSubstituteGoodInput> SubstituteGoodList { get; set; }
/// <summary>
- /// 瀹㈡埛妗ｆ
+ /// 寰�鏉ュ叧绯�
/// </summary>
public List<BaseCustomerInput> 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 83c63b7..7e2b3d6 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
@@ -191,7 +191,7 @@
var controlRuleld = input.ControlRuleld;
wmsMaterial.ControlRuleId = controlRuleld;
- //瀹㈡埛妗ｆ淇℃伅
+ //寰�鏉ュ叧绯讳俊鎭�
var baseCustomerList = input.BaseCustomerList.Adapt<List<BaseCustomer>>();
//鐗╂枡瀹㈡埛鍏宠仈鍏崇郴
var materialCustomerList=new List<WmsMaterialCustomer>();
@@ -279,7 +279,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 35e9442..2a7c378 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
{
--
Gitblit v1.9.3