Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheSh...

huangxiaoqiang

2026-03-30 7db419acdd2c02950b67c081dd2d7f61fdb2cb89

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_WMSServer/Controllers/MES/MESController.cs

@@ -1,13 +1,14 @@
using 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);
    }
}