From 0cc1531f55cfa7927abec8624ddce3db45201ee7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 24 十月 2023 17:24:43 +0800
Subject: [PATCH] 1.班组工资报表功能接口、人员工资明细报表功能接口 2.委外报表功能接口、不良明细报表功能接口、维修明细报表功能接口 3.模具清单查看履历接口、模具上机过滤已上模设备接口 4.模具点检记录报表功能接口、模具保养记录报表功能接口 5.模具维修记录报表功能接口
---
VueWebCoreApi/Controllers/MouldManagerController.cs | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 316 insertions(+), 3 deletions(-)
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index 32bcae9..beb8e42 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -44,10 +44,10 @@
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
- if (createuser != "" && createuser != null)
+ if (createdate != "" && createdate != null)
{
- opendate = createuser.Split('~')[0].ToString();
- closedate = createuser.Split('~')[1].ToString();
+ opendate = createdate.Split('~')[0].ToString();
+ closedate = createdate.Split('~')[1].ToString();
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
@@ -77,6 +77,35 @@
string mouldpart = obj["mouldpart"].ToString(); //鍏宠仈浜у搧
string opertype = obj["opertype"].ToString(); //鎿嶄綔绫诲瀷
mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿娓呭崟鏌ョ湅灞ュ巻]
+ /// <summary>
+ /// 妯″叿娓呭崟鏌ョ湅灞ュ巻
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="createdate">鎿嶄綔鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MoldResumeSearch")]
+ [HttpGet]
+ public JsonResult MoldResumeSearch(string mouldcode, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (createdate != "" && createdate != null)
+ {
+ opendate = createdate.Split('~')[0].ToString();
+ closedate = createdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MoldResumeSearch(mouldcode,opendate, closedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -745,6 +774,20 @@
}
#endregion
+ #region[妯″叿涓婃満,閫夋嫨鏈笂妯¤澶嘳
+ /// <summary>
+ /// 妯″叿涓婃満,閫夋嫨鏈笂妯¤澶�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "MouldEqpPermissions")]
+ [HttpGet]
+ public JsonResult MouldEqpPermissions()
+ {
+ mes = MouldManagerBLL.MouldEqpPermissions();
+ return Json(mes);
+ }
+ #endregion
+
#region[妯″叿涓婃満鎻愪氦]
/// <summary>
/// 妯″叿涓婃満鎻愪氦
@@ -943,5 +986,275 @@
return Json(mes);
}
#endregion
+
+
+ #region[妯″叿鐐规璁板綍鏌ヨ]
+ /// <summary>
+ /// 妯″叿鐐规璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="stanedcode">鐐规鏍囧噯缂栫爜</param>
+ /// <param name="stanedname">鐐规鏍囧噯鍚嶇О</param>
+ /// <param name="checkuser">鐐规浜哄憳</param>
+ /// <param name="checkdate">鐐规鏃堕棿</param>
+ /// <param name="checkrequest">鐐规缁撴灉</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldCheckTakeSearch")]
+ [HttpGet]
+ public JsonResult MouldCheckTakeSearch(int page, int rows, string prop, string order, string mouldcode = null, string mouldname = null, string mouldspec = null, string stanedcode = null,string stanedname=null, string checkuser = null, string checkdate = null,string checkrequest=null)
+ {
+ 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 = MouldManagerBLL.MouldCheckTakeSearch(mouldcode, mouldname, mouldspec, stanedcode, stanedname, checkuser, checkopendate, checkclosedate, checkrequest, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规璁板綍鏄庣粏鏌ヨ]
+ /// <summary>
+ /// 妯″叿鐐规璁板綍鏄庣粏鏌ヨ
+ /// </summary>
+ /// <param name="id">鐐规璁板綍涓籭d</param>
+ /// <returns></returns>
+ [Route(template: "MouldCheckSubTakeSearch")]
+ [HttpGet]
+ public JsonResult MouldCheckSubTakeSearch(string id)
+ {
+ mes = MouldManagerBLL.MouldCheckSubTakeSearch(id);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鐐规璁板綍瀵煎嚭]
+ /// <summary>
+ /// 妯″叿鐐规璁板綍瀵煎嚭
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="stanedcode">鐐规鏍囧噯缂栫爜</param>
+ /// <param name="stanedname">鐐规鏍囧噯鍚嶇О</param>
+ /// <param name="checkuser">鐐规浜哄憳</param>
+ /// <param name="checkdate">鐐规鏃堕棿</param>
+ /// <param name="checkrequest">鐐规缁撴灉</param>
+ /// <returns></returns>
+ [Route(template: "MouldCheckTakeOutExcel")]
+ [HttpGet]
+ public JsonResult MouldCheckTakeOutExcel(string mouldcode = null, string mouldname = null, string mouldspec = null, string stanedcode = null, string stanedname = null, string checkuser = null, string checkdate = null,string checkrequest=null)
+ {
+ string checkopendate = ""; //鐐规寮�濮嬫椂闂�
+ string checkclosedate = ""; //鐐规缁撴潫鏃堕棿
+ if (checkdate != "" && checkdate != null)
+ {
+ checkopendate = checkdate.Split('~')[0].ToString();
+ checkclosedate = checkdate.Split('~')[1].ToString();
+ }
+ mes = MouldManagerBLL.MouldCheckTakeOutExcel(mouldcode, mouldname, mouldspec, stanedcode, stanedname, checkuser, checkopendate, checkclosedate, checkrequest);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿淇濆吇璁板綍鏌ヨ]
+ /// <summary>
+ /// 妯″叿淇濆吇璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="stanedcode">淇濆吇鏍囧噯缂栫爜</param>
+ /// <param name="stanedname">淇濆吇鏍囧噯鍚嶇О</param>
+ /// <param name="repairuser">淇濆吇浜哄憳</param>
+ /// <param name="repairdate">淇濆吇鏃堕棿</param>
+ /// <param name="repairresult">淇濆吇缁撴灉</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldRepairTakeSearch")]
+ [HttpGet]
+ public JsonResult MouldRepairTakeSearch(int page, int rows, string prop, string order, string mouldcode = null, string mouldname = null, string mouldspec = null,string stanedcode=null, string stanedname = null, string repairuser = null, string repairdate = null, string repairresult = null)
+ {
+ 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 = MouldManagerBLL.MouldRepairTakeSearch(mouldcode, mouldname, mouldspec, stanedcode,stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇璁板綍鏄庣粏鏌ヨ]
+ /// <summary>
+ /// 妯″叿淇濆吇璁板綍鏄庣粏鏌ヨ
+ /// </summary>
+ /// <param name="id">淇濆吇璁板綍涓昏〃id</param>
+ /// <returns></returns>
+ [Route(template: "MouldRepairSubTakeSearch")]
+ [HttpGet]
+ public JsonResult MouldRepairSubTakeSearch(string id)
+ {
+ mes = MouldManagerBLL.MouldRepairSubTakeSearch(id);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿淇濆吇璁板綍瀵煎嚭]
+ /// <summary>
+ /// 妯″叿淇濆吇璁板綍瀵煎嚭
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="stanedcode">淇濆吇鏍囧噯缂栫爜</param>
+ /// <param name="stanedname">淇濆吇鏍囧噯鍚嶇О</param>
+ /// <param name="repairuser">淇濆吇浜哄憳</param>
+ /// <param name="repairdate">淇濆吇鏃堕棿</param>
+ /// <param name="repairresult">淇濆吇缁撴灉</param>
+ /// <returns></returns>
+ [Route(template: "MouldRepairTakeOutExcel")]
+ [HttpGet]
+ public JsonResult MouldRepairTakeOutExcel(string mouldcode = null, string mouldname = null, string mouldspec = null, string stanedcode = null, string stanedname = null, string repairuser = null, string repairdate = null, string repairresult = null)
+ {
+ string repairopendate = ""; //鐐规寮�濮嬫椂闂�
+ string repairclosedate = ""; //鐐规缁撴潫鏃堕棿
+ if (repairdate != "" && repairdate != null)
+ {
+ repairopendate = repairdate.Split('~')[0].ToString();
+ repairclosedate = repairdate.Split('~')[1].ToString();
+ }
+ mes = MouldManagerBLL.MouldRepairTakeOutExcel(mouldcode, mouldname, mouldspec, stanedcode, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿缁翠慨璁板綍鏌ヨ]
+ /// <summary>
+ /// 妯″叿缁翠慨璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="reportuser">鎶ヤ慨浜哄憳</param>
+ /// <param name="reportdate">鎶ヤ慨鏃堕棿</param>
+ /// <param name="repairuser">缁翠慨浜哄憳</param>
+ /// <param name="repairdate">缁翠慨鏃堕棿</param>
+ /// <param name="vrifcatuser">楠岃瘉浜哄憳</param>
+ /// <param name="vrifcatdate">楠岃瘉鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldUpdateSearch")]
+ [HttpGet]
+ public JsonResult MouldUpdateSearch(int page, int rows, string prop, string order, string mouldcode = null, string mouldname = null, string mouldspec = null, string reportuser = null, string reportdate = null, string repairuser = null, string repairdate = null, string vrifcatuser = null, string vrifcatdate = null)
+ {
+ 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 = MouldManagerBLL.MouldUpdateSearch(mouldcode, mouldname, mouldspec, 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: "MouldUpdateSubSearch")]
+ [HttpGet]
+ public JsonResult MouldUpdateSubSearch(string repair_code)
+ {
+ mes = MouldManagerBLL.MouldUpdateSubSearch(repair_code);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿缁翠慨璁板綍瀵煎嚭]
+ /// <summary>
+ /// 妯″叿缁翠慨璁板綍瀵煎嚭
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="reportuser">鎶ヤ慨浜哄憳</param>
+ /// <param name="reportdate">鎶ヤ慨鏃堕棿</param>
+ /// <param name="repairuser">缁翠慨浜哄憳</param>
+ /// <param name="repairdate">缁翠慨鏃堕棿</param>
+ /// <param name="vrifcatuser">楠岃瘉浜哄憳</param>
+ /// <param name="vrifcatdate">楠岃瘉鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "MouldUpdateOutExcel")]
+ [HttpGet]
+ public JsonResult MouldUpdateOutExcel(string mouldcode = null, string mouldname = null, string mouldspec = null, string reportuser = null, string reportdate = null, string repairuser = null, string repairdate = null, string vrifcatuser = null, string vrifcatdate = null)
+ {
+ 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 = MouldManagerBLL.MouldUpdateOutExcel(mouldcode, mouldname, mouldspec, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3