Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

刘磊

2025-01-08 1d044540ee1b7041c7e89bdfe6d1339c99e80a4e

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/AgingInOrOutInput/AgingInOrOutInputService.cs

@@ -1,7 +1,12 @@
using LogLibrary.Log;
using Masuit.Tools;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Const;
using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_IServices;
using WIDESEA_IStorageBasicService;
using WIDESEA_IStoragIntegrationServices;

namespace WIDESEA_StoragIntegrationServices;
@@ -9,25 +14,42 @@
public class AgingInOrOutInputService : IAgingInOrOutInputService
{
    private readonly LogFactory LogFactory = new LogFactory();
    private readonly ISys_ConfigService _configService;

    public AgingInOrOutInputService(ISys_ConfigService configRepository)
    {
        _configService = configRepository;
    }

    /// <summary>
    /// 静置\陈化入库（整托盘）
    /// </summary>
    /// <param name="input">入库数据</param>
    /// <returns></returns>
    public async Task<dynamic> GetOCVInputAsync(AgingInputDto input)
    public async Task<WebResponseContent> GetOCVInputAsync(AgingInputDto input)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            input.SessionId = Guid.NewGuid().ToString();
            input.Software = "陈化机";
            input.EquipmentCode = "P1K10040";
            input.EmployeeNo = "T00001";
            input.EmployeeNo = "MITest";
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputJson = input.ToDictionary();
            var x = await HttpsClient.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/AgingInput", inputJson);
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.AgingInput)?.ConfigValue;
            if (wmsBase == null || ipAddress == null)
            {
                throw new InvalidOperationException("WMS IP 未配置");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/AgingInput", inputJson);
            content.OK(data: result);

            LogFactory.GetLog("静置陈化入库（整托盘）").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置陈化入库（整托盘）").Info(true, x);
            LogFactory.GetLog("静置陈化入库（整托盘）").Info(true, result);
        }
        catch (Exception err)
        {
@@ -35,7 +57,7 @@
            LogFactory.GetLog("静置陈化入库（整托盘）").Error(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置陈化入库（整托盘）").Error(true, err.StackTrace);
        }
        return Task.FromResult<dynamic>(null);
        return content;
    }

    /// <summary>
@@ -43,26 +65,37 @@
    /// </summary>
    /// <param name="input">出库数据</param>
    /// <returns></returns>
    public async Task<dynamic> GetOCVOutputAsync(AgingOutputDto input)
    public async Task<WebResponseContent> GetOCVOutputAsync(AgingOutputDto input)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            input.SessionId = Guid.NewGuid().ToString();
            input.Software = "陈化机";
            input.EquipmentCode = "P1K10040";
            input.EmployeeNo = "T00001";
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ"); ;
            input.EmployeeNo = "MITest";
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputJson = input.ToDictionary();
            var x = await HttpsClient.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/AgingOutput", inputJson);
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.AgingOutput)?.ConfigValue;
            if (wmsBase == null || ipAddress == null)
            {
                throw new InvalidOperationException("WMS IP 未配置");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/AgingOutput", inputJson);
            content.OK(data: result);
            LogFactory.GetLog("静置陈化出库（整托盘）").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置陈化出库（整托盘）").Info(true, x);
            LogFactory.GetLog("静置陈化出库（整托盘）").Info(true, result);
        }
        catch (Exception err)
        {
            Console.WriteLine(err.Message.ToString());
            LogFactory.GetLog("静置/陈化出库（整托盘）").Error(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置/陈化出库（整托盘)").Error(true, err.StackTrace);
            LogFactory.GetLog("静置陈化出库（整托盘）").Error(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置陈化出库（整托盘）").Error(true, err.StackTrace);
            content.Error(err.Message);
        }
        return Task.FromResult<dynamic>(null);
        return content;
    }
}