From f45293a0c3c9838567d6ff01eae53157a9ed5284 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期四, 05 三月 2026 10:59:38 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 985afa2..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,6 +1,7 @@
锘縰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;
@@ -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>
@@ -81,9 +82,9 @@
/// <param name="json"></param>
/// <returns></returns>
[HttpPost, Route("issuedCharacter"), AllowAnonymous]
- public WebResponseContent issuedCharacter(string rfidPrint, string vin, string station,string palletCode)
+ public WebResponseContent issuedCharacter(string rfidPrint, string station, string palletCode)
{
- return _MESService.issuedCharacter(rfidPrint, vin, station, palletCode);
+ return _MESService.issuedCharacter(rfidPrint, station, palletCode);
}
/// <summary>
@@ -92,11 +93,12 @@
/// <param name="json"></param>
/// <returns></returns>
[HttpPost, Route("getCharacteristic"), AllowAnonymous]
- public WebResponseContent getCharacteristic(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>
@@ -105,7 +107,10 @@
[HttpPost, Route("order/pullLock"), AllowAnonymous]
public WebResponseContent pullLock([FromBody] object json)
{
- return _MESService.pullLock(json);
+ lock (lockInfo)
+ {
+ return _MESService.pullLock(json);
+ }
}
/// <summary>
@@ -120,7 +125,7 @@
}
/// <summary>
- /// 鐩撮�氭秱瑁呯粦瀹氬伐鍗�
+ /// 杞﹁韩缁戝畾宸ュ崟 鐒�-娑傘�佹秱-鎬诲伐鍗曠粦瀹�
/// </summary>
/// <param name="stationCode"></param>
/// <returns></returns>
--
Gitblit v1.9.3