From 5b84275a7ce63b83c778c5ac050b8c039cd4fac8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 八月 2024 17:46:25 +0800
Subject: [PATCH] 1.修改接口：UpdateMesOrderStepSearch --工单派发 2.修改接口：MesOrderNewStepContent --工单派发 3.修改接口：RouteSelectStep--工单派发 4.新增组织架构类型接口：TOrganTypeDate 5.新增组织架构车间接口：TorgWkshop 6.新增车间查找设备接口：WkshopEqpPermissions 7.新增往来单位基础资料接口：CustomerTypePermissions 8.新增往来单位类型查找往来单位资料接口：CustomerTypeSearchPermissions 9.新增工序关联工作站接口 10.修改工序工价提交接口(增加了设备)
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index fb4b432..add5868 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -19,7 +19,7 @@
[ApiExplorerSettings(GroupName = "宸ュ崟绠＄悊")]
[ApiController]
[Route("api/[controller]")]
- [ChannelActionFilter]
+ //[ChannelActionFilter]
public class WorkOrderController : Controller
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -291,15 +291,51 @@
/// MES宸ュ崟鏌ユ壘鍘嗗彶寮曠敤鏈�鏂板伐搴忎俊鎭�
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <returns></returns>
[Route(template: "MesOrderNewStepContent")]
[HttpPost]
- public JsonResult MesOrderNewStepContent(string wkshopcode, string partcode)
+ public JsonResult MesOrderNewStepContent(string wkshopcode,string routecode, string partcode)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- mes = WorkOrderBLL.MesOrderNewStepContent(wkshopcode, partcode, us);
+ mes = WorkOrderBLL.MesOrderNewStepContent(wkshopcode, routecode, partcode, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鏌ョ湅宸ュ崟SOP]
+ /// <summary>
+ /// MES宸ュ崟鏌ョ湅宸ュ崟SOP
+ /// </summary>
+ /// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="materielcode">浜у搧缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderSopSearch")]
+ [HttpGet]
+ public JsonResult MesOrderSopSearch(string wocode, string materielcode)
+ {
+ mes = WorkOrderBLL.MesOrderSopSearch(wocode, materielcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鏌ョ湅宸ヨ壓SOP]
+ /// <summary>
+ /// MES宸ュ崟鏌ョ湅宸ヨ壓SOP
+ /// </summary>
+ /// <param name="materielcode">浜у搧缂栫爜</param>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderProcessSopSearch")]
+ [HttpGet]
+ public JsonResult MesOrderProcessSopSearch(string materielcode,string routecode,string stepcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderProcessSopSearch(materielcode, routecode, stepcode,us);
return Json(mes);
}
#endregion
@@ -486,7 +522,9 @@
[HttpGet]
public JsonResult MesOrderStepStart(string OperType,string SelectType, string wocode, string stepcode )
{
- mes = WorkOrderBLL.MesOrderStepStart(OperType,SelectType, wocode, stepcode);
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderStepStart(OperType,SelectType, wocode, stepcode, us);
return Json(mes);
}
#endregion
@@ -722,5 +760,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