From c36c5c66732415fb5a6d8f68082637bf27cb5538 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 00:36:12 +0800
Subject: [PATCH] fix(StockInfoDetailController): MES凭证改为动态获取
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs
index fde583b..3680ce8 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs
@@ -7,6 +7,7 @@
using WIDESEA_IBasicService;
using WIDESEA_ISystemService;
using WIDESEA_Model.Models;
+using WIDESEA_Common.Constants;
using WIDESEA_Common.StockEnum;
using System.Diagnostics;
@@ -23,18 +24,21 @@
private readonly IMesService _mesService;
private readonly ISys_DictionaryService _sysDictionaryService;
private readonly IStockInfoService _stockInfoService;
+ private readonly IMESDeviceConfigService _mesDeviceConfigService;
public StockInfoDetailController(
IStockInfoDetailService service,
IMesLogService mesLogService,
IMesService mesService,
ISys_DictionaryService sysDictionaryService,
- IStockInfoService stockInfoService) : base(service)
+ IStockInfoService stockInfoService,
+ IMESDeviceConfigService mesDeviceConfigService) : base(service)
{
_mesLogService = mesLogService;
_mesService = mesService;
_sysDictionaryService = sysDictionaryService;
_stockInfoService = stockInfoService;
+ _mesDeviceConfigService = mesDeviceConfigService;
}
/// <summary>
@@ -63,11 +67,17 @@
}
var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => stockDetail.StockId == x.Id);
- // 3. 鏋勯�燤ES璇锋眰 - 灏嗙數鑺垪琛ㄨ浆鎹负ContainerSfcItem鏍煎紡
+ // 3. 鍔ㄦ�佽幏鍙朚ES鍑瘉
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName("缁勭洏鏈烘鎵�");
+ string equipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE;
+ string resourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE;
+ string token = mesConfig?.Token;
+
+ // 4. 鏋勯�燤ES璇锋眰 - 灏嗙數鑺垪琛ㄨ浆鎹负ContainerSfcItem鏍煎紡
var mesRequest = new BindContainerRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = equipmentCode,
+ ResourceCode = resourceCode,
LocalTime = DateTime.Now,
ContainerCode = stockInfo.PalletCode,
ContainerSfcList = dto.SfcList.Select(sfc => new ContainerSfcItem
@@ -80,13 +90,16 @@
string requestJson = System.Text.Json.JsonSerializer.Serialize(mesRequest);
- // 4. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
+ // 5. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
+ var localToken = token;
_ = Task.Run(async () =>
{
var localStopwatch = Stopwatch.StartNew();
try
{
- var result = _mesService.BindContainer(mesRequest);
+ var result = string.IsNullOrWhiteSpace(localToken)
+ ? _mesService.BindContainer(mesRequest)
+ : _mesService.BindContainer(mesRequest, localToken);
localStopwatch.Stop();
bool isSuccess = result?.IsSuccess ?? false;
@@ -124,7 +137,7 @@
}
});
- // 5. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
+ // 6. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
return response.OK("鎵樼洏鐢佃姱缁戝畾鎴愬姛");
}
catch (Exception ex)
@@ -159,11 +172,17 @@
}
var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => stockDetail.StockId == x.Id);
- // 3. 鏋勯�燤ES璇锋眰
+ // 3. 鍔ㄦ�佽幏鍙朚ES鍑瘉
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName("缁勭洏鏈烘鎵�");
+ string equipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE;
+ string resourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE;
+ string token = mesConfig?.Token;
+
+ // 4. 鏋勯�燤ES璇锋眰
var mesRequest = new UnBindContainerRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = equipmentCode,
+ ResourceCode = resourceCode,
LocalTime = DateTime.Now,
ContainCode = stockInfo.PalletCode,
SfcList = dto.SfcList
@@ -171,13 +190,16 @@
string requestJson = System.Text.Json.JsonSerializer.Serialize(mesRequest);
- // 4. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
+ // 5. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
+ var localToken = token;
_ = Task.Run(async () =>
{
var localStopwatch = Stopwatch.StartNew();
try
{
- var result = _mesService.UnBindContainer(mesRequest);
+ var result = string.IsNullOrWhiteSpace(localToken)
+ ? _mesService.UnBindContainer(mesRequest)
+ : _mesService.UnBindContainer(mesRequest, localToken);
localStopwatch.Stop();
bool isSuccess = result?.IsSuccess ?? false;
@@ -215,7 +237,7 @@
}
});
- // 5. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
+ // 6. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
return response.OK("鎵樼洏鐢佃姱瑙ｇ粦鎴愬姛");
}
catch (Exception ex)
@@ -256,11 +278,16 @@
}
var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => stockDetail.StockId == x.Id);
- // 3. 鏋勯�燤ES璇锋眰 - 灏咲TO鏍煎紡杞崲涓篗ES璇锋眰鏍煎紡
+ // 3. 鍔ㄦ�佽幏鍙朚ES鍑瘉
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName("缁勭洏鏈烘鎵�");
+ string equipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE;
+ string resourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE;
+
+ // 4. 鏋勯�燤ES璇锋眰 - 灏咲TO鏍煎紡杞崲涓篗ES璇锋眰鏍煎紡
var mesRequest = new ContainerNgReportRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "RESOURCE-001",
+ EquipmentCode = equipmentCode,
+ ResourceCode = resourceCode,
LocalTime = DateTime.Now,
ContainerCode = stockInfo.PalletCode,
NgSfcList = dto.NgSfcList.Select(ng => new NgSfcItem
@@ -274,7 +301,7 @@
string requestJson = System.Text.Json.JsonSerializer.Serialize(mesRequest);
- // 4. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
+ // 5. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
_ = Task.Run(async () =>
{
var localStopwatch = Stopwatch.StartNew();
@@ -318,7 +345,7 @@
}
});
- // 5. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
+ // 6. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
return response.OK("NG鐢佃姱涓婃姤鎴愬姛");
}
catch (Exception ex)
--
Gitblit v1.9.3