From 7db419acdd2c02950b67c081dd2d7f61fdb2cb89 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 30 三月 2026 16:09:07 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheShenKu
---
项目代码/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs | 80 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 10 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 b860861..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>
@@ -43,14 +44,36 @@
}
/// <summary>
+ /// 娑傝宸ュ崟
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ [HttpPost, Route("painting/pushWorkOrderInfo"), AllowAnonymous]
+ public WebResponseContent pushWorkOrderInfo([FromBody] object json)
+ {
+ return _MESService.pushWorkOrderInfo(json);
+ }
+
+ /// <summary>
/// 鎬昏宸ュ崟
/// </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);
+ }
+
+ /// <summary>
+ /// 宸ュ崟鎺掓挙
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ [HttpPost, Route("painting/removeWorkOrderInfo"), AllowAnonymous]
+ public WebResponseContent removeWorkOrderInfo([FromBody] object json)
+ {
+ return _MESService.removeWorkOrderInfo(json);
}
/// <summary>
@@ -59,19 +82,56 @@
/// <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>
- /// 杞﹁韩杩囩偣
+ /// BDC璇锋眰杞﹁韩鐗瑰緛
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ [HttpPost, Route("getCharacteristic"), AllowAnonymous]
+ public WebResponseContent getCharacteristic([FromBody] RequestTaskDto json)
+ {
+ return _MESService.getCharacteristic(json);
+ }
+
+ static object lockInfo = new object();
+ /// <summary>
+ /// MES鎷夊姩閿佽溅
/// </summary>
/// <param name="stationCode"></param>
/// <returns></returns>
- [HttpPost, Route("PassPoint"), AllowAnonymous]
- public WebResponseContent PassPoint(string stationCode, string rfid)
+ [HttpPost, Route("order/pullLock"), AllowAnonymous]
+ public WebResponseContent pullLock([FromBody] object json)
{
- return _MESService.(stationCode, rfid);
+ lock (lockInfo)
+ {
+ return _MESService.pullLock(json);
+ }
+ }
+
+ /// <summary>
+ /// MES鍚屾璁㈠崟鐗瑰緛
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <returns></returns>
+ [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(string station, string rfid)
+ {
+ return _MESService.bindWorkOrder(station, rfid);
}
}
\ No newline at end of file
--
Gitblit v1.9.3