From d8fec88a25b47563c74face4e1130f66492969be Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 12:38:57 +0800
Subject: [PATCH] 模版调整
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsWarehouse/WmsWarehouseService.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsWarehouse/WmsWarehouseService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsWarehouse/WmsWarehouseService.cs
index be2bb77..e9ac41f 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsWarehouse/WmsWarehouseService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsWarehouse/WmsWarehouseService.cs
@@ -16,7 +16,7 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 浠撳簱琛ㄦ湇鍔�
+ /// 浠撳簱淇℃伅鏈嶅姟
/// </summary>
[ApiDescriptionSettings("WmsBase", Name = "WmsWarehouse", Order = 100)]
[Route("api")]
@@ -42,7 +42,7 @@
}
/// <summary>
- /// 鍒嗛〉鏌ヨ浠撳簱琛�
+ /// 鍒嗛〉鏌ヨ浠撳簱淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -72,10 +72,10 @@
}
/// <summary>
- /// 涓嶅垎椤垫煡璇粨搴撹〃鍒楄〃
+ /// 涓嶅垎椤垫煡璇粨搴撲俊鎭垪琛�
/// </summary>
- /// <param name="input">浠撳簱琛ㄦ煡璇㈠弬鏁�</param>
- /// <returns>(浠撳簱琛�)瀹炰緥鍒楄〃</returns>
+ /// <param name="input">浠撳簱淇℃伅鏌ヨ鍙傛暟</param>
+ /// <returns>(浠撳簱淇℃伅)瀹炰緥鍒楄〃</returns>
[HttpGet("WmsWarehouse/listNonPage")]
public async Task<List<WmsWarehouseOutput>> ListNonPageAsync([FromQuery] WmsWarehouseSearchNonPage input)
{
@@ -117,7 +117,7 @@
}
/// <summary>
- /// 鑾峰彇浠撳簱琛�
+ /// 鑾峰彇浠撳簱淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -128,7 +128,7 @@
}
/// <summary>
- /// 鑾峰彇浠撳簱琛ㄥ垪琛�
+ /// 鑾峰彇浠撳簱淇℃伅鍒楄〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -141,7 +141,7 @@
#region 澧炪�佸垹銆佹敼
/// <summary>
- /// 澧炲姞浠撳簱琛�
+ /// 澧炲姞浠撳簱淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -159,7 +159,7 @@
}
/// <summary>
- /// 鍒犻櫎浠撳簱琛�
+ /// 鍒犻櫎浠撳簱淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -172,7 +172,7 @@
}
/// <summary>
- /// 鏇存柊浠撳簱琛�
+ /// 鏇存柊浠撳簱淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -197,7 +197,7 @@
#region 瀵煎叆
/// <summary>
- /// Excel妯℃澘瀵煎叆浠撳簱琛ㄥ姛鑳�
+ /// Excel妯℃澘瀵煎叆浠撳簱淇℃伅鍔熻兘
/// </summary>
/// <param name="file">Excel妯℃澘鏂囦欢</param>
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
@@ -302,6 +302,12 @@
{
addItem.Address = (string)_Address;
}
+
+ if (string.IsNullOrEmpty(_FactoryCode))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾宸ュ巶缂栧彿]{_FactoryCode}涓嶈兘涓虹┖锛�");
+ }
+
if(!string.IsNullOrEmpty(_FactoryCode))
{
addItem.FactoryCode = (string)_FactoryCode;
@@ -362,12 +368,6 @@
{
addItem.Position = (string)_Position;
}
-
- if (string.IsNullOrEmpty(_IsDisabled))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_IsDisabled))
{
if(!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
@@ -414,7 +414,7 @@
}
/// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇浠撳簱琛ㄧ殑Excel瀵煎叆妯℃澘
+ /// 鏍规嵁鐗堟湰涓嬭浇浠撳簱淇℃伅鐨凟xcel瀵煎叆妯℃澘
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -422,7 +422,7 @@
public IActionResult DownloadExcelTemplate([FromQuery] string version)
{
string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\WmsWarehouse{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 };
}
--
Gitblit v1.9.3