From bc5b8eae471ef40191056dde8ac0a1df87bab5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B6=E5=9D=A4?= <997828819@qq.com>
Date: Tue, 25 Jun 2024 13:37:23 +0800
Subject: [PATCH] 123

---
 WCS.BLL/Tool/Helper.cs | 31 ++++++++++++++++++++++---------
 WCS.WebApi/Program.cs  |  1 -
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/WCS.BLL/Tool/Helper.cs b/WCS.BLL/Tool/Helper.cs
index 0c48d8a..7087f23 100644
--- a/WCS.BLL/Tool/Helper.cs
+++ b/WCS.BLL/Tool/Helper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -161,15 +162,21 @@ namespace WCS.BLL.Tool
                     color = 0x00;
                     break;
             }
-            byte[] data1 = new byte[8];
+            byte[] data1 = new byte[8 + 3 * 6];
             data1[0] = 0xff;
             data1[1] = 0x02;
             data1[2] = 0x00;
             data1[3] = 0x0a;
-            data1[4] = (byte)lightid;
-            data1[5] = (byte)status;
-            data1[6] = color;
-            data1[7] = (byte)beestatus;
+            for (int i = 0; i < 7;i++)
+            {
+                data1[4 + i * 3] = (byte)(lightid + i);
+                data1[5 + i * 3] = (byte)status;
+                data1[6 + i * 3] = color;
+            }
+            //data1[4] = (byte)lightid;
+            //data1[5] = (byte)status;
+            //data1[6] = color;
+            data1[25] = (byte)beestatus;
             byte[] data2 = Crc16(data1, data1.Length, true);
             return data2;
         }
@@ -193,14 +200,20 @@ namespace WCS.BLL.Tool
         //入库警示灯短亮（绿色），蜂鸣器鸣叫一次
         public static byte[] InstoreWarnLight(int lightid)
         {
-            byte[] data1 = new byte[8];
+            byte[] data1 = new byte[8 + 3 * 6];
             data1[0] = 0xff;
             data1[1] = 0x02;
             data1[2] = 0x00;
             data1[3] = 0x0a;
-            data1[4] = (byte)lightid;
-            data1[5] = 0x03;
-            data1[6] = 0x02;
+            for (int i = 0; i < 7; i++)
+            {
+                data1[4 + i * 3] = (byte)(lightid + i);
+                data1[5 + i * 3] = 0x03;
+                data1[6 + i * 3] = 0x02;
+            }
+            //data1[4] = (byte)lightid;
+            //data1[5] = 0x03;
+            //data1[6] = 0x02;
             data1[7] = 0x02;
             byte[] senddata1 = Tool.Helper.Crc16(data1, data1.Length, true);
             return senddata1;
diff --git a/WCS.WebApi/Program.cs b/WCS.WebApi/Program.cs
index fefaf41..176237c 100644
--- a/WCS.WebApi/Program.cs
+++ b/WCS.WebApi/Program.cs
@@ -20,7 +20,6 @@ namespace WebApi
     {
         public static void Main(string[] args)
         {
-
             WebSoceketManager.InitWebSocket();
 
             DbInit.InitDb();