From b7041949338728f4f8b7cc96f4ed6a92b40fda36 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 05 一月 2024 12:30:56 +0800
Subject: [PATCH] 1.Startup.cs 文件中增加授权.apk文件 2.Excel下载方法中增加.net core直接下载wwwroot下的文件代码(暂时不用，先注释掉)

---
 VueWebCoreApi/Controllers/MouldManagerController.cs |  198 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 195 insertions(+), 3 deletions(-)

diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index beb8e42..4a637b7 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -661,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
@@ -945,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
@@ -981,8 +982,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 +1258,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