From 06697a2e1d15ffc29ad5d558ad627f1201e7ba65 Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Fri, 21 Mar 2025 14:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=94=AE=E7=81=AF?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WCS.BLL/HardWare/MXL4Shelf.cs | 6 +++--- WCS.BLL/HardWare/MXL4ShelfModule.cs | 9 ++++++--- WCS.BLL/Services/Service/MXL4Service.cs | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/WCS.BLL/HardWare/MXL4Shelf.cs b/WCS.BLL/HardWare/MXL4Shelf.cs index c750af5..73852c2 100644 --- a/WCS.BLL/HardWare/MXL4Shelf.cs +++ b/WCS.BLL/HardWare/MXL4Shelf.cs @@ -108,13 +108,13 @@ namespace WCS.BLL.HardWare switch (taskMode) { case (TaskModeEnum.入库模式): - module.GoInInstoreMode(TcpCleint); + module.GoInInstoreMode(TcpCleint, firstTask.ButtonColor); break; case (TaskModeEnum.出库模式): - module.GoInOutstoreMode(TcpCleint); + module.GoInOutstoreMode(TcpCleint, firstTask.ButtonColor); break; case (TaskModeEnum.盘点模式): - module.GoInStocktakingMode(TcpCleint); + module.GoInStocktakingMode(TcpCleint, firstTask.ButtonColor); break; default: break; diff --git a/WCS.BLL/HardWare/MXL4ShelfModule.cs b/WCS.BLL/HardWare/MXL4ShelfModule.cs index 2181360..60de9b9 100644 --- a/WCS.BLL/HardWare/MXL4ShelfModule.cs +++ b/WCS.BLL/HardWare/MXL4ShelfModule.cs @@ -116,8 +116,9 @@ namespace WCS.BLL.HardWare /// 进入入库模式 /// /// - public void GoInInstoreMode(TCPClient tcpClient) + public void GoInInstoreMode(TCPClient tcpClient,ButtonColorEnum buttonColor) { + GoInInstoreModeData[2] = (byte)buttonColor; tcpClient.SendThenReturn(tcpClient.GenerateMessage(BoardId, GoInInstoreModeData)); //SetCurrentMode(TaskModeEnum.入库模式); } @@ -135,8 +136,9 @@ namespace WCS.BLL.HardWare /// 进入出库模式 /// /// - public void GoInOutstoreMode(TCPClient tcpClient) + public void GoInOutstoreMode(TCPClient tcpClient, ButtonColorEnum buttonColor) { + GoInOutstoreModeData[2] = (byte)buttonColor; tcpClient.SendThenReturn(tcpClient.GenerateMessage(BoardId, GoInOutstoreModeData)); //SetCurrentMode(TaskModeEnum.出库模式); } @@ -154,8 +156,9 @@ namespace WCS.BLL.HardWare /// 进入盘点模式 /// /// - public void GoInStocktakingMode(TCPClient tcpClient) + public void GoInStocktakingMode(TCPClient tcpClient, ButtonColorEnum buttonColor) { + GoInStocktakingModeData[2] = (byte)buttonColor; tcpClient.SendThenReturn(tcpClient.GenerateMessage(BoardId, GoInStocktakingModeData)); //SetCurrentMode(TaskModeEnum.盘点模式); } diff --git a/WCS.BLL/Services/Service/MXL4Service.cs b/WCS.BLL/Services/Service/MXL4Service.cs index 407a558..1441a8c 100644 --- a/WCS.BLL/Services/Service/MXL4Service.cs +++ b/WCS.BLL/Services/Service/MXL4Service.cs @@ -256,7 +256,7 @@ namespace WCS.BLL.Services.Service t.MXL4Modules.ForEach(m => { //发送进入入库模式 - m.GoInOutstoreMode(t.TcpCleint); + m.GoInOutstoreMode(t.TcpCleint,DbModels.Task.ButtonColorEnum.红色); //任务ID m.SendTaskId(7, t.TcpCleint); m.SendMatCode("A7100200300", t.TcpCleint);