diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/CountJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/CountJobEventHandler.cs
index 6560175aa..f31d86af6 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/CountJobEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/CountJobEventHandler.cs
@@ -59,7 +59,10 @@ public class CountJobEventHandler :
 
         foreach (var detail in countPlanUpdateInput.Details)
         {
-            detail.DetailStatus = EnumCountStatus.Completed;
+            if (detail.FinalCountQty != 0)
+            {
+                detail.DetailStatus = EnumCountStatus.Completed;
+            }
             await TrySetDetailPropertiesAsync(detail).ConfigureAwait(false);
         }
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CountPlanEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CountPlanEventHandler.cs
index a453c0ef9..fbad39add 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CountPlanEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CountPlanEventHandler.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -99,6 +100,7 @@ public class CountPlanEventHandler
         foreach (var job in jobs)
         {
             var countNote = ObjectMapper.Map<CountJob, CountNote>(job);
+            countNote.EndTime = DateTime.Now;
             notes.Add(countNote);
         }
         if (notes.Count > 0)