同步

刘磊

2026-01-15 c1dbe3bb1724236f4c283cf5315e555df2026c6d

同步

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_Common/MES/pullLockInfo.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace WIDESEA_Common.MES
{
    /// <summary>
    /// MES发起拉动锁车请求
    /// </summary>
    public class pullLockInfo
    {
        /// <summary>
        /// å”¯ä¸€æ ‡è¯†
        /// </summary>
        public string unionKey { get; set; }

        /// <summary>
        /// å·¥åŽ‚
        /// </summary>
        public string plantCode { get; set; }

        /// <summary>
        /// é”è½¦è½¦èº«ä¿¡æ¯
        /// </summary>
        public List<LockInfo> data { get; set; }
    }

    public class LockInfo
    {
        /// <summary>
        /// æ€»è£…工单号 
        /// </summary>
        public string workOrderNo { get; set; }

        /// <summary>
        /// å·¥å•ç±»åž‹ 
        /// </summary>
        public string workOrderType { get; set; }

        /// <summary>
        /// å½©è½¦èº«ç‰©æ–™å·
        /// </summary>
        public string pbMaterial { get; set; }

        /// <summary>
        /// PVI号(车身上)
        /// </summary>
        public string pvi { get; set; }

        /// <summary>
        /// åŒæ­¥æ—¶é—´
        /// </summary>
        public DateTime messageTime { get; set; }
    }


}

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs

@@ -29,6 +29,11 @@

        public string DevMessage { get; set; }

        /// <summary>
        /// é”è½¦PVI
        /// </summary>
        public string lockpvi { get; set; }

        public WebResponseContent OK()
        {
            Code = 1;

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/MES/IMESService.cs

@@ -52,6 +52,22 @@
        /// <param name="rfidPrint">RFID</param>
        /// <param name="stationNo">站台请求点位</param>
        /// <returns></returns>
        WebResponseContent getCharacteristic(string rfidPrint, string stationNo);
        WebResponseContent getCharacteristic(string stationNo, string rfidPrint);

        /// <summary>
        /// å·¥å•/订单排撤
        /// </summary>
        /// <param name="jsonData"></param>
        /// <returns></returns>
        WebResponseContent removeWorkOrderInfo(object jsonData);

        /// <summary>
        /// MES拉动锁车
        /// </summary>
        /// <param name="jsondata"></param>
        /// <returns></returns>
        WebResponseContent pullLock(object jsondata);

        WebResponseContent syncOrderFeature(object json);
    }
}

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBody.cs

@@ -54,6 +54,14 @@
        public string BodyStatus { get; set; }

        /// <summary>
        /// ç„Šè£…入口过点时间
        /// </summary>
        [ImporterHeader(Name = "焊装入口过点时间")]
        [ExporterHeader(DisplayName = "焊装入口过点时间")]
        [SugarColumn(IsNullable = true, Length = 40, ColumnDescription = "焊装入口过点时间")]
        public string biwInPassTime { get; set; }

        /// <summary>
        /// æè¿°
        /// </summary>
        [ImporterHeader(Name = "描述")]

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs

@@ -20,7 +20,7 @@
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddress = wmsBase + ipAddress;
                var wmsIpAddress = wmsBase + ipAddress; 

                var stationInfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == stationCode);


 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs

@@ -21,7 +21,7 @@
    {
        public WebResponseContent bindWorkOrder(string stationNo, string rfid)
        {
            WebResponseContent content = new WebResponseContent();
            WebResponseContent content = new WebResponseContent();  
            try
            {
                var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_MESIPAddress);

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/getCharacteristic.cs

@@ -28,7 +28,7 @@
        /// <param name="rfidPrint">RFID</param>
        /// <param name="stationNo">站台请求点位</param>
        /// <returns></returns>
        public WebResponseContent getCharacteristic(string rfidPrint, string stationNo)
        public WebResponseContent getCharacteristic(string stationNo, string rfidPrint)
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -37,7 +37,7 @@
                {
                    plantCode = "1052",
                    rfidPrint = rfidPrint,
                    vin = vin,
                    vin = "",
                    messageTime = DateTime.Now.ToString(),
                    unionKey = Guid.NewGuid().ToString(),
                };

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs

@@ -21,7 +21,6 @@
    /// </summary>
    public partial class MESService
    {
       
        public WebResponseContent issuedCharacter(string rfidPrint, string vin, string stationNo)
        {
            WebResponseContent content = new WebResponseContent();

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/preBind.cs

@@ -15,7 +15,6 @@

namespace WIDESEA_StoragIntegrationServices
{
  
    public partial class MESService
    {
        public WebResponseContent prebind(object json)

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
using AngleSharp.Common;
using Masuit.Tools;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common;
using WIDESEA_Common.MES;
using WIDESEA_Common.MES.Request;
using WIDESEA_Core;
using WIDESEA_Core.Const;
using WIDESEA_Core.Helper;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Model.Models;

namespace WIDESEA_StoragIntegrationServices
{
    /// <summary>
    /// è½¦èº«ç»‘定工单(焊装直通涂装)
    /// </summary>
    public partial class MESService
    {
        public WebResponseContent pullLock(object jsondata)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                if (string.IsNullOrEmpty(jsondata.ToString())) throw new Exception("请求参数为空");

                var result = JsonConvert.DeserializeObject<pullLockInfo>(jsondata.ToString());

                foreach (var item in result.data)
                {
                    var carInfo = _palletStockInfoRepository.QueryFirst(x => x.PVI == item.pvi);
                    if (carInfo == null)
                    {
                        throw new Exception("未知车身");
                    }

                    content.lockpvi = carInfo.PVI;
                }

                LogFactory.GetLog("MES拉动锁车").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("MES拉动锁车").Info(true, jsondata.ToJsonString());

                return content;
            }
            catch (Exception ex)
            {
                return content.Error(ex.Message);
            }
        }
    }
}

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs

@@ -18,7 +18,6 @@

namespace WIDESEA_StoragIntegrationServices
{
   
    public partial class MESService
    {
        public WebResponseContent pushOrderInfo(object json)

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs

@@ -22,7 +22,6 @@
{
    public partial class MESService
    {
        
        public WebResponseContent pushWorkOrderInfo(object json)
        {
            WebResponseContent content = new WebResponseContent();

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs

@@ -17,7 +17,7 @@
    /// </summary>
    public partial class MESService
    {
        public WebResponseContent removeWorkOrderInfo(string jsonData)
        public WebResponseContent removeWorkOrderInfo(object jsonData)
        {
            WebResponseContent content = new WebResponseContent();
            try

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/syncOrderFeature.cs

@@ -26,6 +26,7 @@

                //todo  ä¿®æ”¹å¯¹åº”数据


                return content;
            }
            catch (Exception ex)

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

@@ -26,7 +26,7 @@
    /// <param name="stationCode"></param>
    /// <returns></returns>
    [HttpPost, Route("PassPoint"), AllowAnonymous]
    public WebResponseContent PassPoint(string stationCode,string rfid)
    public WebResponseContent PassPoint(string stationCode, string rfid)
    {
        return _MESService.PassPoint(stationCode, rfid);
    }
@@ -43,6 +43,17 @@
    }

    /// <summary>
    /// æ¶‚装工单
    /// </summary>
    /// <param name="json"></param>
    /// <returns></returns>
    [HttpPost, Route("pushWorkOrderInfo"), AllowAnonymous]
    public WebResponseContent pushWorkOrderInfo([FromBody] object json)
    {
        return _MESService.pushWorkOrderInfo(json);
    }

    /// <summary>
    /// æ€»è£…工单
    /// </summary>
    /// <param name="json"></param>
@@ -51,6 +62,17 @@
    public WebResponseContent pushOrderInfo([FromBody] object json)
    {
        return _MESService.pushOrderInfo(json);
    }

    /// <summary>
    /// å·¥å•æŽ’æ’¤
    /// </summary>
    /// <param name="json"></param>
    /// <returns></returns>
    [HttpPost, Route("removeWorkOrderInfo"), AllowAnonymous]
    public WebResponseContent removeWorkOrderInfo([FromBody] object json)
    {
        return _MESService.removeWorkOrderInfo(json);
    }

    /// <summary>
@@ -65,13 +87,46 @@
    }

    /// <summary>
    /// è½¦èº«è¿‡ç‚¹
    /// BDC请求车身特征
    /// </summary>
    /// <param name="json"></param>
    /// <returns></returns>
    [HttpPost, Route("getCharacteristic"), AllowAnonymous]
    public WebResponseContent getCharacteristic([FromBody] string station, string rfid)
    {
        return _MESService.getCharacteristic(station, rfid);
    }

    /// <summary>
    /// MES拉动锁车
    /// </summary>
    /// <param name="stationCode"></param>
    /// <returns></returns>
    [HttpPost, Route("PassPoint"), AllowAnonymous]
    public WebResponseContent PassPoint(string stationCode, string rfid)
    [HttpPost, Route("pullLock"), AllowAnonymous]
    public WebResponseContent pullLock([FromBody] object json)
    {
        return _MESService.(stationCode, rfid);
        return _MESService.pullLock(json);
    }

    /// <summary>
    /// MES同步订单特征
    /// </summary>
    /// <param name="stationCode"></param>
    /// <returns></returns>
    [HttpPost, Route("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)
    {
        return _MESService.bindWorkOrder(station, rfid);
    }
}