فهرست منبع

Mes 左右优化

Eson 2 هفته پیش
والد
کامیت
68abecdcdb
1فایلهای تغییر یافته به همراه37 افزوده شده و 21 حذف شده
  1. 37 21
      LocalhostMES/Api/Controllers/MesController.cs

+ 37 - 21
LocalhostMES/Api/Controllers/MesController.cs

@@ -329,17 +329,7 @@ namespace LocalhostMES.Api.Controllers
             {
 
                 LogHelper.WriteLogInfo($"收到请求: 接收SN和关键件");
-                var res= DatabaseHelper.SelectWorkOrderInfo();        
-                var workOrder = DatabaseHelper.SelectWorkOrderInfo(res.LeftOrderNo);
-                // 验证工单是否存在
-                if ( workOrder.Count == 0 )
-                {
-                    return BadRequest($"工单 {res.LeftOrderNo} 不存在");
-                }
-                if ( workOrder[0].IsLocalhost )
-                {
-                    return Ok(new ApiResponse<bool?>() { data = true });
-                }
+               
                 // 验证请求头
                 if ( !ValidateHeaders() )
                 {
@@ -354,7 +344,26 @@ namespace LocalhostMES.Api.Controllers
                 {
                     return BadRequest("必填字段不能为空");
                 }
-
+                var res = DatabaseHelper.SelectWorkOrderInfo();
+                string stationOrder = "";
+                if (request.stationCode.Split('-')[2] == "L")
+                {
+                    stationOrder = res.LeftOrderNo;
+                }
+                else
+                {
+                    stationOrder = res.RightOrderNo;
+                }
+                var workOrder = DatabaseHelper.SelectWorkOrderInfo(stationOrder);
+                // 验证工单是否存在
+                if (workOrder.Count == 0)
+                {
+                    return BadRequest($"工单 {res.LeftOrderNo} 不存在");
+                }
+                if (workOrder[0].IsLocalhost)
+                {
+                    return Ok(new ApiResponse<bool?>() { data = true });
+                }
                 // 处理关键件绑定
                 if ( request.part != null && request.part.Count > 0 )
                 {
@@ -483,16 +492,8 @@ namespace LocalhostMES.Api.Controllers
             {
                 LogHelper.WriteLogInfo($"收到请求:接收工件加工参数 ");
 
-                var res= DatabaseHelper.SelectWorkOrderInfo();
 
 
-                var workOrder = DatabaseHelper.SelectWorkOrderInfo(res.LeftOrderNo);
-                // 验证工单是否存在
-                if ( workOrder.Count == 0 )
-                {
-                    return BadRequest($"工单 {res.LeftOrderNo} 不存在");
-                }
-
                 // 验证请求头
                 if ( !ValidateHeaders() )
                 {
@@ -513,7 +514,22 @@ namespace LocalhostMES.Api.Controllers
                 {
                     return BadRequest($"无效的总结果: {request.overallResult}");
                 }
-
+                var res = DatabaseHelper.SelectWorkOrderInfo();
+                string stationOrder = "";
+                if (request.station.Split('-')[2] == "L")
+                {
+                    stationOrder = res.LeftOrderNo;
+                }
+                else 
+                {
+                    stationOrder = res.RightOrderNo;
+                }
+                    var workOrder = DatabaseHelper.SelectWorkOrderInfo(stationOrder);
+                // 验证工单是否存在
+                if (workOrder.Count == 0)
+                {
+                    return BadRequest($"工单 {res.LeftOrderNo} 不存在");
+                }
                 // 保存加工记录
                 var processRecord = new ProcessRecord
                 {