From 4931d20186936f0fa01589630e14f7848917378e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:06:13 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id关联 2.MES工单关闭增加源单id关联 3.增加订单反关闭功能 4.增加工单反关闭功能
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 029e753..dcf03cc 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -124,9 +124,27 @@
[HttpPost]
public JsonResult ClosedErpOrder(string erporderid, string erpordercode)
{
- var token = HttpContext.Request.Headers["Token"].ToString();
+ var token =HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = WorkOrderBLL.ClosedErpOrder(erporderid, erpordercode, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[ERP璁㈠崟鍙嶅叧闂璢
+ /// <summary>
+ /// ERP璁㈠崟鍙嶅叧闂�
+ /// </summary>
+ /// <param name="erporderid">璁㈠崟id</param>
+ /// <param name="erpordercode">璁㈠崟鍙�</param>
+ /// <returns></returns>
+ [Route(template: "ReverseClosedErpOrder")]
+ [HttpPost]
+ public JsonResult ReverseClosedErpOrder(string erporderid, string erpordercode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.ReverseClosedErpOrder(erporderid, erpordercode, us);
return Json(mes);
}
#endregion
@@ -365,6 +383,23 @@
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = WorkOrderBLL.MesOrderBitchClosedSeave(us, wocodelist);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鍙嶅叧闂彁浜
+ /// <summary>
+ /// MES宸ュ崟鍙嶅叧闂彁浜�
+ /// </summary>
+ /// <param name="wocodelist">宸ュ崟鍙锋暟缁�</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderBitchReverseClosedSeave")]
+ [HttpPost]
+ public JsonResult MesOrderBitchReverseClosedSeave([FromBody] string[] wocodelist)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderBitchReverseClosedSeave(us, wocodelist);
return Json(mes);
}
#endregion
@@ -670,6 +705,7 @@
/// <summary>
/// 鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛
/// </summary>
+ /// <param name="reviewstatus">瀹℃牳鐘舵��</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
/// <param name="partnumber">浜у搧缂栫爜</param>
@@ -685,7 +721,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepReportVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepReportVerifySearch(string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepReportVerifySearch(string reviewstatus=null, string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -696,7 +732,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepReportVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -717,5 +753,23 @@
return Json(mes);
}
#endregion
+
+ #region[鐢熶骇鎵ц,鎶ュ伐寮冨鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐寮冨鏁版嵁鎻愪氦
+ /// </summary>
+ /// <param name="id">鎶ュ伐璁板綍id</param>
+ /// <param name="steptype">宸ュ簭绫诲瀷</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepReportNotVerifySeave")]
+ [HttpPost]
+ public JsonResult MesOrderStepReportNotVerifySeave(string id,string steptype)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderStepReportNotVerifySeave(us, id, steptype);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3