diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs
index 2748602db..d51a9a303 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs
@@ -76,7 +76,7 @@ public class EquipmentLocAppService
         {
             var entity = ObjectMapper.Map<EquipmentLocEditInput, EquipmentLoc>(input);
             await _repository.UpsertAsync(entity).ConfigureAwait(false);
-            var entity1=_repository.WithDetails().FirstOrDefault(p => p.Code == input.Code);
+            var entity1=_repository.WithDetails().FirstOrDefault(p => p.Code == input.Code && p.LocCode == input.LocCode);
             return ObjectMapper.Map<EquipmentLoc,EquipmentLocDTO>(entity1);
         }
         else
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentPartCodeAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentPartCodeAppService.cs
index ffccac6cd..6b56e8522 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentPartCodeAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentPartCodeAppService.cs
@@ -79,7 +79,7 @@ public class EquipmentPartCodeAppService
             var entity = ObjectMapper.Map<EquipmentPartCodeEditInput, EquipmentPartCode>(input);
           
             await _repository.UpsertAsync(entity).ConfigureAwait(false);
-            var entity1=_repository.WithDetails().FirstOrDefault(p => p.Code == input.Code);
+            var entity1=_repository.WithDetails().FirstOrDefault(p => p.Code == input.Code && p.PartCode == input.PartCode);
             return ObjectMapper.Map<EquipmentPartCode,EquipmentPartCodeDTO>(entity1);
         }
         else