From 7be83034022d9f3b12b198a3ed820bdd7e0900ad Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 25 十二月 2023 18:33:41 +0800
Subject: [PATCH] 模具清单查看履历接口修改

---
 VueWebCoreApi/Controllers/MouldManagerController.cs |  517 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 511 insertions(+), 6 deletions(-)

diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index 32bcae9..4a637b7 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
@@ -632,7 +661,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
@@ -741,6 +770,20 @@
         public JsonResult MouldUpQrCodeData(string mouldcode)
         {
             mes = MouldManagerBLL.MouldUpQrCodeData(mouldcode);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[妯″叿涓婃満,閫夋嫨鏈笂妯¤澶嘳
+        /// <summary>
+        /// 妯″叿涓婃満,閫夋嫨鏈笂妯¤澶�
+        /// </summary>
+        /// <returns></returns>
+        [Route(template: "MouldEqpPermissions")]
+        [HttpGet]
+        public JsonResult MouldEqpPermissions()
+        {
+            mes = MouldManagerBLL.MouldEqpPermissions();
             return Json(mes);
         }
         #endregion
@@ -902,8 +945,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
@@ -938,10 +982,471 @@
             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
+
+
+        #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
+
+
+        #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