From 2264c47cff7ab5ce52d7c158ac0eb941e7b46506 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 31 八月 2022 23:50:53 +0800
Subject: [PATCH] 大岛测试bug修改
---
VueWebApi/Controllers/DeviceManagerController.cs | 368 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 367 insertions(+), 1 deletions(-)
diff --git a/VueWebApi/Controllers/DeviceManagerController.cs b/VueWebApi/Controllers/DeviceManagerController.cs
index c1c70fb..985c415 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -12,8 +12,9 @@
namespace VueWebApi.Controllers
{
- [RoutePrefix(prefix: "api/BasicSetting")]
+ [RoutePrefix(prefix: "api/DeviceManager")]
[ControllerGroup("璁惧绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
+ [ChannelActionFilter]
public class DeviceManagerController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -267,5 +268,370 @@
}
#endregion
+
+
+ #region[璁惧鐐规椤瑰垪琛ㄦ煡璇
+ /// <summary>
+ /// 璁惧鐐规椤瑰垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="checkitemcode">鐐规閮ㄤ綅缂栫爜</param>
+ /// <param name="checkitemname">鐐规閮ㄤ綅鍚嶇О</param>
+ /// <param name="checkdescr">鐐规瑕佹眰</param>
+ /// <param name="isqrcode">閫変腑鎵爜</param>
+ /// <param name="cycle">鐐规鍛ㄦ湡</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckItemSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckItemSearch(int page, int rows, string prop,string order,string checkitemcode = null, string checkitemname = null, string checkdescr = null, string isqrcode = null,string cycle=null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceCheckItemSearch(checkitemcode, checkitemname, checkdescr, isqrcode, cycle, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规椤规柊澧炵紪杈慮
+ /// <summary>
+ /// 璁惧鐐规椤规柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceCheckItem")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateDeviceCheckItem([FromBody] JObject obj)
+ {
+ string checkitemid = obj["id"].ToString(); //璁惧鐐规椤筰d(涓婚敭)
+ string checkitemcode = obj["checkitemcode"].ToString(); //璁惧鐐规閮ㄤ綅缂栫爜
+ string checkitemname = obj["checkitemname"].ToString(); //璁惧鐐规閮ㄤ綅鍚嶇О
+ string checkitemdescr = obj["checkitemdescr"].ToString(); //璁惧鐐规閮ㄤ綅瑕佹眰
+ string cycle = obj["cycle"].ToString(); //璁惧鐐规閮ㄤ綅鍛ㄦ湡
+ string isqrcode = obj["isqrcode"].ToString(); //鏄惁鎵爜
+ var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = DeviceManagerBLL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, usercode, OperType);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规椤瑰垹闄
+ /// <summary>
+ /// 璁惧鐐规椤瑰垹闄�
+ /// </summary>
+ /// <param name="checkitemcode">璁惧鐐规椤圭洰(閮ㄤ綅)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceCheckItem")]
+ [HttpPost]
+ public HttpResponseMessage DeleteDeviceCheckItem(string checkitemcode)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceCheckItem(checkitemcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[璁惧淇濆吇椤瑰垪琛ㄦ煡璇
+ /// <summary>
+ /// 璁惧淇濆吇椤瑰垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="maiitemcode">淇濆吇閮ㄤ綅缂栫爜</param>
+ /// <param name="maiitemname">淇濆吇閮ㄤ綅鍚嶇О</param>
+ /// <param name="maidescr">淇濆吇瑕佹眰</param>
+ /// <param name="isqrcode">閫変腑鎵爜</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceMaiItemSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceMaiItemSearch(int page, int rows, string prop, string order,string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤规柊澧炵紪杈慮
+ /// <summary>
+ /// 璁惧淇濆吇椤规柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceMaiItem")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateDeviceMaiItem([FromBody] JObject obj)
+ {
+ string maiitemid = obj["id"].ToString(); //璁惧淇濆吇椤筰d(涓婚敭)
+ string maiitemcode = obj["maiitemcode"].ToString(); //璁惧淇濆吇閮ㄤ綅缂栫爜
+ string maiitemname = obj["maiitemname"].ToString(); //璁惧淇濆吇閮ㄤ綅鍚嶇О
+ string maiitemdescr = obj["maiitemdescr"].ToString(); //璁惧淇濆吇閮ㄤ綅瑕佹眰
+ string isqrcode = obj["isqrcode"].ToString(); //鏄惁鎵爜
+ var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, usercode, OperType);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤瑰垹闄
+ /// <summary>
+ /// 璁惧淇濆吇椤瑰垹闄�
+ /// </summary>
+ /// <param name="maiitemcode">璁惧淇濆吇椤圭洰(閮ㄤ綅)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceMaiItem")]
+ [HttpPost]
+ public HttpResponseMessage DeleteDeviceMaiItem(string maiitemcode)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceMaiItem(maiitemcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+ #region[璁惧鐐规鏍囧噯鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍒楄〃鏌ヨ
+ /// </summary>
+ /// <param name="checkstandcode">鐐规鏍囧噯缂栫爜</param>
+ /// <param name="checkstandname">鐐规鏍囧噯鍚嶇О</param>
+ /// <param name="checkcontr">鐐规绠℃帶</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckStandArdSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckStandArdSearch(int page, int rows, string prop, string order,string checkstandcode = null, string checkstandname = null, string checkcontr = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceCheckStandArdSearch(checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckItemSelect")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckItemSelect()
+ {
+ mes = DeviceManagerBLL.DeviceCheckItemSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ViewDeviceCheckStanedSearch")]
+ [HttpPost]
+ public HttpResponseMessage ViewDeviceCheckStanedSearch(string checkstand_code)
+ {
+ mes = DeviceManagerBLL.ViewDeviceCheckStanedSearch(checkstand_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板缂栬緫]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鏂板缂栬緫
+ /// </summary>
+ /// <param name="opertype">鎿嶄綔绫诲瀷</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceCheckStandArd")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = DeviceManagerBLL.AddUpdateDeviceCheckStandArd(opertype, json, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鍒犻櫎]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍒犻櫎
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceCheckStaned")]
+ [HttpPost]
+ public HttpResponseMessage DeleteDeviceCheckStaned(string checkstand_code)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceCheckStaned(checkstand_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇�
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckStanedAssociationEqp")]
+ [HttpGet]
+ public HttpResponseMessage DeviceCheckStanedAssociationEqp(string checkstand_code)
+ {
+ mes = DeviceManagerBLL.DeviceCheckStanedAssociationEqp(checkstand_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region [璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜�
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveDeviceCheckStanedAssociationEqp")]
+ [HttpPost]
+ public HttpResponseMessage SaveDeviceCheckStanedAssociationEqp(string checkstand_code, List<ObjectData> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = DeviceManagerBLL.SaveDeviceCheckStanedAssociationEqp(checkstand_code, username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[璁惧淇濆吇鏍囧噯鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鍒楄〃鏌ヨ
+ /// </summary>
+ /// <param name="repairstandcode">淇濆吇鏍囧噯缂栫爜</param>
+ /// <param name="repairstandname">淇濆吇鏍囧噯鍚嶇О</param>
+ /// <param name="repairstanddescr">淇濆吇鏍囧噯鎻忚堪</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "DeviceRepairStandArdSearch")]
+ [HttpGet]
+ public HttpResponseMessage DeviceRepairStandArdSearch(int page, int rows, string prop, string order,string repairstandcode = null, string repairstandname = null, string repairstanddescr = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceRepairStandArdSearch(repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯鏂板銆佺紪杈戣幏鍙栦繚鍏婚」鐩笅鎷夊垪琛╙
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鏂板銆佺紪杈戣幏鍙栦繚鍏婚」鐩笅鎷夊垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "DeviceRepairItemSelect")]
+ [HttpGet]
+ public HttpResponseMessage DeviceRepairItemSelect()
+ {
+ mes = DeviceManagerBLL.DeviceRepairItemSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁
+ /// </summary>
+ /// <param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ViewDeviceRepairStanedSearch")]
+ [HttpPost]
+ public HttpResponseMessage ViewDeviceRepairStanedSearch(string repairstand_code)
+ {
+ mes = DeviceManagerBLL.ViewDeviceRepairStanedSearch(repairstand_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯鏂板缂栬緫]
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鏂板缂栬緫
+ /// </summary>
+ /// <param name="opertype">鎿嶄綔绫诲瀷</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceRepairStandArd")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = DeviceManagerBLL.AddUpdateDeviceRepairStandArd(opertype, json, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯鍒犻櫎]
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鍒犻櫎
+ /// </summary>
+ /// <param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceRepairStaned")]
+ [HttpPost]
+ public HttpResponseMessage DeleteDeviceRepairStaned(string repairstand_code)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceRepairStaned(repairstand_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇�
+ /// </summary>
+ /// <param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeviceRepairStanedAssociationEqp")]
+ [HttpGet]
+ public HttpResponseMessage DeviceRepairStanedAssociationEqp(string repairstand_code)
+ {
+ mes = DeviceManagerBLL.DeviceRepairStanedAssociationEqp(repairstand_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region [璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜�
+ /// </summary>
+ /// <param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveDeviceRepairStanedAssociationEqp")]
+ [HttpPost]
+ public HttpResponseMessage SaveDeviceRepairStanedAssociationEqp(string repairstand_code, List<ObjectData> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = DeviceManagerBLL.SaveDeviceRepairStanedAssociationEqp(repairstand_code, username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
}
}
--
Gitblit v1.9.3