From c658c28dab9fb3a028af9647fb358f01956c7c10 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 15 十二月 2023 15:48:46 +0800
Subject: [PATCH] 1.修改模具、设备点检标准、保养标准导入模板 2.修改模具、设备点检标准、保养标准导入数据校验方法
---
VueWebCoreApi/Controllers/MouldManagerController.cs | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index f130a31..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
@@ -1383,5 +1383,70 @@
}
#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