SuZhouGuanHong/ShanMeiXinNengYuan.git

			@@ -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. 动态获取MES凭证
			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. 动态获取MES凭证
			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);