From 24b202e031752ec82bc216a8213d7d345f1ea4aa Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期一, 25 十一月 2024 16:18:24 +0800
Subject: [PATCH] 2
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs | 102 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 97 insertions(+), 5 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs
index caeb2d5..2746a02 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs
@@ -1,12 +1,32 @@
-锘縰sing Masuit.Tools;
+锘縰sing LogLibrary.Log;
+using Masuit.Tools;
+using Newtonsoft.Json;
using WIDESEA_Common;
+using WIDESEA_Core;
+using WIDESEA_Core.Const;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO;
+using WIDESEA_IRepository;
+using WIDESEA_IServices;
+using WIDESEA_IStorageBasicService;
using WIDESEA_IStoragIntegrationServices;
+using static Org.BouncyCastle.Math.EC.ECCurve;
namespace WIDESEA_StoragIntegrationServices;
public class CellStateService : ICellStateService
{
+ private readonly LogFactory LogFactory = new LogFactory();
+
+ private readonly IBoxingInfoService _boxingInfoService;
+ private readonly ISys_ConfigService _configService;
+
+ public CellStateService(IBoxingInfoService boxingInfoService, ISys_ConfigService configRepository)
+ {
+ _boxingInfoService = boxingInfoService;
+ _configService = configRepository;
+ }
+
/// <summary>
/// 鍗曠數鑺睘鎬ц幏鍙�
/// </summary>
@@ -14,14 +34,64 @@
/// <returns></returns>
public async Task<dynamic> GetCellStateAsync(CellStateDto input)
{
+ WebResponseContent content = new WebResponseContent();
try
{
+ input.SessionId = Guid.NewGuid().ToString();
+ 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("https://localhost:7251/api/CellState/GetCellState", 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.CellState)?.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/CellState", inputJson);
+ #region
+ //if (x != null)
+ //{
+ // ResultCellState result = JsonConvert.DeserializeObject<ResultCellState>(x);
+ // DtBoxingInfo boxingInfo = new DtBoxingInfo()
+ // {
+ // IsFull = true,
+ // PalletCode = "",
+ // };
+ // var details = new List<DtBoxingInfoDetail>();
+ // foreach (var item in result.SerialNos)
+ // {
+ // DtBoxingInfoDetail detail = new DtBoxingInfoDetail()
+ // {
+ // SerialNumber = item.SerialNo,
+ // OrderNo = item.BindCode,
+ // Status = item.SerialNoStatus,
+ // };
+ // details.Add(detail);
+ // }
+ // boxingInfo.BoxingInfoDetails = details;
+ // var abc = await _boxingInfoService.AddBoxingInfoAsync(boxingInfo);
+ // if (abc.Status)
+ // return content.OK("缁勭洏鎴愬姛");
+ // else
+ // return content.Error("缁勭洏澶辫触");
+ //}
+ #endregion
+
+ LogFactory.GetLog("鍗曠數鑺睘鎬ц幏鍙�").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鍗曠數鑺睘鎬ц幏鍙�").Info(true, result);
+ return result;
}
catch (Exception err)
{
Console.WriteLine(err.Message.ToString());
+ LogFactory.GetLog("鍗曠數鑺睘鎬ц幏鍙�").Error(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鍗曠數鑺睘鎬ц幏鍙�").Error(true, $"璇锋眰鍙傛暟: {JsonConvert.SerializeObject(input)}");
+ LogFactory.GetLog("鍗曠數鑺睘鎬ц幏鍙�").Error(true, err.Message);
+ LogFactory.GetLog("鍗曠數鑺睘鎬ц幏鍙�").Error(true, err.StackTrace);
}
return Task.FromResult<dynamic>(null);
}
@@ -31,17 +101,39 @@
/// </summary>
/// <param name="input">鐢佃姱鏁版嵁</param>
/// <returns></returns>
- public async Task<dynamic> GetTrayCellStatusAsync(TrayCellsStatusDto input)
+ public async Task<WebResponseContent> GetTrayCellStatusAsync(TrayCellsStatusDto input)
{
+ WebResponseContent content = new WebResponseContent();
try
{
+ input.SessionId = Guid.NewGuid().ToString();
+ 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("https://localhost:7251/api/CellState/GetCellState", 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.TrayCellsStatus)?.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/TrayCellsStatus", inputJson);
+
+ LogFactory.GetLog("鏁寸洏鐢佃姱灞炴�ц幏鍙�").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鏁寸洏鐢佃姱灞炴�ц幏鍙�").Info(true, result);
+ content.OK(data: result);
}
catch (Exception err)
{
Console.WriteLine(err.Message.ToString());
+ LogFactory.GetLog("鏁寸洏鐢佃姱灞炴�ц幏鍙�").Error(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鏁寸洏鐢佃姱灞炴�ц幏鍙�").Error(true, $"璇锋眰鍙傛暟: {JsonConvert.SerializeObject(input)}");
+ LogFactory.GetLog("鏁寸洏鐢佃姱灞炴�ц幏鍙�").Error(true, err.Message);
+ LogFactory.GetLog("鏁寸洏鐢佃姱灞炴�ц幏鍙�").Error(true, err.StackTrace);
}
- return Task.FromResult<dynamic>(null);
+ return content;
}
}
\ No newline at end of file
--
Gitblit v1.9.3