From 8fdbaa96f141543fe9f6210975734809a209a0c8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 07 六月 2024 15:03:16 +0800
Subject: [PATCH] 1.报工增加按序和不按序报工操作，工序调整增加按序和不按序报工调整 2.增加SOP管理：设备SOP管理、工艺SOP管理功能
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index fb4b432..632c879 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,16 @@
/// 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
@@ -486,7 +487,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
--
Gitblit v1.9.3