From 996acccd51e8fd31a26d92b012e34b6fbbcf2237 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 14:40:59 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Wms/Controllers/SysController.cs | 138 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 135 insertions(+), 3 deletions(-)
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index 293c6ae..d177afc 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -50,6 +50,7 @@
private readonly IArchivingServer _archiving;//鏁版嵁褰掓。
private readonly ApiUrlConfig _config; //鎺ュ彛浜や簰璺緞
+ private readonly IPrintTemplateServer _template;//鎵撳嵃妯℃澘
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -65,7 +66,7 @@
/// <param name="operation">鎿嶄綔鏃ュ織</param>
/// <param name="table">寮傚父澶勭悊</param>
/// <param name="category">鐗╂枡绫诲埆</param>
- public SysController(IOptions<ApiUrlConfig> setting, IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet, IMaterialCategoryServer category, IArchivingServer archiving)
+ public SysController(IOptions<ApiUrlConfig> setting, IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet, IMaterialCategoryServer category, IArchivingServer archiving, IPrintTemplateServer template)
{
_config = setting.Value;
@@ -85,6 +86,7 @@
_category = category;//鐗╂枡绫诲埆
_archiving = archiving;//鏁版嵁褰掓。
+ _template = template;//鎵撳嵃妯℃澘
}
#region 鑿滃崟绠＄悊
@@ -98,10 +100,10 @@
/// <param name="level">灞傜骇</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetMenuList(string MenuName, string pMenuNo, string MenuNo, string level)
+ public async Task<IActionResult> GetMenuList(string MenuName, string pMenuNo, string MenuNo, string level)
{
//鏌ヨ鑿滃崟淇℃伅鍒楄〃
- List<FunctionMenuVm> menulist = _menuSvc.GetMenuList(MenuName, pMenuNo, MenuNo, level);
+ List<FunctionMenuVm> menulist = await _menuSvc.GetMenuList(MenuName, pMenuNo, MenuNo, level);
return Ok(new
{
data = menulist,
@@ -2211,5 +2213,135 @@
}
#endregion
+
+ #region 鎵撳嵃妯℃澘
+
+ /// <summary>
+ /// 鑾峰彇鎵撳嵃妯℃澘
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public async Task<IActionResult> GetPrintTemplateList([FromQuery] PrintTemplateVm model)
+ {
+ try
+ {
+ RefAsync<int> count = new RefAsync<int>(0);
+ var list = await _template.GetPrintTemplateList(model, count);
+ return Ok(new { code = 0, count = count.Value, msg = "鎵撳嵃妯℃澘", data = list });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// 鑾峰彇榛樿鎵撳嵃妯℃澘
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public async Task<IActionResult> GetDefaultPrintTemplate([FromQuery] string type = "1")
+ {
+ try
+ {
+ var data = await _template.GetDefaultPrintTemplate(type);
+ return Ok(new { code = 0, msg = "鎵撳嵃妯℃澘", data = data });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞鎵撳嵃妯℃澘
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<IActionResult> AddPrintTemplate(SysPrintTemplate model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ await _template.AddPrintTemplate(model, int.Parse(userId));
+ return Ok(new { code = 0, msg = "娣诲姞鎴愬姛", data = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 淇敼鎵撳嵃妯℃澘
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<IActionResult> EditPrintTemplate(SysPrintTemplate model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ await _template.EditPrintTemplate(model, int.Parse(userId));
+ return Ok(new { code = 0, msg = "淇敼鎴愬姛", data = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// 鍒犻櫎鎵撳嵃妯℃澘
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<IActionResult> DelPrintTemplate(SysPrintTemplate model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ await _template.DelPrintTemplate(model, int.Parse(userId));
+ return Ok(new { code = 0, msg = "娣诲姞鎴愬姛", data = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.8.0