From c96b149557eb570ec3ae28e0d0c03adef734766a Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 15:20:35 +0800
Subject: [PATCH] feat: 添加机械手选择功能并优化MES请求处理
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 de85b5f..a3cf0df 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs
@@ -3,6 +3,7 @@
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.MES;
using WIDESEA_IBasicService;
using WIDESEA_IStockService;
@@ -66,7 +67,7 @@
var stockInfo = await _stockInfoService.Repository.QueryDataNavFirstAsync(x => x.PalletCode == dto.PalletCode);
// 3. 鍔ㄦ�佽幏鍙朚ES鍑瘉
- var mesConfig = _mesDeviceConfigService.GetByDeviceName("缁勭洏鏈烘鎵�");
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName(dto.DeviceName);
string equipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE;
string resourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE;
string token = mesConfig?.Token;
@@ -102,7 +103,8 @@
return (
result?.Data?.IsSuccess ?? false,
System.Text.Json.JsonSerializer.Serialize(result),
- result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒"
+ result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒",
+ _mesService.BuildConfig(token ?? string.Empty).ToJson()
);
},
App.User.UserName);
@@ -143,7 +145,7 @@
var stockInfo = await _stockInfoService.Repository.QueryDataNavFirstAsync(x => dto.PalletCode == x.PalletCode);
// 3. 鍔ㄦ�佽幏鍙朚ES鍑瘉
- var mesConfig = _mesDeviceConfigService.GetByDeviceName("缁勭洏鏈烘鎵�");
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName(dto.DeviceName);
string equipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE;
string resourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE;
string token = mesConfig?.Token;
@@ -174,7 +176,8 @@
return (
result?.Data?.IsSuccess ?? false,
System.Text.Json.JsonSerializer.Serialize(result),
- result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒"
+ result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒",
+ _mesService.BuildConfig(token ?? string.Empty).ToJson()
);
},
App.User.UserName);
@@ -253,9 +256,10 @@
{
var result = _mesService.ContainerNgReport(mesRequest);
return (
- result?.IsSuccess ?? false,
+ result?.Data?.IsSuccess ?? false,
System.Text.Json.JsonSerializer.Serialize(result),
- result?.ErrorMessage ?? "鏈煡閿欒"
+ result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒",
+ _mesService.BuildConfig(mesConfig?.Token ?? string.Empty).ToJson()
);
},
App.User.UserName);
--
Gitblit v1.9.3