From 5200b8b5a92b707ae7f115c7fd07cb7afc109980 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 03 七月 2025 15:44:03 +0800
Subject: [PATCH] 更新配置和扩展功能，优化代码结构 修改 `http.js` 中的 `axios.defaults.baseURL` 配置，调整开发环境 URL。 - 在 `Dt_BillGroupStock_Hty.jsx` 和 `Dt_OutTime.jsx` 中添加作者信息和文档链接，增强组件扩展功能。 - 新增 `tables.js` 中的路由配置，包含 `Dt_BillGroupStock_Hty` 的路径。 - 在 `Dt_BillGroupStock_Hty.vue` 和 `Dt_OutTime.vue` 中定义表格列、编辑和搜索表单字段。 - 新增 `IStockInfoHtyRepository.cs` 和 `IStockInfoHtyService.cs` 接口定义。 - 在 `StockInfoHtyRepository.cs` 和 `StockInfoHtyService.cs` 中实现分页查询和批量删除功能。 - 更新 `appsettings.json` 中的数据库连接字符串，修改数据库名称。
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs
index 22663a4..b84189a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs
@@ -1,17 +1,29 @@
-锘縰sing Masuit.Tools;
+锘縰sing LogLibrary.Log;
+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_Core.Const;
using WIDESEA_DTO;
+using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
namespace WIDESEA_StoragIntegrationServices;
public class UnbindService : IUnbindService
{
+ private readonly LogFactory LogFactory = new LogFactory();
+ private readonly ISys_ConfigService _configService;
+
+ public UnbindService(ISys_ConfigService configRepository)
+ {
+ _configService = configRepository;
+ }
+
/// <summary>
/// 鎵樼洏鍗曠數鑺В缁�
/// </summary>
@@ -19,8 +31,35 @@
/// <returns></returns>
public async Task<dynamic> TrayCellUnbindAsync(TrayCellUnbindDto input)
{
- var inputJson = input.ToDictionary();
- var x = await HttpsClient.PostAsync("https://localhost:7273/api/Unbind/TrayCellUnbind", inputJson);
+ try
+ {
+ input.SessionId = Guid.NewGuid().ToString();
+ input.Software = "WMS";
+ input.EquipmentCode = "24MEJQ08-1091";
+ input.EmployeeNo = "MITest";
+ input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
+ var inputJson = Masuit.Tools.ObjectExtensions.ToDictionary(input);
+ LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�1").Info(true, JsonConvert.SerializeObject(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.TrayCellUnbind)?.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/TrayCellUnbind", inputJson);
+ LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Info(true, result);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Error(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鎵樼洏鍗曠數鑺В缁�").Error(true, ex.StackTrace);
+ }
return Task.FromResult<dynamic>(null);
}
@@ -31,8 +70,35 @@
/// <returns></returns>
public async Task<dynamic> TrayUnbindAsync(TrayUnbindDto input)
{
- var inputJson = input.ToDictionary();
- var x = await HttpsClient.PostAsync("https://localhost:7273/api/Unbind/TrayCellUnbind", inputJson);
+ try
+ {
+ input.SessionId = Guid.NewGuid().ToString();
+ input.Software = "WMS";
+ input.EquipmentCode = "24MEJQ08-1091";
+ input.EmployeeNo = "MITest";
+ input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
+ var inputJson = Masuit.Tools.ObjectExtensions.ToDictionary(input);
+ Console.WriteLine(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.TrayUnbind)?.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/TrayUnbind", inputJson);
+ LogFactory.GetLog("鏁寸洏鐢佃姱瑙ｇ粦").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鏁寸洏鐢佃姱瑙ｇ粦").Info(true, result);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ LogFactory.GetLog("鏁寸洏鐢佃姱瑙ｇ粦").Error(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鏁寸洏鐢佃姱瑙ｇ粦").Error(true, $"{ex.StackTrace}\r\r{ex.Message}");
+ }
return Task.FromResult<dynamic>(null);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3