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

陈勇

2026-03-30 7154cc02c0fa9ef6786a19da0281bf6982fa61bd

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

@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common;
@@ -18,7 +19,7 @@
namespace WIDESEA_StoragIntegrationServices
{
    /// <summary>
    /// è½¦èº«ç»‘定工单(焊装直通涂装)
    /// è½¦èº«ç»‘定工单  ç„Š-涂、涂-总工单绑定
    /// </summary>
    public partial class MESService
    {
@@ -27,7 +28,6 @@
            WebResponseContent content = new WebResponseContent();
            try
            {

                var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_MESIPAddress);
                var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MESIPAddress)?.ConfigValue;
                var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.bindWorkOrder)?.ConfigValue;
@@ -39,23 +39,23 @@

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

                var carBodyInfo = _carBodyRepository.QueryFirst(x => x.PVI == rfid);
                var carBodyInfo = _carBodyRepository.QueryFirst(x => x.RFID == rfid);

                if (carBodyInfo == null) throw new Exception($"未找到PVI{rfid}的车身数据");

                BindWorkOrder passPoint = new BindWorkOrder()
                BindWorkOrder bindOrder = new BindWorkOrder()
                {
                    unionKey = Guid.NewGuid().ToString(),
                    stationCode = "",
                    messageTime = DateTime.Now.ToString(),
                    plantCode = "1052",
                    pvi = rfid,
                    workOrderNo = carBodyInfo.workOrderNo,
                    workOrderType = carBodyInfo.workOrderType,
                    workshopCode = ""
                    pvi = carBodyInfo.PVI,
                    workOrderNo = stationNo == "EL01RB" ? carBodyInfo.workOrderNo : carBodyInfo.plantingWorkNo,
                    workOrderType = stationNo == "EL01RB" ? "0" : "1",   //carBodyInfo.workOrderType,
                    workshopCode = stationNo == "EL01RB" ? "HZ" : "TZ",
                };

                var MESrespon = HttpHelper.PostAsync(wmsIpAddress, passPoint.ToJson(), contentType, headers).Result;
                var MESrespon = HttpHelper.PostAsync(wmsIpAddress, bindOrder.ToJson(), contentType, headers).Result;

                Console.WriteLine(MESrespon);
                WebResponseContent webResponse = JsonConvert.DeserializeObject<WebResponseContent>(MESrespon.ToString());
@@ -65,21 +65,40 @@
                }

                BindWorkOrderRespon characterRespon = JsonConvert.DeserializeObject<BindWorkOrderRespon>(webResponse.Data.ToJson());
                var paintingOrderInfo = _paintingOrderInfoRepository.QueryFirst(x => x.workOrderNo == characterRespon.workOrderNo);

                if (paintingOrderInfo == null) throw new Exception($"绑定失败:未找到涂装工单信息{characterRespon.workOrderNo}");
                _unitOfWorkManage.BeginTran();
                if (stationInfo.stationChildCode == "EL01RB")  //焊装-涂装提升机
                {
                    var paintingOrderInfo = _paintingOrderInfoRepository.QueryFirst(x => x.workOrderNo == characterRespon.workOrderNo);

                paintingOrderInfo.pvi = characterRespon.pvi;
                _paintingOrderInfoRepository.UpdateData(paintingOrderInfo);
                    if (paintingOrderInfo == null) throw new Exception($"绑定失败:未找到涂装工单信息{characterRespon.workOrderNo}");
                    paintingOrderInfo.pvi = characterRespon.pvi;
                    _paintingOrderInfoRepository.UpdateData(paintingOrderInfo);
                    carBodyInfo.pbMaterial = paintingOrderInfo.pbMaterial;
                    carBodyInfo.plantingWorkNo = paintingOrderInfo.workOrderNo;
                    carBodyInfo.carBodyCharacteristic = paintingOrderInfo.carBodyCharacteristic;
                    _carBodyRepository.UpdateData(carBodyInfo);
                }
                else if (stationInfo.stationChildCode == "EL01RB01")  //涂装精排点
                {
                    var assemblyOrderInfo = _assemblyOrderInfoRepository.QueryFirst(x => x.workOrderNo == characterRespon.workOrderNo);

                    if (assemblyOrderInfo == null) throw new Exception($"绑定失败:未找到总装工单信息{characterRespon.workOrderNo}");
                    assemblyOrderInfo.pvi = characterRespon.pvi;
                    _assemblyOrderInfoRepository.UpdateData(assemblyOrderInfo);
                    carBodyInfo.assemblyWorrkNo = characterRespon.workOrderNo;
                    _carBodyRepository.UpdateData(carBodyInfo);
                }

                LogFactory.GetLog("BDC请求绑定工单信息").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("BDC请求绑定工单信息").Info(true, $"工位号:{stationNo},RFID:{rfid}");
                LogFactory.GetLog("BDC请求绑定工单信息").Info(true, $"工位号:{stationNo},RFID:{rfid},响应信息：{webResponse.ToJson()}");

                _unitOfWorkManage.CommitTran();
                return content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                LogFactory.GetLog("BDC请求绑定工单信息").Info(true, $"绑定失败：{ex.Message}");
                return content.Error(ex.Message);
            }