diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs
index 25400f3..b98a32d 100644
--- a/Epost.BLL/CommandBLL.cs
+++ b/Epost.BLL/CommandBLL.cs
@@ -247,7 +247,7 @@ namespace Epost.BLL
                 LabelParamModel lockModel = new LabelParamModel();
                 lockModel.Address = model.Address;
                 lockModel.ControlIP = model.ControlIP;
-                lockModel.Parameter = "11101000";
+                lockModel.Parameter = "11111000";
                 lockModel.Command = "LOCK";
                 lockModel.Timeout = "0.5";
                 lockModel.Type = model.Type;
@@ -259,7 +259,7 @@ namespace Epost.BLL
                 LabelParamModel lockModel = new LabelParamModel();
                 lockModel.Address = model.Address;
                 lockModel.ControlIP = model.ControlIP;
-                lockModel.Parameter = "00011000";
+                lockModel.Parameter = "11111000";
                 lockModel.Command = "UNLOCK";
                 lockModel.Timeout = "0.5";
                 lockModel.Type = model.Type;
@@ -501,7 +501,7 @@ namespace Epost.BLL
                     model.ControlIP = item.ControlIP;
                     model.Address = item.Address;
                     model.Command = "REMOVE_JOB";
-                    model.Uid = item.ID;
+                    model.Uid = "U" + item.ID;
                     model.Type = "N";
                     list.Add(model);
                     LabelParamModel Unlockmodel = new LabelParamModel();
diff --git a/Epost.BLL/OrderBLL.cs b/Epost.BLL/OrderBLL.cs
index 50130d2..815ba5f 100644
--- a/Epost.BLL/OrderBLL.cs
+++ b/Epost.BLL/OrderBLL.cs
@@ -689,12 +689,12 @@ namespace Epost.BLL
                 {
                     string usercode = string.Empty;
                     string lightcolor = string.Empty;
-                    DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
-                    if (udt != null && udt.Rows.Count > 0)
-                    {
-                        usercode = udt.Rows[0]["usercode"].ToString();
-                        lightcolor = udt.Rows[0]["lightcolor"].ToString();
-                    }
+                    //DataTable udt = dal.GetOrderUseerXCode(matchid, sku, area, block);
+                    //if (udt != null && udt.Rows.Count > 0)
+                    //{
+                    //    usercode = udt.Rows[0]["usercode"].ToString();
+                    //    lightcolor = udt.Rows[0]["lightcolor"].ToString();
+                    //}
                     if (string.IsNullOrEmpty(lightcolor))
                     {
                         lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
@@ -717,8 +717,6 @@ namespace Epost.BLL
                         demodel.BoxCode = item["boxcode"].ToString();
                 
                         demodel.Discount = item["Discount"].ToString();
-                  
-                        demodel.ColorCode = item["corlorcode"].ToString();
                         demodel.WholeUnit = item["WholeUnit"].ToString();
                         demodel.Unit = item["Unit"].ToString();
                       
diff --git a/Epost.BLL/Work_DisplayJobThread.cs b/Epost.BLL/Work_DisplayJobThread.cs
index 6dce918..687d989 100644
--- a/Epost.BLL/Work_DisplayJobThread.cs
+++ b/Epost.BLL/Work_DisplayJobThread.cs
@@ -6,7 +6,8 @@ using Epost.Model.resource;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq; 
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading;
  
 
@@ -99,17 +100,42 @@ namespace Epost.BLL
                             showmodel.Area = shelfid;
                             showmodel.Block = nblock;
                             showmodel.Color = queueDT.Rows[0]["lightcolor"].ToString();//EnumHelper.EMToDescriptionString(LightColor.Color.Red);
-                            showmodel.Contents = queueDT.Rows[0]["sku"].ToString();
                             showmodel.Title =   queueDT.Rows[0]["Shopid"].ToString();
                             showmodel.Islock = true;
+                            if (queueDT.Rows[0]["lightcolor"].ToString() == "1")
+                            {
+                                showmodel.Islock = false;
+                            }
+                         
                           
                             showmodel.IsTwinkle = 0;
                             showmodel.Type = 8;
-                            DataTable sudt = orderbll.GetSumList("", queueDT.Rows[0]["sku"].ToString(), nblock);
-                            if (sudt != null && sudt.Rows.Count > 0)
+                            DataTable skudt = orderbll.GetSumList(queueDT.Rows[0]["matchid"].ToString(), queueDT.Rows[0]["sku"].ToString(), nblock, shelfid);
+                            if (skudt != null && skudt.Rows.Count > 0)
                             { 
-                              showmodel.Qty = sudt.Rows[0]["SumQuantity"].ToString();
+                                showmodel.Qty = skudt.Rows[0]["SumQuantity"].ToString(); 
+                                int discount = Convert.ToInt32(skudt.Rows[0]["discount"].ToString());
+                                //整件总数
+                                int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString());
+                                                      //散件总数
+                                int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
+                                int zcount = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
+                                if (discount != 1)
+                                {
+                                    if (SumQuantity >= discount)
+                                    {
+
+                                        SumCkQuantity = SumQuantity / discount;
+                                        SumQuantity = SumQuantity % discount;
+                                    }
+                                }
+                                showmodel.Qty = SumQuantity.ToString();
+                                showmodel.Wholeqty = SumCkQuantity;
+                                showmodel.Unit = "件";
+                                showmodel.Wholeunit = "箱";
+                                showmodel.Contents = queueDT.Rows[0]["sku"].ToString()+"\r规格： "+ discount + " \r总数量：" + zcount;;
                             }
+
                             comBLL.ShowBoxMessage_M(showmodel);//点亮显示标签 
                             #endregion
                             displayOrder(queueDT, nblock, item.area, model);
diff --git a/Epost.BLL/Work_JobDownThread.cs b/Epost.BLL/Work_JobDownThread.cs
index 3b48c95..518fde0 100644
--- a/Epost.BLL/Work_JobDownThread.cs
+++ b/Epost.BLL/Work_JobDownThread.cs
@@ -172,11 +172,14 @@ namespace Epost.BLL
                 LogHelper.WriteLogInfo("=======" + qmodel.UserCode + "=====" + area + "区===sku=" + skulist);
             }
 
-            if (data.Loc == "check")//任意回显标签拍下 熄灭回显设备
+            if (type == "8")// 订单显示器熄灭回显设备
             {
-                List<JobModel> rejob = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 1 && m.Sku == queueDT.Rows[0]["sku"].ToString());
+                LogHelper.WriteLogInfo("显示器拍下");
+                List<JobModel> rejob = jobList.FindAll(m => m.Block == block && m.Area == area && m.State == 1 && m.Sku == queueDT.Rows[0]["sku"].ToString()&&m.ColorCode=="1");
+            
                 if (rejob.Any())
                 {
+                    LogHelper.WriteLogInfo("显示器拍下=="+rejob.Count);
                     JobModel model = rejob.FirstOrDefault();
                     comBLL.ClearArea_M(rejob);
                     //熄灭通道灯
@@ -269,6 +272,7 @@ namespace Epost.BLL
                     show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);                  
                     show.Type = 8;
                     show.Block = block;
+                    show.Area = area;
                     show.Islock = false;
                     show.IsTwinkle = 1;
                     comBLL.ShowBoxMessage_M(show);
diff --git a/Epost.BLL/Work_ScanThread.cs b/Epost.BLL/Work_ScanThread.cs
index 3f3ca4b..1f12ab3 100644
--- a/Epost.BLL/Work_ScanThread.cs
+++ b/Epost.BLL/Work_ScanThread.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -243,8 +244,11 @@ namespace Epost.BLL
                     scanStr = sinfodt.Rows[0]["sku"].ToString();
                     // location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString();
                 }
+                string matchid = string.Empty;
+                if (ulist.Any())
+                { matchid = ulist.FirstOrDefault().Matchid; }
                 LogHelper.WriteLogInfo("中分" + data.Parameter + "===SKU" + scanStr);
-                DataTable skudt = orderbll.GetSumList("", scanStr, data.Block);
+                DataTable skudt = orderbll.GetSumList(matchid, scanStr, data.Block);
                 if (skudt != null && skudt.Rows.Count > 0)
                 {
                     //规格
@@ -253,6 +257,7 @@ namespace Epost.BLL
                     int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString());
                                           //散件总数
                     int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
+                    int zcount = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
                     if (discount != 1)
                     {
                         if (SumQuantity >= discount)
@@ -270,7 +275,7 @@ namespace Epost.BLL
                     show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
                     show.Block = data.Block;
                     show.Islock = true;
-                    show.Contents = data.Parameter + "(" + scanStr + ")\r" + "规格：" + discount;
+                    show.Contents = data.Parameter + "(" + scanStr + ")\r" + "规格：" + discount + "\r总数量：" + zcount;
                     show.Qty = SumQuantity.ToString();
                     show.Wholeqty = SumCkQuantity;
                     show.Unit = "件";
@@ -458,7 +463,7 @@ namespace Epost.BLL
                                     // qmodel.Location = location;
                                     qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString();
                                 
-                                    qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
+                                    qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue);
                                     queueBLL.insertQueueOrders(qmodel);
 
 
diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user
index 044be83..b1a2138 100644
--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@@ -11,7 +11,7 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index 437811a..30a9bce 100644
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@@ -7,7 +7,7 @@
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl>
-    <History>True|2024-11-23T12:50:04.5476409Z;False|2024-11-04T17:48:25.2781696+08:00;True|2024-11-01T16:04:56.3535724+08:00;True|2024-09-01T10:13:37.1598955+08:00;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
+    <History>True|2024-11-27T06:27:33.0840789Z;True|2024-11-27T14:08:15.6442660+08:00;True|2024-11-27T12:10:03.9412549+08:00;True|2024-11-27T11:45:31.3775097+08:00;True|2024-11-27T11:32:00.8297320+08:00;True|2024-11-23T20:50:04.5476409+08:00;False|2024-11-04T17:48:25.2781696+08:00;True|2024-11-01T16:04:56.3535724+08:00;True|2024-09-01T10:13:37.1598955+08:00;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -33,19 +33,19 @@
       <publishTime>04/04/2018 15:45:12</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>11/23/2024 20:50:01</publishTime>
+      <publishTime>11/27/2024 14:27:29</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>11/23/2024 20:50:01</publishTime>
+      <publishTime>11/27/2024 14:27:29</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>02/24/2020 15:29:24</publishTime>
     </File>
     <File Include="bin/Common.dll">
-      <publishTime>11/23/2024 20:49:42</publishTime>
+      <publishTime>11/27/2024 11:31:33</publishTime>
     </File>
     <File Include="bin/Common.pdb">
-      <publishTime>11/23/2024 20:49:42</publishTime>
+      <publishTime>11/27/2024 11:31:33</publishTime>
     </File>
     <File Include="bin/ComposerSDK.dll">
       <publishTime>04/29/2020 16:50:14</publishTime>
@@ -63,31 +63,31 @@
       <publishTime>10/23/2017 13:15:20</publishTime>
     </File>
     <File Include="bin/Epost.BLL.dll">
-      <publishTime>11/23/2024 20:49:43</publishTime>
+      <publishTime>11/27/2024 14:27:17</publishTime>
     </File>
     <File Include="bin/Epost.BLL.pdb">
-      <publishTime>11/23/2024 20:49:43</publishTime>
+      <publishTime>11/27/2024 14:27:17</publishTime>
     </File>
     <File Include="bin/Epost.BLL.XmlSerializers.dll">
       <publishTime>08/26/2020 18:09:48</publishTime>
     </File>
     <File Include="bin/Epost.DAL.dll">
-      <publishTime>11/23/2024 20:49:43</publishTime>
+      <publishTime>11/27/2024 11:31:34</publishTime>
     </File>
     <File Include="bin/Epost.DAL.pdb">
-      <publishTime>11/23/2024 20:49:43</publishTime>
+      <publishTime>11/27/2024 11:31:34</publishTime>
     </File>
     <File Include="bin/Epost.DPS.dll">
-      <publishTime>11/23/2024 20:49:46</publishTime>
+      <publishTime>11/27/2024 14:27:21</publishTime>
     </File>
     <File Include="bin/Epost.DPS.pdb">
-      <publishTime>11/23/2024 20:49:46</publishTime>
+      <publishTime>11/27/2024 14:27:21</publishTime>
     </File>
     <File Include="bin/Epost.Model.dll">
-      <publishTime>11/23/2024 20:49:41</publishTime>
+      <publishTime>11/27/2024 11:31:32</publishTime>
     </File>
     <File Include="bin/Epost.Model.pdb">
-      <publishTime>11/23/2024 20:49:41</publishTime>
+      <publishTime>11/27/2024 11:31:32</publishTime>
     </File>
     <File Include="bin/Epost.TestToolsWeb.dll">
       <publishTime>09/06/2018 11:57:11</publishTime>
@@ -5652,7 +5652,7 @@
       <publishTime>05/30/2022 16:58:47</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>11/23/2024 20:49:48</publishTime>
+      <publishTime>11/27/2024 14:27:22</publishTime>
     </File>
     <File Include="Scripts/ai.0.22.9-build00167.js">
       <publishTime>04/04/2018 15:45:12</publishTime>
@@ -7572,7 +7572,7 @@
       <publishTime>07/04/2022 14:22:38</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>11/23/2024 20:49:47</publishTime>
+      <publishTime>11/27/2024 11:31:40</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file