From 0a379b1772ea76fe6a7a53396a3c9a614b29df1b Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 14 六月 2024 17:00:13 +0800
Subject: [PATCH] 1
---
Wms_09/Wms_09/Controllers/SysController.cs | 144 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 137 insertions(+), 7 deletions(-)
diff --git a/Wms_09/Wms_09/Controllers/SysController.cs b/Wms_09/Wms_09/Controllers/SysController.cs
index abcaee9..400df5c 100644
--- a/Wms_09/Wms_09/Controllers/SysController.cs
+++ b/Wms_09/Wms_09/Controllers/SysController.cs
@@ -41,6 +41,7 @@
private readonly IOperationSysServer _operation; //鎿嶄綔鏃ュ織
private readonly IExceptionServer _table; //寮傚父澶勭悊
private readonly IHeaderSettingsServer _headerSet;//琛ㄥご璁剧疆
+ private readonly IPrintTemplateServer _template;//鎵撳嵃妯℃澘
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -54,7 +55,7 @@
/// <param name="dic">鏁版嵁瀛楀吀</param>
/// <param name="operation">鎿嶄綔鏃ュ織</param>
/// <param name="table">寮傚父澶勭悊</param>
- public SysController(IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet)
+ public SysController(IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet, IPrintTemplateServer template)
{
_wareHouseSvc = wareHouseSvc; //浠撳簱
_areaSvc = areaSvc; //鍖哄煙
@@ -69,6 +70,7 @@
_table = table; //寮傚父澶勭悊
_headerSet = headerSet;//琛ㄥご璁剧疆
+ _template = template;//鎵撳嵃妯℃澘
}
#region 鑿滃崟绠＄悊
@@ -225,7 +227,7 @@
}
catch (Exception ex)
{
- return Ok(new { data = "", code = 3, msg = "鏂板鑿滃崟淇℃伅寮傚父锛�"+ ex.Message });
+ return Ok(new { data = "", code = 3, msg = "鏂板鑿滃崟淇℃伅寮傚父锛�" + ex.Message });
}
}
@@ -1138,7 +1140,7 @@
{
_operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "淇敼", "淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
}
-
+
return Ok(new { code = 0, msg = "缂栬緫鎴愬姛", data = "" });
}
else
@@ -1384,11 +1386,11 @@
int uid = Convert.ToInt32(userId);
//鏇存敼浜�
tabledto.UpdateUser = uid;
- string strMesage = _table.EditStatus(tabledto);
+ string strMesage = _table.EditStatus(tabledto);
if (strMesage == "")
{
return Ok(new { code = 0, msg = "澶勭悊鎴愬姛" });
- }
+ }
else
{
return Ok(new { code = 1, msg = strMesage });
@@ -1446,7 +1448,7 @@
/// <param name="row">鎺�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetStorageLocatLists(string wareHouseNo, string roadway,string row)
+ public IActionResult GetStorageLocatLists(string wareHouseNo, string roadway, string row)
{
//鑾峰彇鍌ㄤ綅淇℃伅
List<SysStorageLocat> storagelist = _locatSvc.GetStorageLocatLists(wareHouseNo, roadway, row);
@@ -1527,7 +1529,7 @@
[HttpGet]
public IActionResult GetStorageProportion1(string wareHouseNo, string roadwayNo)
{
- List<GetLocateVm> getLocateVms = _locatSvc.GetStorageProportion1(wareHouseNo,roadwayNo);
+ List<GetLocateVm> getLocateVms = _locatSvc.GetStorageProportion1(wareHouseNo, roadwayNo);
return Ok(new
{
data = getLocateVms,
@@ -1586,7 +1588,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
#region 鏁版嵁琛ㄦ牸琛ㄥご鑷畾涔�(閫氱敤鏂规硶)
/// <summary>
--
Gitblit v1.8.0