diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
index b00b2c5e8..fb9a27201 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
@@ -360,10 +360,6 @@ public class UnplannedIssueJobAppService
 
                     switch (locationDto.Type)
                     {
-                        case EnumLocationType.SEMI:
-                            job.IsHasPackingCode = 0;
-                            job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
-                            break;
                         case EnumLocationType.CUST:
                             job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
@@ -384,11 +380,7 @@ public class UnplannedIssueJobAppService
                             job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                             break;
-                        case EnumLocationType.DimensionalStorehouse:
-                            job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
-                            job.IsHasPackingCode = 0;
-                            break;
-
+                        //------------------
                         case EnumLocationType.KittingWip:
                             job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
@@ -397,10 +389,16 @@ public class UnplannedIssueJobAppService
                             job.IsHasPackingCode = 0;
                             job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
                             break;
+                        case EnumLocationType.SEMI:
+                            job.IsHasPackingCode = 0;
+                            job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
+                            break;
+                        case EnumLocationType.DimensionalStorehouse:
+                            job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
+                            job.IsHasPackingCode = 0;
+                            break;
                     }
 
-
-
                     job.ItemCode = requestDtoDetail.ItemCode;
                     job.ItemName = requestDtoDetail.ItemName;
                     job.ItemDesc1 = requestDtoDetail.ItemDesc1;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
index d00cb7589..0fd0d5e92 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
@@ -219,10 +219,6 @@ public class UnplannedReceiptJobAppService
 
             switch(locationDtos.First().Type)
             {
-                case EnumLocationType.SEMI:
-                    job.IsHasPackingCode = 0;
-                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
-                    break;
                 case EnumLocationType.CUST:
                     job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
@@ -243,11 +239,7 @@ public class UnplannedReceiptJobAppService
                     job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
                     break;
-                case EnumLocationType.DimensionalStorehouse:
-                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
-                    job.IsHasPackingCode = 0;
-                    break;
-
+                //--------------
                 case EnumLocationType.KittingWip:
                     job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip;
@@ -256,6 +248,14 @@ public class UnplannedReceiptJobAppService
                     job.IsHasPackingCode = 0;
                     job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip;
                     break;
+                case EnumLocationType.SEMI:
+                    job.IsHasPackingCode = 0;
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    break;
+                case EnumLocationType.DimensionalStorehouse:
+                    job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw;
+                    job.IsHasPackingCode = 0;
+                    break;
             }
 
             jobs.Add(job);