From fc9cba5f058089887aa7061d2e6b4006b9e04a9a Mon Sep 17 00:00:00 2001
From: 陈勇 <竞男@ASUNA>
Date: 星期二, 10 三月 2026 09:46:43 +0800
Subject: [PATCH] 同步

---
 项目代码/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs"
index 07fa43e..8ec9151 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs"
@@ -1,13 +1,14 @@
 锘縰sing AutoMapper.Configuration.Annotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
 using WIDESEA_Core.BaseController;
 using WIDESEA_DTO;
 using WIDESEA_IStoragIntegrationServices;
 
 namespace WIDESEA_WMSServer.Controllers;
 
-[Route("api/BDC")]
+[Route("bdc")]
 [ApiController]
 public class MESController : Controller
 {
@@ -26,9 +27,9 @@
     /// <param name="stationCode"></param>
     /// <returns></returns>
     [HttpPost, Route("PassPoint"), AllowAnonymous]
-    public WebResponseContent PassPoint(string stationCode, string rfid)
+    public WebResponseContent PassPoint([FromBody] RequestTaskDto json)
     {
-        return _MESService.PassPoint(stationCode, rfid);
+        return _MESService.PassPoint(json);
     }
 
     /// <summary>
@@ -47,7 +48,7 @@
     /// </summary>
     /// <param name="json"></param>
     /// <returns></returns>
-    [HttpPost, Route("pushWorkOrderInfo"), AllowAnonymous]
+    [HttpPost, Route("painting/pushWorkOrderInfo"), AllowAnonymous]
     public WebResponseContent pushWorkOrderInfo([FromBody] object json)
     {
         return _MESService.pushWorkOrderInfo(json);
@@ -58,7 +59,7 @@
     /// </summary>
     /// <param name="json"></param>
     /// <returns></returns>
-    [HttpPost, Route("pushOrderInfo"), AllowAnonymous]
+    [HttpPost, Route("order/pushOrderInfo"), AllowAnonymous]
     public WebResponseContent pushOrderInfo([FromBody] object json)
     {
         return _MESService.pushOrderInfo(json);
@@ -69,7 +70,7 @@
     /// </summary>
     /// <param name="json"></param>
     /// <returns></returns>
-    [HttpPost, Route("removeWorkOrderInfo"), AllowAnonymous]
+    [HttpPost, Route("painting/removeWorkOrderInfo"), AllowAnonymous]
     public WebResponseContent removeWorkOrderInfo([FromBody] object json)
     {
         return _MESService.removeWorkOrderInfo(json);
@@ -81,9 +82,9 @@
     /// <param name="json"></param>
     /// <returns></returns>
     [HttpPost, Route("issuedCharacter"), AllowAnonymous]
-    public WebResponseContent issuedCharacter([FromBody] string carCode, string vin, string station)
+    public WebResponseContent issuedCharacter(string rfidPrint, string station, string palletCode)
     {
-        return _MESService.issuedCharacter(carCode, vin, station);
+        return _MESService.issuedCharacter(rfidPrint, station, palletCode);
     }
 
     /// <summary>
@@ -92,20 +93,24 @@
     /// <param name="json"></param>
     /// <returns></returns>
     [HttpPost, Route("getCharacteristic"), AllowAnonymous]
-    public WebResponseContent getCharacteristic([FromBody] string station, string rfid)
+    public WebResponseContent getCharacteristic([FromBody] RequestTaskDto json)
     {
-        return _MESService.getCharacteristic(station, rfid);
+        return _MESService.getCharacteristic(json);
     }
 
+    static object lockInfo = new object();
     /// <summary>
     /// MES鎷夊姩閿佽溅
     /// </summary>
     /// <param name="stationCode"></param>
     /// <returns></returns>
-    [HttpPost, Route("pullLock"), AllowAnonymous]
+    [HttpPost, Route("order/pullLock"), AllowAnonymous]
     public WebResponseContent pullLock([FromBody] object json)
     {
-        return _MESService.pullLock(json);
+        lock (lockInfo)
+        {
+            return _MESService.pullLock(json);
+        }
     }
 
     /// <summary>
@@ -113,19 +118,19 @@
     /// </summary>
     /// <param name="stationCode"></param>
     /// <returns></returns>
-    [HttpPost, Route("syncOrderFeature"), AllowAnonymous]
+    [HttpPost, Route("order/syncOrderFeature"), AllowAnonymous]
     public WebResponseContent syncOrderFeature([FromBody] object json)
     {
         return _MESService.syncOrderFeature(json);
     }
 
     /// <summary>
-    /// 鐩撮�氭秱瑁呯粦瀹氬伐鍗�
+    ///  杞﹁韩缁戝畾宸ュ崟  鐒�-娑傘�佹秱-鎬诲伐鍗曠粦瀹�
     /// </summary>
     /// <param name="stationCode"></param>
     /// <returns></returns>
     [HttpPost, Route("bindWorkOrder"), AllowAnonymous]
-    public WebResponseContent bindWorkOrder([FromBody] string station, string rfid)
+    public WebResponseContent bindWorkOrder(string station, string rfid)
     {
         return _MESService.bindWorkOrder(station, rfid);
     }

--
Gitblit v1.9.3