From 234bec78dd54ca0e2952b8d31d0c17ee1dc89ba9 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 18 四月 2026 15:51:32 +0800
Subject: [PATCH] feat: 添加MES设备动态凭证支持
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs
index c50f942..62cb7ba 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs
@@ -165,7 +165,7 @@
/// <param name="task">瑕佷笅鍙戠殑浠诲姟瀵硅薄</param>
/// <param name="state">鏈哄櫒浜哄綋鍓嶇姸鎬�</param>
/// <param name="isScanNG">鏄惁鎵爜NG</param>
- public async Task SendSocketRobotPickAsync(Dt_RobotTask task, RobotSocketState state, bool isScanNG)
+ public async Task SendSocketRobotPickAsync(Dt_RobotTask task, RobotSocketState state, bool isScanNG = false)
{
// 鏋勫缓鍙栬揣鎸囦护锛屾牸寮忥細Pickbattery,{婧愬湴鍧�}
string taskString = $"Pickbattery,{task.RobotSourceAddress}";
@@ -600,7 +600,8 @@
Channel = x,
// 鐢垫睜鏉＄爜锛氬鏋滅姸鎬佷腑鏈夋潯鐮佸垪琛紝鍙栧搴斾綅缃殑鏉＄爜锛涘惁鍒欎负绌�
- CellBarcode = state.CellBarcode?.Count > 0 ? state.CellBarcode[x - 1] : ""
+ //CellBarcode = state.CellBarcode?.Count > 0 ? state.CellBarcode[x - 1] : ""
+ CellBarcode = state.CellBarcode[idx].ToString()
})
.ToList()
};
@@ -646,10 +647,11 @@
/// 褰撴媶鐩樹换鍔″叏閮ㄥ彇瀹屾椂璋冪敤锛屼竴娆℃�т笂浼犳暣涓墭鐩樼殑瑙ｇ粦鏁版嵁鍒� MES銆�
/// </remarks>
/// <param name="palletCode">婧愭墭鐩樺彿</param>
+ /// <param name="deviceName">璁惧鍚嶇О锛岀敤浜庝紶閫掑埌 WMS</param>
/// <returns>HTTP 鍝嶅簲缁撴灉</returns>
- public HttpResponseResult<WebResponseContent> PostSplitPalletConfirmAsync(string palletCode)
+ public HttpResponseResult<WebResponseContent> PostSplitPalletConfirmAsync(string palletCode, string deviceName)
{
- var request = new { PalletCode = palletCode };
+ var request = new { PalletCode = palletCode, DeviceName = deviceName };
return _httpClientHelper.Post<WebResponseContent>(nameof(ConfigKey.SplitPalletConfirm), request.ToJson());
}
@@ -660,10 +662,11 @@
/// 褰撶粍鐩樹换鍔″叏閮ㄦ斁瀹屾椂璋冪敤锛屼竴娆℃�т笂浼犳暣涓墭鐩樼殑缁戝畾鏁版嵁鍒� MES銆�
/// </remarks>
/// <param name="palletCode">鐩爣鎵樼洏鍙�</param>
+ /// <param name="deviceName">璁惧鍚嶇О锛岀敤浜庝紶閫掑埌 WMS</param>
/// <returns>HTTP 鍝嶅簲缁撴灉</returns>
- public HttpResponseResult<WebResponseContent> PostGroupPalletConfirmAsync(string palletCode)
+ public HttpResponseResult<WebResponseContent> PostGroupPalletConfirmAsync(string palletCode, string deviceName)
{
- var request = new { PalletCode = palletCode };
+ var request = new { PalletCode = palletCode, DeviceName = deviceName };
return _httpClientHelper.Post<WebResponseContent>(nameof(ConfigKey.GroupPalletConfirm), request.ToJson());
}
}
--
Gitblit v1.9.3