From 22af5bed0da8a5852bd824a1e21e6fc43df6df2a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 11 十二月 2023 19:20:43 +0800
Subject: [PATCH] 1.App 智能分析，生产进度看板接口 2.PC端设备点检项目、保养项目、点检标准、保养标准、点检记录、保养记录、维修记录 3.工序检验扫码添加判断(条码任务是否存在、工单是否关闭) 4.添加App图标图片文件
---
VueWebCoreApi/Controllers/DeviceManagerController.cs | 658 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 655 insertions(+), 3 deletions(-)
diff --git a/VueWebCoreApi/Controllers/DeviceManagerController.cs b/VueWebCoreApi/Controllers/DeviceManagerController.cs
index 979de29..90a46b1 100644
--- a/VueWebCoreApi/Controllers/DeviceManagerController.cs
+++ b/VueWebCoreApi/Controllers/DeviceManagerController.cs
@@ -45,11 +45,11 @@
/// <returns></returns>
[Route(template: "AddUpdateDeviceType")]
[HttpPost]
- public JsonResult AddUpdateDeviceType(string OperType,List<ObjectDataCont> json)
+ public JsonResult AddUpdateDeviceType(string OperType, List<ObjectDataCont> json)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- mes = DeviceManagerBLL.AddUpdateDeviceType(OperType,json, us);
+ mes = DeviceManagerBLL.AddUpdateDeviceType(OperType, json, us);
return Json(mes);
}
#endregion
@@ -117,7 +117,7 @@
string storgcode = obj["storgcode"].ToString(); //鎵�灞炵粍缁囩紪鐮�
string status = obj["status"].ToString(); //浣跨敤鐘舵��
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = DeviceManagerBLL.AddUpdateDeviceManger(devicecode, devicename, devicetype, storgcode, status,OperType, us);
+ mes = DeviceManagerBLL.AddUpdateDeviceManger(devicecode, devicename, devicetype, storgcode, status, OperType, us);
return Json(mes);
}
#endregion
@@ -138,5 +138,657 @@
return Json(mes);
}
#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 JsonResult 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 Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规椤规柊澧炵紪杈慮
+ /// <summary>
+ /// 璁惧鐐规椤规柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceCheckItem")]
+ [HttpPost]
+ public JsonResult AddUpdateDeviceCheckItem([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ 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(); //鏄惁鎵爜
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = DeviceManagerBLL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, us, OperType);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规椤瑰垹闄
+ /// <summary>
+ /// 璁惧鐐规椤瑰垹闄�
+ /// </summary>
+ /// <param name="checkitemcode">璁惧鐐规椤圭洰(閮ㄤ綅)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceCheckItem")]
+ [HttpPost]
+ public JsonResult DeleteDeviceCheckItem(string checkitemcode)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceCheckItem(checkitemcode);
+ return Json(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 JsonResult 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 Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤规柊澧炵紪杈慮
+ /// <summary>
+ /// 璁惧淇濆吇椤规柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceMaiItem")]
+ [HttpPost]
+ public JsonResult AddUpdateDeviceMaiItem([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ 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(); //鏄惁鎵爜
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, us, OperType);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇椤瑰垹闄
+ /// <summary>
+ /// 璁惧淇濆吇椤瑰垹闄�
+ /// </summary>
+ /// <param name="maiitemcode">璁惧淇濆吇椤圭洰(閮ㄤ綅)缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceMaiItem")]
+ [HttpPost]
+ public JsonResult DeleteDeviceMaiItem(string maiitemcode)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceMaiItem(maiitemcode);
+ return Json(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 JsonResult DeviceCheckStandArdSearch(int page, int rows, string prop, string order, string checkstandcode = null, string checkstandname = null, string checkcontr = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceCheckStandArdSearch(us, checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckItemSelect")]
+ [HttpGet]
+ public JsonResult DeviceCheckItemSelect()
+ {
+ mes = DeviceManagerBLL.DeviceCheckItemSelect();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ViewDeviceCheckStanedSearch")]
+ [HttpPost]
+ public JsonResult ViewDeviceCheckStanedSearch(string checkstand_code)
+ {
+ mes = DeviceManagerBLL.ViewDeviceCheckStanedSearch(checkstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鏂板缂栬緫]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鏂板缂栬緫
+ /// </summary>
+ /// <param name="opertype">鎿嶄綔绫诲瀷</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceCheckStandArd")]
+ [HttpPost]
+ public JsonResult AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = DeviceManagerBLL.AddUpdateDeviceCheckStandArd(opertype, json, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鍒犻櫎]
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍒犻櫎
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceCheckStaned")]
+ [HttpPost]
+ public JsonResult DeleteDeviceCheckStaned(string checkstand_code)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceCheckStaned(checkstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇�
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckStanedAssociationEqp")]
+ [HttpGet]
+ public JsonResult DeviceCheckStanedAssociationEqp(string checkstand_code)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = DeviceManagerBLL.DeviceCheckStanedAssociationEqp(us, checkstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region [璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜
+ /// <summary>
+ /// 璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜�
+ /// </summary>
+ /// <param name="checkstand_code">璁惧鐐规鏍囧噯缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveDeviceCheckStanedAssociationEqp")]
+ [HttpPost]
+ public JsonResult SaveDeviceCheckStanedAssociationEqp(string checkstand_code, List<ObjectData> json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = DeviceManagerBLL.SaveDeviceCheckStanedAssociationEqp(us, checkstand_code, json);
+ return Json(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 JsonResult DeviceRepairStandArdSearch(int page, int rows, string prop, string order, string repairstandcode = null, string repairstandname = null, string repairstanddescr = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceRepairStandArdSearch(us, repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯鏂板銆佺紪杈戣幏鍙栦繚鍏婚」鐩笅鎷夊垪琛╙
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鏂板銆佺紪杈戣幏鍙栦繚鍏婚」鐩笅鎷夊垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "DeviceRepairItemSelect")]
+ [HttpGet]
+ public JsonResult DeviceRepairItemSelect()
+ {
+ mes = DeviceManagerBLL.DeviceRepairItemSelect();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁]
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯缂栬緫/鏌ョ湅鑾峰彇鏁版嵁
+ /// </summary>
+ /// <param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ViewDeviceRepairStanedSearch")]
+ [HttpPost]
+ public JsonResult ViewDeviceRepairStanedSearch(string repairstand_code)
+ {
+ mes = DeviceManagerBLL.ViewDeviceRepairStanedSearch(repairstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯鏂板缂栬緫]
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鏂板缂栬緫
+ /// </summary>
+ /// <param name="opertype">鎿嶄綔绫诲瀷</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateDeviceRepairStandArd")]
+ [HttpPost]
+ public JsonResult AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = DeviceManagerBLL.AddUpdateDeviceRepairStandArd(opertype, json, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯鍒犻櫎]
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鍒犻櫎
+ /// </summary>
+ /// <param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteDeviceRepairStaned")]
+ [HttpPost]
+ public JsonResult DeleteDeviceRepairStaned(string repairstand_code)
+ {
+ mes = DeviceManagerBLL.DeleteDeviceRepairStaned(repairstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇�
+ /// </summary>
+ /// <param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeviceRepairStanedAssociationEqp")]
+ [HttpGet]
+ public JsonResult DeviceRepairStanedAssociationEqp(string repairstand_code)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = DeviceManagerBLL.DeviceRepairStanedAssociationEqp(us, repairstand_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region [璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜
+ /// <summary>
+ /// 璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜�
+ /// </summary>
+ /// <param name="repairstand_code">璁惧淇濆吇鏍囧噯缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveDeviceRepairStanedAssociationEqp")]
+ [HttpPost]
+ public JsonResult SaveDeviceRepairStanedAssociationEqp(string repairstand_code, List<ObjectData> json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = DeviceManagerBLL.SaveDeviceRepairStanedAssociationEqp(us, repairstand_code, json);
+ return Json(mes);
+ }
+ #endregion
+
+
+
+ #region[璁惧鐐规璁板綍鏌ヨ]
+ /// <summary>
+ /// 璁惧鐐规璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="eqpname">璁惧鍚嶇О</param>
+ /// <param name="stanedname">鐐规鏍囧噯鍚嶇О</param>
+ /// <param name="checkuser">鐐规浜哄憳</param>
+ /// <param name="checkdate">鐐规鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckTakeSearch")]
+ [HttpGet]
+ public JsonResult DeviceCheckTakeSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string checkuser = null, string checkdate = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string checkopendate = "";//鐐规寮�濮嬫椂闂�
+ string checkclosedate = "";//鐐规缁撴潫鏃堕棿
+ if (checkdate != "" && checkdate != null)
+ {
+ checkopendate = checkdate.Split('~')[0].ToString();
+ checkclosedate = checkdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1;//璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍rowNum
+ mes = DeviceManagerBLL.DeviceCheckTakeSearch(us, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规璁板綍鏄庣粏鏌ヨ]
+ /// <summary>
+ /// 璁惧鐐规璁板綍鏄庣粏鏌ヨ
+ /// </summary>
+ /// <param name="djwo">璁惧鐐规鍗曞彿</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckSubTakeSearch")]
+ [HttpGet]
+ public JsonResult DeviceCheckSubTakeSearch(string djwo)
+ {
+ mes = DeviceManagerBLL.DeviceCheckSubTakeSearch(djwo);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧鐐规璁板綍瀵煎嚭]
+ /// <summary>
+ /// 璁惧鐐规璁板綍瀵煎嚭
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栧彿</param>
+ /// <param name="eqpname">璁惧鍚嶇О</param>
+ /// <param name="stanedname">鐐规鏍囧噯鍚嶇О</param>
+ /// <param name="checkuser">鐐规浜哄憳</param>
+ /// <param name="checkdate">鐐规鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "DeviceCheckTakeOutExcel")]
+ [HttpGet]
+ public JsonResult DeviceCheckTakeOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string checkuser = null, string checkdate = null)
+ {
+ var Token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(Token.ToString());
+ string checkopendate = "";//鐐规寮�濮嬫椂闂�
+ string checkclosedate = "";//鐐规缁撴潫鏃堕棿
+ if (checkdate != "" && checkdate != null)
+ {
+ checkopendate = checkdate.Split('~')[0].ToString();
+ checkclosedate = checkdate.Split('~')[1].ToString();
+ }
+ mes = DeviceManagerBLL.DeviceCheckTakeOutExcel(us,wkshopcode,eqpcode,eqpname,stanedname,checkuser,checkopendate,checkclosedate);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[璁惧淇濆吇璁板綍鏌ヨ]
+ /// <summary>
+ /// 璁惧淇濆吇璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="eqpname">璁惧鍚嶇О</param>
+ /// <param name="stanedname">淇濆吇鏍囧噯鍚嶇О</param>
+ /// <param name="repairuser">淇濆吇浜哄憳</param>
+ /// <param name="repairdate">淇濆吇鏃堕棿</param>
+ /// <param name="repairresult">淇濆吇缁撴灉</param>
+ /// <returns></returns>
+ public JsonResult DeviceRepairTakeSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null,string eqpname=null, string stanedname = null, string repairuser = null, string repairdate = null, string repairresult = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string repairopendate = ""; //鐐规寮�濮嬫椂闂�
+ string repairclosedate = ""; //鐐规缁撴潫鏃堕棿
+ if (repairdate != "" && repairdate != null)
+ {
+ repairopendate = repairdate.Split('~')[0].ToString();
+ repairclosedate = repairdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceRepairTakeSearch(us, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇璁板綍鏄庣粏鏌ヨ]
+ /// <summary>
+ /// 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ /// </summary>
+ /// <param name="bywo">璁惧淇濆吇鍗曞彿</param>
+ /// <returns></returns>
+ [Route(template: "DeviceRepairSubTakeSearch")]
+ [HttpGet]
+ public JsonResult DeviceRepairSubTakeSearch(string bywo)
+ {
+ mes = DeviceManagerBLL.DeviceRepairSubTakeSearch(bywo);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧淇濆吇璁板綍瀵煎嚭]
+ /// <summary>
+ /// 璁惧淇濆吇璁板綍瀵煎嚭
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栧彿</param>
+ /// <param name="eqpname">璁惧鍚嶇О</param>
+ /// <param name="stanedname">鏍囧噯鍚嶇О</param>
+ /// <param name="repairuser">淇濆吇浜哄憳</param>
+ /// <param name="repairdate">淇濆吇鏃堕棿</param>
+ /// <param name="repairresult">淇濆吇缁撴灉</param>
+ /// <returns></returns>
+ [Route(template: "DeviceRepairTakeOutExcel")]
+ [HttpGet]
+ public JsonResult DeviceRepairTakeOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string stanedname = null, string repairuser = null, string repairdate = null, string repairresult = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string repairopendate = ""; //鐐规寮�濮嬫椂闂�
+ string repairclosedate = ""; //鐐规缁撴潫鏃堕棿
+ if (repairdate != "" && repairdate != null)
+ {
+ repairopendate = repairdate.Split('~')[0].ToString();
+ repairclosedate = repairdate.Split('~')[1].ToString();
+ }
+ mes = DeviceManagerBLL.DeviceRepairTakeOutExcel(us, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[璁惧缁翠慨璁板綍鏌ヨ]
+ /// <summary>
+ /// 璁惧缁翠慨璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="eqpname">璁惧鍚嶇О</param>
+ /// <param name="reportuser">鎶ヤ慨浜哄憳</param>
+ /// <param name="repairuser">缁翠慨浜哄憳</param>
+ /// <param name="vrifcatuser">楠岃瘉浜哄憳</param>
+ /// <param name="reportdate">鎶ヤ慨鏃堕棿</param>
+ /// <param name="repairdate">缁翠慨鏃堕棿</param>
+ /// <param name="vrifcatdate">楠岃瘉鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "DeviceUpdateSearch")]
+ [HttpGet]
+ public JsonResult DeviceUpdateSearch(int page, int rows, string prop, string order, string wkshopcode = null, string eqpcode = null, string eqpname = null, string reportuser = null, string repairuser = null, string vrifcatuser = null, string reportdate = null, string repairdate = null, string vrifcatdate = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string reportopendate = ""; //鎶ヤ慨寮�濮嬫椂闂�
+ string reportclosedate = ""; //鎶ヤ慨缁撴潫鏃堕棿
+ string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
+ string repairclosedate = ""; //缁翠慨缁撴潫鏃堕棿
+ string vrifcatopendate = ""; //缁翠慨楠岃瘉寮�濮嬫椂闂�
+ string vrifcatclosedate = ""; //缁翠慨楠岃瘉缁撴潫鏃堕棿
+ if (reportdate != "" && reportdate != null)
+ {
+ reportopendate = reportdate.Split('~')[0].ToString();
+ reportclosedate = reportdate.Split('~')[1].ToString();
+ }
+ if (repairdate != "" && repairdate != null)
+ {
+ repairopendate = repairdate.Split('~')[0].ToString();
+ repairclosedate = repairdate.Split('~')[1].ToString();
+ }
+ if (vrifcatdate != "" && vrifcatdate != null)
+ {
+ vrifcatopendate = vrifcatdate.Split('~')[0].ToString();
+ vrifcatclosedate = vrifcatdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = DeviceManagerBLL.DeviceUpdateSearch(us, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧缁翠慨璁板綍鏄庣粏鏌ヨ]
+ /// <summary>
+ /// 璁惧缁翠慨璁板綍鏄庣粏鏌ヨ
+ /// </summary>
+ /// <param name="repair_code">璁惧缁翠慨鍗曞彿</param>
+ /// <returns></returns>
+ [Route(template: "DeviceUpdateSubSearch")]
+ [HttpGet]
+ public JsonResult DeviceUpdateSubSearch(string repair_code)
+ {
+ mes = DeviceManagerBLL.DeviceUpdateSubSearch(repair_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁惧缁翠慨璁板綍瀵煎嚭]
+ /// <summary>
+ /// 璁惧缁翠慨璁板綍瀵煎嚭
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <param name="eqpname">璁惧鍚嶇О</param>
+ /// <param name="reportuser">鎶ヤ慨浜哄憳</param>
+ /// <param name="repairuser">缁翠慨浜哄憳</param>
+ /// <param name="vrifcatuser">楠岃瘉浜哄憳</param>
+ /// <param name="reportdate">鎶ヤ慨鏃堕棿</param>
+ /// <param name="repairdate">缁翠慨鏃堕棿</param>
+ /// <param name="vrifcatdate">楠岃瘉鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "DeviceUpdateOutExcel")]
+ [HttpGet]
+ public JsonResult DeviceUpdateOutExcel(string wkshopcode = null, string eqpcode = null, string eqpname = null, string reportuser = null, string repairuser = null, string vrifcatuser = null, string reportdate = null, string repairdate = null, string vrifcatdate = null)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string reportopendate = ""; //鎶ヤ慨寮�濮嬫椂闂�
+ string reportclosedate = ""; //鎶ヤ慨缁撴潫鏃堕棿
+ string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
+ string repairclosedate = ""; //缁翠慨缁撴潫鏃堕棿
+ string vrifcatopendate = ""; //缁翠慨楠岃瘉寮�濮嬫椂闂�
+ string vrifcatclosedate = ""; //缁翠慨楠岃瘉缁撴潫鏃堕棿
+ if (reportdate != "" && reportdate != null)
+ {
+ reportopendate = reportdate.Split('~')[0].ToString();
+ reportclosedate = reportdate.Split('~')[1].ToString();
+ }
+ if (repairdate != "" && repairdate != null)
+ {
+ repairopendate = repairdate.Split('~')[0].ToString();
+ repairclosedate = repairdate.Split('~')[1].ToString();
+ }
+ if (vrifcatdate != "" && vrifcatdate != null)
+ {
+ vrifcatopendate = vrifcatdate.Split('~')[0].ToString();
+ vrifcatclosedate = vrifcatdate.Split('~')[1].ToString();
+ }
+ mes = DeviceManagerBLL.DeviceUpdateOutExcel(us, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3