diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs
index 30ce07f..871eddc 100644
--- a/Epost.BLL/OrderControlBLL.cs
+++ b/Epost.BLL/OrderControlBLL.cs
@@ -43,6 +43,7 @@ namespace Epost.BLL
                 JobCache.ClearJobList();
                 downCacheDAL.ClearJobDownList();
                 locCache.ClearScanList();
+                queueBLL.DeleteQueuebyUser(" and state=2");
                 queueBLL.UpdateQueueState();
                // queueboxBLL.UpdateQueueState();
                 orderbll.UpOrderstate();
diff --git a/Epost.DAL/OrdersQueueDAL.cs b/Epost.DAL/OrdersQueueDAL.cs
index 3563df5..c03e03f 100644
--- a/Epost.DAL/OrdersQueueDAL.cs
+++ b/Epost.DAL/OrdersQueueDAL.cs
@@ -94,7 +94,7 @@ namespace Epost.DAL
         #region 获取当前区的作业状态
         public DataTable getQueueOrderState(OrdersQueueModel model)
         {
-            string sql = string.Format("select * from  OrdersQueue where taskblock='{0}' and taskarea='{1}' and state=0 order by sort",
+            string sql = string.Format("select * from  OrdersQueue where taskblock='{0}' and taskarea='{1}' and state=0 and usercode<>'' order by sort",
                 model.Taskblock,
                 model.Taskarea);
             return db.GetsqlForDT(sql);
diff --git a/Epost.Model/WmsOrderModel.cs b/Epost.Model/WmsOrderModel.cs
index b2fd92d..fef1920 100644
--- a/Epost.Model/WmsOrderModel.cs
+++ b/Epost.Model/WmsOrderModel.cs
@@ -19,6 +19,7 @@ namespace Epost.Model
             public string PRINO { get; set; }
             public string LOCATION { get; set; }
             public string WAREHOUSEID { get; set; }
+            public string WAVENOTE { get; set; }
             public List<ORDERITEM> ITEMS { get; set; }
         }
 
diff --git a/Epost.TestToolsWeb/Controllers/TaskAPIController.cs b/Epost.TestToolsWeb/Controllers/TaskAPIController.cs
index a662f27..f93ab08 100644
--- a/Epost.TestToolsWeb/Controllers/TaskAPIController.cs
+++ b/Epost.TestToolsWeb/Controllers/TaskAPIController.cs
@@ -51,6 +51,7 @@ namespace Epost.DPS.Controllers
                         dataTable.Columns.Add(new DataColumn("goodsname", typeof(string)));
                         dataTable.Columns.Add(new DataColumn("quantity", typeof(int)));                      
                         dataTable.Columns.Add(new DataColumn("downdate", typeof(string)));                   
+                        dataTable.Columns.Add(new DataColumn("clientcode", typeof(string)));
                         #endregion
                         foreach (PutOrderReq item in data)
                         {
@@ -72,6 +73,7 @@ namespace Epost.DPS.Controllers
                                 dataRow["goodscode"] = detailitem.BATCHNO;
                                 dataRow["goodsname"] = detailitem.DESCR_C;
                                 dataRow["quantity"] = detailitem.QUANTITY; 
+                                dataRow["clientcode"] =item.WAVENOTE;
                                 dataRow["downdate"] = DateTime.Now.ToString();
                                 dataTable.Rows.Add(dataRow);
                             }
@@ -95,6 +97,7 @@ namespace Epost.DPS.Controllers
                         diclist.Add("goodsname", "goodsname");
                         diclist.Add("quantity", "quantity");
                         diclist.Add("downdate", "downdate");
+                        diclist.Add("clientcode", "clientcode");
                         #endregion
                         bool bo = orderbll.UpdateData(dataTable, diclist, "orders");
                         if (bo)
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index f2a0344..5da9097 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:\驿传\GuangzhouHuiFeng_DAS</_PublishTargetUrl>
-    <History>True|2025-06-30T00:52:19.2275165Z||;True|2025-06-30T08:51:25.4626932+08:00||;True|2025-06-28T16:15:03.8714874+08:00||;True|2025-06-28T16:09:07.6965176+08:00||;True|2025-06-28T15:34:51.7432575+08:00||;True|2025-06-28T14:46:14.4119481+08:00||;True|2025-06-28T14:14:50.7601565+08:00||;True|2025-06-27T17:35:33.5131523+08:00||;True|2025-06-26T17:43:01.0379434+08:00||;True|2025-06-26T17:35:14.4249922+08:00||;True|2025-06-26T16:52:50.3133122+08:00||;True|2025-06-26T14:43:53.4124674+08:00||;True|2025-06-26T14:36:49.8290629+08:00||;True|2025-06-26T14:32:48.0261661+08:00||;True|2025-06-26T14:25:41.0829044+08:00||;True|2025-06-26T11:51:25.0046611+08:00||;True|2025-06-26T10:39:18.2677815+08:00||;True|2025-06-24T19:52:28.3640036+08:00||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;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>
+    <History>True|2025-07-01T01:13:15.0135344Z||;True|2025-06-30T08:52:19.2275165+08:00||;True|2025-06-30T08:51:25.4626932+08:00||;True|2025-06-28T16:15:03.8714874+08:00||;True|2025-06-28T16:09:07.6965176+08:00||;True|2025-06-28T15:34:51.7432575+08:00||;True|2025-06-28T14:46:14.4119481+08:00||;True|2025-06-28T14:14:50.7601565+08:00||;True|2025-06-27T17:35:33.5131523+08:00||;True|2025-06-26T17:43:01.0379434+08:00||;True|2025-06-26T17:35:14.4249922+08:00||;True|2025-06-26T16:52:50.3133122+08:00||;True|2025-06-26T14:43:53.4124674+08:00||;True|2025-06-26T14:36:49.8290629+08:00||;True|2025-06-26T14:32:48.0261661+08:00||;True|2025-06-26T14:25:41.0829044+08:00||;True|2025-06-26T11:51:25.0046611+08:00||;True|2025-06-26T10:39:18.2677815+08:00||;True|2025-06-24T19:52:28.3640036+08:00||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;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>06/30/2025 08:52:16</publishTime>
+      <publishTime>07/01/2025 11:21:22</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>06/30/2025 08:52:16</publishTime>
+      <publishTime>07/01/2025 11:21:22</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>02/24/2020 15:29:24</publishTime>
     </File>
     <File Include="bin/Common.dll">
-      <publishTime>06/28/2025 15:34:36</publishTime>
+      <publishTime>07/01/2025 11:21:01</publishTime>
     </File>
     <File Include="bin/Common.pdb">
-      <publishTime>06/28/2025 15:34:36</publishTime>
+      <publishTime>07/01/2025 11:21:01</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>06/30/2025 08:51:02</publishTime>
+      <publishTime>07/01/2025 11:21:02</publishTime>
     </File>
     <File Include="bin/Epost.BLL.pdb">
-      <publishTime>06/30/2025 08:51:02</publishTime>
+      <publishTime>07/01/2025 11:21:02</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>06/28/2025 15:34:37</publishTime>
+      <publishTime>07/01/2025 11:21:02</publishTime>
     </File>
     <File Include="bin/Epost.DAL.pdb">
-      <publishTime>06/28/2025 15:34:37</publishTime>
+      <publishTime>07/01/2025 11:21:02</publishTime>
     </File>
     <File Include="bin/Epost.DPS.dll">
-      <publishTime>06/30/2025 08:51:06</publishTime>
+      <publishTime>07/01/2025 11:21:05</publishTime>
     </File>
     <File Include="bin/Epost.DPS.pdb">
-      <publishTime>06/30/2025 08:51:06</publishTime>
+      <publishTime>07/01/2025 11:21:05</publishTime>
     </File>
     <File Include="bin/Epost.Model.dll">
-      <publishTime>06/28/2025 15:34:35</publishTime>
+      <publishTime>07/01/2025 11:21:01</publishTime>
     </File>
     <File Include="bin/Epost.Model.pdb">
-      <publishTime>06/28/2025 15:34:35</publishTime>
+      <publishTime>07/01/2025 11:21:01</publishTime>
     </File>
     <File Include="bin/Epost.TestToolsWeb.dll">
       <publishTime>09/06/2018 11:57:11</publishTime>
@@ -5661,7 +5661,7 @@
       <publishTime>05/30/2022 16:58:47</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>06/30/2025 08:52:09</publishTime>
+      <publishTime>07/01/2025 11:21:07</publishTime>
     </File>
     <File Include="Scripts/ai.0.22.9-build00167.js">
       <publishTime>04/04/2018 15:45:12</publishTime>