From 10efbcfce9f0f17982f4714e76e8cad24fb8f982 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 十二月 2022 09:25:16 +0800
Subject: [PATCH] SOP文件下拉列表排序
---
VueWebApi/Controllers/ProductionManagementController.cs | 78 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 2cf346d..35a32b9 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -17,7 +17,7 @@
{
[RoutePrefix(prefix: "api/ProductionManagement")]
[ControllerGroup("鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
- //[ChannelActionFilter]
+ [ChannelActionFilter]
public class ProductionManagementController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -262,6 +262,23 @@
public HttpResponseMessage SearchWorkStep(string wo_code)
{
mes = ProductionManagementBLL.SearchWorkStep(wo_code);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟宸ュ簭浠诲姟鏌ョ湅SOP,鑾峰彇SOP鏂囦欢涓嬫媺鍒楄〃]
+ /// <summary>
+ /// MES宸ュ崟宸ュ簭浠诲姟鏌ョ湅SOP,鑾峰彇SOP鏂囦欢涓嬫媺鍒楄〃
+ /// </summary>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "SearchWorkStepSopList")]
+ [HttpGet]
+ public HttpResponseMessage SearchWorkStepSopList(string partcode,string routecode,string stepcode)
+ {
+ mes = ProductionManagementBLL.SearchWorkStepSopList(partcode, routecode, stepcode);
return TJson.toJson(mes);
}
#endregion
@@ -647,7 +664,7 @@
/// <summary>
/// 鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鏌ヨ鎺ュ彛
/// </summary>
- /// <param name="reporttype">鎶ュ伐绫诲瀷</param>
+ /// <param name="verify">瀹℃牳鐘舵��</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
/// <param name="partnumber">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -661,7 +678,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepVerifySearch")]
[HttpGet]
- public HttpResponseMessage MesOrderStepVerifySearch(string reporttype,string wo_code=null,string partnumber=null,string partname=null,string partspec=null,string reportuser=null,string reportdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage MesOrderStepVerifySearch(string verify=null, string wo_code=null,string partnumber=null,string partname=null,string partspec=null,string reportuser=null,string reportdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鏀舵枡寮�濮嬫椂闂�
string reportdateclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -672,7 +689,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.MesOrderStepVerifySearch(reporttype,wo_code,partnumber,partname,partspec,reportuser,reportdateopendate,reportdateclosedate, startNum, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderStepVerifySearch(verify, wo_code,partnumber,partname,partspec,reportuser,reportdateopendate,reportdateclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -681,7 +698,23 @@
/// <summary>
/// 鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鎻愪氦
/// </summary>
- /// <param name="json"></param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepUpdateSeave")]
+ [HttpPost]
+ public HttpResponseMessage MesOrderStepUpdateSeave(List<UpdateProductReport> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MesOrderStepUpdateSeave(username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐瀹℃牳鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇绠＄悊,淇敼鎶ュ伐瀹℃牳鎻愪氦
+ /// </summary>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
/// <returns></returns>
[Route(template: "MesOrderStepVerifySeave")]
[HttpPost]
@@ -693,6 +726,41 @@
}
#endregion
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐鍙嶅鏍告彁浜
+ /// <summary>
+ /// 鐢熶骇绠＄悊,淇敼鎶ュ伐鍙嶅鏍告彁浜�
+ /// </summary>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepNoVerifySeave")]
+ [HttpPost]
+ public HttpResponseMessage MesOrderStepNoVerifySeave(List<UpdateProductReport> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MesOrderStepNoVerifySeave(username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇绠＄悊,鍒犻櫎鎶ュ伐璁板綍]
+ /// <summary>
+ /// 鐢熶骇绠＄悊,鍒犻櫎鎶ュ伐璁板綍
+ /// </summary>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepDeleteSeave")]
+ [HttpPost]
+ public HttpResponseMessage MesOrderStepDeleteSeave(List<UpdateProductReport> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MesOrderStepDeleteSeave(username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+
#region[MES宸ュ崟鎵归噺鍏抽棴鏌ヨ]
/// <summary>
--
Gitblit v1.9.3