diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs
index 773dbcc..c3c2945 100644
--- a/Epost.BLL/CommandBLL.cs
+++ b/Epost.BLL/CommandBLL.cs
@@ -137,20 +137,13 @@ namespace Epost.BLL
                                     else {
                                          
                                             lablemodel.Quantity = shopid;
-                                            lablemodel.Mode = "10";
-                                       
-                                    }
-
-                                    
-                                 
-                                  
+                                            lablemodel.Mode = "10"; 
+                                    } 
                                     lablemodel.Address = labelItem["address"].ToString();
                                     lablemodel.ControlIP = item["ControlIP"].ToString();
                                     lablemodel.Command = "DISPLAY_JOB";
-                                    lablemodel.Type = "N";
-                                
-                                    lablemodel.Uid = labelItem["address"].ToString();
-                                   
+                                    lablemodel.Type = "N";                                
+                                    lablemodel.Uid = labelItem["address"].ToString();                                   
                                     list.Add(lablemodel);
                                 }
                                    
@@ -207,6 +200,12 @@ namespace Epost.BLL
         }
         #endregion
 
+        #region 格式化标签
+        public bool FORMAT_DEVICE(LabelParamModel model)
+        {
+            return dal.FORMAT_DEVICE(model);
+        }
+        #endregion
         #region 连接控制器
         public bool CONNECT(LabelParamModel model)
         {
diff --git a/Epost.BLL/OrderBLL.cs b/Epost.BLL/OrderBLL.cs
index 53563c3..45d84e3 100644
--- a/Epost.BLL/OrderBLL.cs
+++ b/Epost.BLL/OrderBLL.cs
@@ -932,8 +932,11 @@ namespace Epost.BLL
         {
             return dal.UpOrderStateBybat(id);
         }
-
-
+        public bool UpdateStateBymatchid(string matchid)
+        {
+            return dal.UpdateStateBymatchid(matchid);
+        }
+        
 
         public bool IsFinishWorkByCar(int endcount, string matchid, string block="")
         {
diff --git a/Epost.BLL/Work_JobDownThread.cs b/Epost.BLL/Work_JobDownThread.cs
index 8eb7581..f5bac48 100644
--- a/Epost.BLL/Work_JobDownThread.cs
+++ b/Epost.BLL/Work_JobDownThread.cs
@@ -328,6 +328,11 @@ namespace Epost.BLL
                     {
                         LogHelper.WriteLogInfo(model.Sku + "Sku播种完成" + model.Matchid);
                         orderbll.UpdateStateByCar(model.Matchid, model.Sku);
+                        bool matchbo= orderbll.IsSkuFinishWork("", model.Matchid);
+                        if (matchbo) {
+                            LogHelper.WriteLogInfo("波次播种完成" + model.Matchid);
+                            orderbll.UpdateStateBymatchid(model.Matchid);
+                        }
                     }
                     #endregion
 
diff --git a/Epost.DAL/CommandDAL.cs b/Epost.DAL/CommandDAL.cs
index 2ad02de..343f9ee 100644
--- a/Epost.DAL/CommandDAL.cs
+++ b/Epost.DAL/CommandDAL.cs
@@ -91,6 +91,18 @@ namespace Epost.DAL
         }
         #endregion
 
+        #region 格式化任务数据
+        public bool FORMAT_DEVICE(LabelParamModel model)
+        {
+
+            model.Address = "9999";
+            model.Command = "FORMAT_DEVICE";
+            model.Parameter = "";
+            model.Timeout = "0.5";
+            return Send(model);
+        }
+        #endregion
+        
         #region 导入地址信息
         public bool INPUT_ADDRESS_DATA()
         {
diff --git a/Epost.DAL/OrdersDAL.cs b/Epost.DAL/OrdersDAL.cs
index bd85f14..4755cf8 100644
--- a/Epost.DAL/OrdersDAL.cs
+++ b/Epost.DAL/OrdersDAL.cs
@@ -695,13 +695,14 @@ namespace Epost.DAL
 
 
         #region 修改门店拣货状态
-        public bool UpdateStateByOrderID(string orderid)
+        public bool UpdateStateBymatchid(string matchid)
         {
             try
             {
-                string upsql = string.Format("update orders set oprationstate=3,truequantity=quantity, state=3  where  orderid='{0}'",
-              orderid);
+                string upsql = string.Format("update orders set   state=3  where matchid='{0}'",
+               matchid);
                 long x = db.UpdateSql(upsql);
+                LogHelper.WriteLogInfo(x+"修改波次拣选完成"+upsql);
                 if (x > 0)
                     return true;
                 return false;
diff --git a/Epost.TestToolsWeb/Controllers/WebAPIController.cs b/Epost.TestToolsWeb/Controllers/WebAPIController.cs
index d2ee70a..84242e6 100644
--- a/Epost.TestToolsWeb/Controllers/WebAPIController.cs
+++ b/Epost.TestToolsWeb/Controllers/WebAPIController.cs
@@ -79,7 +79,18 @@ namespace Epost.TestToolsWeb.Controllers
                     JobCache.UpdateJobDownModelList(new List<ResultMessageModel>() { data }, EdownCommend.Create); 
                     
                 }
-            
+                if (data.Command == "JOB_Fail")
+                {
+                    LabelParamModel lbmodel = new LabelParamModel();
+                    lbmodel.Address = data.Address;
+                    lbmodel.Uid = data.Address;
+                    lbmodel.Type = data.Type;
+                    combll.FORMAT_DEVICE(lbmodel);
+                    LogHelper.WriteLogInfo("设备报错："+JsonHelper.SerializeObject(data), Log_Type.ERROR);
+                }
+                    
+
+
 
             }
             catch (Exception ex)
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index 0bf74ac..2b9c3bf 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|2025-06-15T03:14:12.6170562Z||;True|2025-06-15T10:42:25.1172247+08:00||;True|2025-06-14T13:26:43.2442778+08:00||;True|2025-06-10T13:21:34.1684919+08:00||;True|2025-06-09T11:40:40.2739751+08:00||;True|2025-06-08T16:20:45.8519262+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-06-19T08:33:25.6789576Z||;True|2025-06-19T16:31:35.8668377+08:00||;True|2025-06-17T17:16:38.1010406+08:00||;True|2025-06-15T11:14:12.6170562+08:00||;True|2025-06-15T10:42:25.1172247+08:00||;True|2025-06-14T13:26:43.2442778+08:00||;True|2025-06-10T13:21:34.1684919+08:00||;True|2025-06-09T11:40:40.2739751+08:00||;True|2025-06-08T16:20:45.8519262+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/15/2025 11:14:09</publishTime>
+      <publishTime>06/19/2025 16:31:32</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>06/15/2025 11:14:09</publishTime>
+      <publishTime>06/19/2025 16:31:32</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>02/24/2020 15:29:24</publishTime>
     </File>
     <File Include="bin/Common.dll">
-      <publishTime>06/15/2025 10:42:00</publishTime>
+      <publishTime>06/17/2025 17:16:09</publishTime>
     </File>
     <File Include="bin/Common.pdb">
-      <publishTime>06/15/2025 10:42:00</publishTime>
+      <publishTime>06/17/2025 17:16:09</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/15/2025 11:13:45</publishTime>
+      <publishTime>06/19/2025 16:31:12</publishTime>
     </File>
     <File Include="bin/Epost.BLL.pdb">
-      <publishTime>06/15/2025 11:13:45</publishTime>
+      <publishTime>06/19/2025 16:31:12</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/15/2025 10:42:00</publishTime>
+      <publishTime>06/19/2025 16:31:11</publishTime>
     </File>
     <File Include="bin/Epost.DAL.pdb">
-      <publishTime>06/15/2025 10:42:00</publishTime>
+      <publishTime>06/19/2025 16:31:11</publishTime>
     </File>
     <File Include="bin/Epost.DPS.dll">
-      <publishTime>06/15/2025 11:13:53</publishTime>
+      <publishTime>06/19/2025 16:31:16</publishTime>
     </File>
     <File Include="bin/Epost.DPS.pdb">
-      <publishTime>06/15/2025 11:13:53</publishTime>
+      <publishTime>06/19/2025 16:31:16</publishTime>
     </File>
     <File Include="bin/Epost.Model.dll">
-      <publishTime>06/08/2025 16:20:17</publishTime>
+      <publishTime>06/17/2025 17:16:08</publishTime>
     </File>
     <File Include="bin/Epost.Model.pdb">
-      <publishTime>06/08/2025 16:20:17</publishTime>
+      <publishTime>06/17/2025 17:16:08</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>06/15/2025 11:13:55</publishTime>
+      <publishTime>06/19/2025 16:31:18</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>06/08/2025 16:20:27</publishTime>
+      <publishTime>06/17/2025 17:16:18</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file