From d18108f27becf45f8f6cfb37eac8c63694d23661 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 17 十一月 2022 10:13:54 +0800
Subject: [PATCH] 修改报工接口备注
---
VueWebApi/Controllers/ProductionManagementController.cs | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 3 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index b851546..9b89ccc 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -209,11 +209,9 @@
string planstartdate = obj["planstartdate"].ToString(); //璁″垝寮�濮嬫椂闂�
string planenddate = obj["planenddate"].ToString(); //璁″垝瀹屾垚鏃堕棿
string orderlev = obj["orderlev"].ToString(); //宸ュ崟绛夌骇
- string is_aps = obj["is_aps"].ToString(); //鏄惁鎺掍骇
- string bom_id = obj["bom_id"].ToString(); //Bom涓籭d
string opertype = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype, is_aps);
+ mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype);
return TJson.toJson(mes);
}
#endregion
@@ -645,6 +643,108 @@
#endregion
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鏌ヨ鎺ュ彛]
+ /// <summary>
+ /// 鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鏌ヨ鎺ュ彛
+ /// </summary>
+ /// <param name="reporttype">鎶ュ伐绫诲瀷</param>
+ /// <param name="wo_code">宸ュ崟缂栧彿</param>
+ /// <param name="partnumber">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="reportuser">鎶ュ伐浜哄憳</param>
+ /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <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)
+ {
+ string reportdateopendate = ""; //鏀舵枡寮�濮嬫椂闂�
+ string reportdateclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
+ if (reportdate != "" && reportdate != null)
+ {
+ reportdateopendate = reportdate.Split('~')[0].ToString();
+ reportdateclosedate = reportdate.Split('~')[1].ToString();
+ }
+ 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);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇绠＄悊,淇敼鎶ュ伐鏁版嵁鎻愪氦
+ /// </summary>
+ /// <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]
+ public HttpResponseMessage MesOrderStepVerifySeave(List<UpdateProductReport> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MesOrderStepVerifySeave(username, json);
+ return TJson.toJson(mes);
+ }
+ #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>
/// MES宸ュ崟鏌ヨ
--
Gitblit v1.9.3