From 8024ec8c0300dcffa0caf4e2a030e068a9051bc2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 18 一月 2024 09:08:31 +0800
Subject: [PATCH] 1.ServiceStack.Redis 依赖包变更为StackExchange.Redis
---
VueWebCoreApi/Controllers/MouldManagerController.cs | 204 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 199 insertions(+), 5 deletions(-)
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index beb8e42..bde517c 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -20,7 +20,7 @@
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
ToMessage mes = new ToMessage();
- RedisHelper redis = new RedisHelper();
+ RedisCommon redis = new RedisCommon();
#region[妯″叿娓呭崟鍒楄〃鏌ヨ]
/// <summary>
@@ -71,12 +71,14 @@
string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
string mouldname = obj["mouldname"].ToString(); //妯″叿鍚嶇О
string mouldspec = obj["mouldspec"].ToString(); //妯″叿瑙勬牸
+ string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string location_code = obj["location_code"].ToString(); //搴撲綅缂栫爜
string surplife = obj["surplife"].ToString(); //棰勮瀵垮懡
string resilife = obj["resilife"].ToString(); //鍓╀綑瀵垮懡
string status = obj["status"].ToString(); //妯″叿鐘舵��
string mouldpart = obj["mouldpart"].ToString(); //鍏宠仈浜у搧
string opertype = obj["opertype"].ToString(); //鎿嶄綔绫诲瀷
- mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
+ mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, warehousecode, location_code, surplife, resilife, status, mouldpart, opertype, us);
return Json(mes);
}
#endregion
@@ -661,7 +663,7 @@
User us = JwtTools.Denocode(token.ToString());
var files = Request.Form.Files; // 鑾峰彇浼犺緭鐨勬枃浠跺垪琛�
mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode, mouldcode, faultsourcecode, faultdescr, us, files);
- mes.Message = menucode;
+ mes.message = menucode;
return Json(mes);
}
#endregion
@@ -945,8 +947,9 @@
User us = JwtTools.Denocode(token.ToString());
string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string locationcode = obj["locationcode"].ToString(); //搴撲綅缂栫爜
string description = obj["description"].ToString(); //鍏ュ簱鎻忚堪
- mes = MouldManagerBLL.MouldInWareHouseSave(mouldcode, warehousecode,description, us);
+ mes = MouldManagerBLL.MouldInWareHouseSave(mouldcode, warehousecode, locationcode, description, us);
return Json(mes);
}
#endregion
@@ -981,8 +984,9 @@
User us = JwtTools.Denocode(token.ToString());
string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string locationcode = obj["locationcode"].ToString(); //搴撲綅缂栫爜
string description = obj["description"].ToString(); //鍑哄簱鎻忚堪
- mes = MouldManagerBLL.MouldOutWareHouseSave(mouldcode, warehousecode, description, us);
+ mes = MouldManagerBLL.MouldOutWareHouseSave(mouldcode, warehousecode, locationcode, description, us);
return Json(mes);
}
#endregion
@@ -1256,5 +1260,195 @@
return Json(mes);
}
#endregion
+
+
+ #region[妯″叿涓婁笅鏈鸿褰曟煡璇
+ /// <summary>
+ /// 妯″叿涓婁笅鏈鸿褰曟煡璇�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="type">鎿嶄綔绫诲瀷(涓婃満:UP 涓嬫満:DOWN)</param>
+ /// <param name="devicecode">璁惧缂栫爜</param>
+ /// <param name="operuser">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勬牸</param>
+ /// <returns></returns>
+ [Route(template: "MouldUpDownMachinesSearch")]
+ [HttpGet]
+ public JsonResult MouldUpDownMachinesSearch(int page, int rows, string prop, string order, string mouldcode = null, string mouldname = null, string mouldspec = null, string type = null,string devicecode=null,string operuser=null, string operdate = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ opendate = operdate.Split('~')[0].ToString();
+ closedate = operdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MouldUpDownMachinesSearch(mouldcode, mouldname, mouldspec,type,devicecode,operuser,opendate,closedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿涓婁笅鏈鸿瀵煎嚭]
+ /// <summary>
+ /// 妯″叿涓婁笅鏈鸿瀵煎嚭
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="type">鎿嶄綔绫诲瀷(涓婃満:UP 涓嬫満:DOWN)</param>
+ /// <param name="devicecode">璁惧缂栫爜</param>
+ /// <param name="operuser">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "MouldUpDownMachinesOutExcel")]
+ [HttpGet]
+ public JsonResult MouldUpDownMachinesOutExcel(string mouldcode = null, string mouldname = null, string mouldspec = null, string type = null, string devicecode = null, string operuser = null, string operdate = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ opendate = operdate.Split('~')[0].ToString();
+ closedate = operdate.Split('~')[1].ToString();
+ }
+ mes = MouldManagerBLL.MouldUpDownMachinesOutExcel(mouldcode, mouldname, mouldspec, type, devicecode, operuser, opendate, closedate);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿鍊熻繕璁板綍鏌ヨ]
+ /// <summary>
+ /// 妯″叿鍊熻繕璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="type">鎿嶄綔绫诲瀷</param>
+ /// <param name="operuser">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勬牸</param>
+ /// <returns></returns>
+ [Route(template: "MouldCirculateMachinesSearch")]
+ [HttpGet]
+ public JsonResult MouldCirculateMachinesSearch(int page, int rows, string prop, string order, string mouldcode = null, string mouldname = null, string mouldspec = null, string type = null, string operuser = null, string operdate = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ opendate = operdate.Split('~')[0].ToString();
+ closedate = operdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MouldCirculateMachinesSearch(mouldcode, mouldname, mouldspec, type, operuser, opendate, closedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鍊熻繕璁板綍瀵煎嚭]
+ /// <summary>
+ /// 妯″叿鍊熻繕璁板綍瀵煎嚭
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="type">鎿嶄綔绫诲瀷</param>
+ /// <param name="operuser">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "MouldCirculateMachinesOutExcel")]
+ [HttpGet]
+ public JsonResult MouldCirculateMachinesOutExcel(string mouldcode = null, string mouldname = null, string mouldspec = null, string type = null, string operuser = null, string operdate = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ opendate = operdate.Split('~')[0].ToString();
+ closedate = operdate.Split('~')[1].ToString();
+ }
+ mes = MouldManagerBLL.MouldCirculateMachinesOutExcel(mouldcode, mouldname, mouldspec, type, operuser, opendate, closedate);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿鍑哄叆搴撹褰曟煡璇
+ /// <summary>
+ /// 妯″叿鍑哄叆搴撹褰曟煡璇�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="type">鎿嶄綔绫诲瀷(鍏ュ簱:IN 鍑哄簱:OUT)</param>
+ /// <param name="warehousecode">浠撳簱缂栫爜</param>
+ /// <param name="locationcode">搴撲綅缂栫爜</param>
+ /// <param name="operuser">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldInOutMachinesSearch")]
+ [HttpGet]
+ public JsonResult MouldInOutMachinesSearch(int page, int rows, string prop, string order, string mouldcode = null, string mouldname = null, string mouldspec = null, string type = null,string warehousecode=null,string locationcode=null, string operuser = null, string operdate = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ opendate = operdate.Split('~')[0].ToString();
+ closedate = operdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MouldInOutMachinesSearch(mouldcode, mouldname, mouldspec, type, warehousecode,locationcode, operuser, opendate, closedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鍑哄叆搴撹褰曞鍑篯
+ /// <summary>
+ /// 妯″叿鍑哄叆搴撹褰曞鍑�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="type">鎿嶄綔绫诲瀷(鍏ュ簱:IN 鍑哄簱:OUT)</param>
+ /// <param name="warehousecode">浠撳簱缂栫爜</param>
+ /// <param name="locationcode">搴撲綅缂栫爜</param>
+ /// <param name="operuser">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "MouldInOutMachinesOutExcel")]
+ [HttpGet]
+ public JsonResult MouldInOutMachinesOutExcel(string mouldcode = null, string mouldname = null, string mouldspec = null, string type = null, string warehousecode = null, string locationcode = null, string operuser = null, string operdate = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ opendate = operdate.Split('~')[0].ToString();
+ closedate = operdate.Split('~')[1].ToString();
+ }
+ mes = MouldManagerBLL.MouldInOutMachinesOutExcel(mouldcode, mouldname, mouldspec, type, warehousecode, locationcode, operuser, opendate, closedate);
+ return Json(mes);
+ }
+ #endregion
+
}
}
--
Gitblit v1.9.3