diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs
index df6a7d97e..a4d5dae11 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs
@@ -65,7 +65,7 @@ public class UnplannedIssueRequestEventHandler
     public virtual async Task HandleEventAsync(SfsHandledEntityEventData<UnplannedIssueRequest> eventData)
     {
         var entity = eventData.Entity;
-        if (entity.UnplannedIssueType == Shared.Domain.Shared.Enums.Store.EnumUnplannedIssueType.Wip)
+        if (entity.UnplannedIssueType == Shared.Domain.Shared.Enums.Store.EnumUnplannedIssueType.Wip&&!string.IsNullOrEmpty(entity.OANumber))
         {
             entity.RequestStatus = EnumRequestStatus.Completed;
         }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedReceiptRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedReceiptRequestEventHandler.cs
index d37846ca6..87ef2324a 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedReceiptRequestEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedReceiptRequestEventHandler.cs
@@ -66,7 +66,7 @@ public class UnplannedReceiptRequestEventHandler
     {
         var entity = eventData.Entity;
 
-        if (entity.UnplannedReceiptType == Shared.Domain.Shared.Enums.Store.EnumUnplannedReceiptType.Wip)
+        if (entity.UnplannedReceiptType == Shared.Domain.Shared.Enums.Store.EnumUnplannedReceiptType.Wip&&!string.IsNullOrEmpty(entity.OANumber))
         {
             entity.RequestStatus = EnumRequestStatus.Completed;
         }