feat: Organize files into folders with easy-to-understand names that can be easily maintained

lanhlungboiz045 · lanhlungboiz045 · commit a81d5aa11d61 · 2026-03-11T13:49:42.000+07:00
diff --git a/backend/src/main/java/com/smalltrend/controller/inventory/dashboard/InventoryDashboardController.java b/backend/src/main/java/com/smalltrend/controller/inventory/dashboard/InventoryDashboardController.java
@@ -1,7 +1,7 @@
-package com.smalltrend.controller.inventory;
+package com.smalltrend.controller.inventory.dashboard;
 
 import com.smalltrend.dto.inventory.dashboard.*;
-import com.smalltrend.service.inventory.InventoryDashboardService;
+import com.smalltrend.service.inventory.dashboard.InventoryDashboardService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/backend/src/main/java/com/smalltrend/controller/inventory/disposal/DisposalVoucherController.java b/backend/src/main/java/com/smalltrend/controller/inventory/disposal/DisposalVoucherController.java
@@ -1,7 +1,7 @@
-package com.smalltrend.controller.inventory;
+package com.smalltrend.controller.inventory.disposal;
 
 import com.smalltrend.dto.inventory.disposal.*;
-import com.smalltrend.service.inventory.DisposalVoucherService;
+import com.smalltrend.service.inventory.disposal.DisposalVoucherService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/backend/src/main/java/com/smalltrend/controller/inventory/inventorycount/InventoryCountController.java b/backend/src/main/java/com/smalltrend/controller/inventory/inventorycount/InventoryCountController.java
@@ -1,8 +1,8 @@
-package com.smalltrend.controller.inventory;
+package com.smalltrend.controller.inventory.inventorycount;
 
 import com.smalltrend.dto.inventory.inventorycount.InventoryCountRequest;
 import com.smalltrend.dto.inventory.inventorycount.InventoryCountResponse;
-import com.smalltrend.service.inventory.InventoryCountService;
+import com.smalltrend.service.inventory.inventorycount.InventoryCountService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/backend/src/main/java/com/smalltrend/controller/inventory/location/LocationController.java b/backend/src/main/java/com/smalltrend/controller/inventory/location/LocationController.java
@@ -1,9 +1,9 @@
-package com.smalltrend.controller.inventory;
+package com.smalltrend.controller.inventory.location;
 
 import com.smalltrend.dto.inventory.location.FullLocationResponse;
 import com.smalltrend.dto.inventory.location.LocationRequest;
 import com.smalltrend.dto.inventory.location.LocationStockItemResponse;
-import com.smalltrend.service.inventory.LocationService;
+import com.smalltrend.service.inventory.location.LocationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/backend/src/main/java/com/smalltrend/controller/inventory/purchaseorder/PurchaseOrderController.java b/backend/src/main/java/com/smalltrend/controller/inventory/purchaseorder/PurchaseOrderController.java
@@ -1,8 +1,8 @@
-package com.smalltrend.controller.inventory;
+package com.smalltrend.controller.inventory.purchaseorder;
 
 import com.smalltrend.dto.inventory.purchaseorder.*;
 import com.smalltrend.dto.inventory.dashboard.*;
-import com.smalltrend.service.inventory.PurchaseOrderService;
+import com.smalltrend.service.inventory.purchaseorder.PurchaseOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.http.ResponseEntity;
diff --git a/backend/src/main/java/com/smalltrend/controller/inventory/purchaseorder/SupplierContractController.java b/backend/src/main/java/com/smalltrend/controller/inventory/purchaseorder/SupplierContractController.java
@@ -1,4 +1,4 @@
-package com.smalltrend.controller.inventory;
+package com.smalltrend.controller.inventory.purchaseorder;
 
 import com.smalltrend.entity.SupplierContract;
 import com.smalltrend.entity.enums.ContractStatus;
diff --git a/backend/src/main/java/com/smalltrend/controller/inventory/purchaseorder/SupplierController.java b/backend/src/main/java/com/smalltrend/controller/inventory/purchaseorder/SupplierController.java
@@ -1,4 +1,4 @@
-package com.smalltrend.controller.inventory;
+package com.smalltrend.controller.inventory.purchaseorder;
 
 import com.smalltrend.dto.supplier.SupplierDTO;
 import com.smalltrend.service.SupplierService;
diff --git a/backend/src/main/java/com/smalltrend/controller/inventory/stock/InventoryStockController.java b/backend/src/main/java/com/smalltrend/controller/inventory/stock/InventoryStockController.java
@@ -1,8 +1,8 @@
-package com.smalltrend.controller.inventory;
+package com.smalltrend.controller.inventory.stock;
 
 import com.smalltrend.dto.inventory.StockAdjustRequest;
 import com.smalltrend.dto.inventory.StockImportRequest;
-import com.smalltrend.service.inventory.InventoryStockService;
+import com.smalltrend.service.inventory.stock.InventoryStockService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/backend/src/main/java/com/smalltrend/dto/inventory/dashboard/BatchStatusResponse.java b/backend/src/main/java/com/smalltrend/dto/inventory/dashboard/BatchStatusResponse.java
@@ -18,4 +18,5 @@ public class BatchStatusResponse {
     private Integer daysUntilExpiry;
     private BigDecimal value;
     private LocalDate receivedDate;
+    private String locationName;
 }
diff --git a/backend/src/main/java/com/smalltrend/service/BarcodeLookupService.java b/backend/src/main/java/com/smalltrend/service/BarcodeLookupService.java
@@ -6,7 +6,7 @@
 import com.smalltrend.entity.UnitConversion;
 import com.smalltrend.repository.ProductVariantRepository;
 import com.smalltrend.repository.UnitConversionRepository;
-import com.smalltrend.service.inventory.InventoryStockService;
+import com.smalltrend.service.inventory.stock.InventoryStockService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
diff --git a/backend/src/main/java/com/smalltrend/service/SaleOrderService.java b/backend/src/main/java/com/smalltrend/service/SaleOrderService.java
@@ -19,7 +19,7 @@
 import com.smalltrend.repository.OrderStatusHistoryRepository;
 import com.smalltrend.repository.ProductVariantRepository;
 import com.smalltrend.repository.UserRepository;
-import com.smalltrend.service.inventory.InventoryStockService;
+import com.smalltrend.service.inventory.stock.InventoryStockService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/backend/src/main/java/com/smalltrend/service/inventory/dashboard/InventoryDashboardService.java b/backend/src/main/java/com/smalltrend/service/inventory/dashboard/InventoryDashboardService.java
@@ -1,4 +1,4 @@
-package com.smalltrend.service.inventory;
+package com.smalltrend.service.inventory.dashboard;
 
 import com.smalltrend.dto.inventory.purchaseorder.*;
 import com.smalltrend.dto.inventory.inventorycount.*;
@@ -218,6 +218,14 @@ public List<BatchStatusResponse> getBatchStatuses() {
                 BigDecimal cost = batch.getCostPrice() != null ? batch.getCostPrice() : BigDecimal.ZERO;
                 BigDecimal value = cost.multiply(BigDecimal.valueOf(qty));
                 
+                String locationName = allStocks.stream()
+                    .filter(s -> s.getBatch() != null && s.getBatch().getId().equals(batch.getId()) 
+                              && s.getQuantity() != null && s.getQuantity() > 0 
+                              && s.getLocation() != null)
+                    .map(s -> s.getLocation().getName())
+                    .distinct()
+                    .collect(Collectors.joining(", "));
+
                 String productName = batch.getVariant() != null && batch.getVariant().getProduct() != null ? 
                     batch.getVariant().getProduct().getName() : "Unknown";
                 
@@ -231,6 +239,7 @@ public List<BatchStatusResponse> getBatchStatuses() {
                     .daysUntilExpiry((int) daysUntil)
                     .value(value)
                     .receivedDate(batch.getMfgDate())
+                    .locationName(locationName)
                     .build();
             })
             .collect(Collectors.toList());
diff --git a/backend/src/main/java/com/smalltrend/service/inventory/disposal/DisposalVoucherService.java b/backend/src/main/java/com/smalltrend/service/inventory/disposal/DisposalVoucherService.java
@@ -1,4 +1,4 @@
-package com.smalltrend.service.inventory;
+package com.smalltrend.service.inventory.disposal;
 
 import com.smalltrend.dto.inventory.disposal.*;
 import com.smalltrend.entity.*;
diff --git a/backend/src/main/java/com/smalltrend/service/inventory/inventorycount/InventoryCountService.java b/backend/src/main/java/com/smalltrend/service/inventory/inventorycount/InventoryCountService.java
@@ -1,4 +1,4 @@
-package com.smalltrend.service.inventory;
+package com.smalltrend.service.inventory.inventorycount;
 
 import com.smalltrend.dto.inventory.inventorycount.*;
 import com.smalltrend.entity.InventoryCount;
diff --git a/backend/src/main/java/com/smalltrend/service/inventory/location/LocationService.java b/backend/src/main/java/com/smalltrend/service/inventory/location/LocationService.java
@@ -1,4 +1,4 @@
-package com.smalltrend.service.inventory;
+package com.smalltrend.service.inventory.location;
 
 import com.smalltrend.dto.inventory.location.FullLocationResponse;
 import com.smalltrend.dto.inventory.location.LocationRequest;
diff --git a/backend/src/main/java/com/smalltrend/service/inventory/purchaseorder/PurchaseOrderService.java b/backend/src/main/java/com/smalltrend/service/inventory/purchaseorder/PurchaseOrderService.java
@@ -1,4 +1,4 @@
-package com.smalltrend.service.inventory;
+package com.smalltrend.service.inventory.purchaseorder;
 
 import com.smalltrend.dto.inventory.purchaseorder.*;
 import com.smalltrend.dto.inventory.dashboard.*;
diff --git a/backend/src/main/java/com/smalltrend/service/inventory/stock/InventoryStockService.java b/backend/src/main/java/com/smalltrend/service/inventory/stock/InventoryStockService.java
@@ -1,4 +1,4 @@
-package com.smalltrend.service.inventory;
+package com.smalltrend.service.inventory.stock;
 
 import com.smalltrend.dto.inventory.StockAdjustRequest;
 import com.smalltrend.dto.inventory.StockImportRequest;
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
@@ -2,8 +2,8 @@ import { Navigate, Route, Routes } from "react-router-dom";
 import ProtectedRoute from "./components/common/ProtectedRoute";
 import PublicRoute from "./components/common/PublicRoute";
 import ShiftManagement from "./pages/HR/ShiftManagement";
-import PurchaseOrderList from "./pages/Inventory/PurchaseOrderList";
-import CreatePurchaseOrder from "./pages/Inventory/CreatePurchaseOrder";
+import PurchaseOrderList from "./pages/Inventory/PurchaseOrder/PurchaseOrderList";
+import CreatePurchaseOrder from "./pages/Inventory/PurchaseOrder/CreatePurchaseOrder";
 import CRMcomplain from "./pages/CRM/complain";
 import CRMcustomer from "./pages/CRM/customer";
 import CRMevent from "./pages/CRM/event";
@@ -15,12 +15,12 @@ import AttendanceManagement from "./pages/HR/AttendanceManagement";
 import EmployeeList from "./pages/HR/EmployeeList";
 import PayrollManagement from "./pages/HR/PayrollManagement";
 import UserManagement from "./pages/HR/UserManagement";
-import DisposalDetail from "./pages/Inventory/DisposalDetail";
-import DisposalList from "./pages/Inventory/DisposalList";
-import InventoryCountDetail from "./pages/Inventory/InventoryCountDetail";
-import InventoryCountList from "./pages/Inventory/InventoryCountList";
-import InventoryDashboard from "./pages/Inventory/InventoryDashboard";
-import LocationManagement from "./pages/Inventory/LocationManagement";
+import DisposalDetail from "./pages/Inventory/Disposal/DisposalDetail";
+import DisposalList from "./pages/Inventory/Disposal/DisposalList";
+import InventoryCountDetail from "./pages/Inventory/Count/InventoryCountDetail";
+import InventoryCountList from "./pages/Inventory/Count/InventoryCountList";
+import InventoryDashboard from "./pages/Inventory/Dashboard/InventoryDashboard";
+import LocationManagement from "./pages/Inventory/Location/LocationManagement";
 import POS from "./pages/Pos/pos";
 import ReportforCashier from "./pages/Pos/ReportforCashier";
 import ShiftHandover from "./pages/Pos/ShiftHandover";
diff --git a/frontend/src/components/inventory/audit/AuditSidebar.jsx b/frontend/src/components/inventory/audit/AuditSidebar.jsx
@@ -1,6 +1,6 @@
-﻿import React from "react";
+import React from "react";
 import { Save, CheckCircle } from "lucide-react";
-import { useToast } from "../ui/Toast";
+import { useToast } from "../../ui/Toast";
 
 function AuditSidebar({ totalActualStock, uncheckedCount }) {
   const toast = useToast();
diff --git a/frontend/src/components/inventory/audit/AuditTable.jsx b/frontend/src/components/inventory/audit/AuditTable.jsx
diff --git a/frontend/src/components/inventory/dashboard/ExpiringBatchesTable.jsx b/frontend/src/components/inventory/dashboard/ExpiringBatchesTable.jsx
diff --git a/frontend/src/components/inventory/dashboard/LowStockTable.jsx b/frontend/src/components/inventory/dashboard/LowStockTable.jsx
diff --git a/frontend/src/components/inventory/dashboard/StatsCards.jsx b/frontend/src/components/inventory/dashboard/StatsCards.jsx
@@ -17,7 +17,7 @@ import {
   STOCK_STATUS_CONFIG,
   BATCH_STATUS,
   BATCH_STATUS_CONFIG,
-} from "../../utils/inventory";
+} from "../../../utils/inventory";
 
 // ─── Backdrop ────────────────────────────────────────────────────
 function Backdrop({ onClose }) {
@@ -289,7 +289,7 @@ function UrgentModal({ products, batches, onClose }) {
         <div className="space-y-2">
           {lowStockItems.length === 0 && (
             <p className="text-center text-sm text-slate-400 py-8">
-              ✅ Không có sản phẩm thiếu hàng
+              Không có sản phẩm thiếu hàng
             </p>
           )}
           {lowStockItems.map((p) => {
@@ -329,7 +329,7 @@ function UrgentModal({ products, batches, onClose }) {
         <div className="space-y-2">
           {expiredBatches.length === 0 && (
             <p className="text-center text-sm text-slate-400 py-8">
-              ✅ Không có lô hàng hết hạn
+              Không có lô hàng hết hạn
             </p>
           )}
           {expiredBatches.map((b) => {
@@ -344,7 +344,8 @@ function UrgentModal({ products, batches, onClose }) {
                     {b.productName}
                   </p>
                   <p className="text-xs text-slate-500">
-                    Lô: {b.batch_code} · HSD: {formatDate(b.expiry_date)}
+                    Lô: {b.batch_code} · Kho: {b.locationName || "N/A"} · HSD:{" "}
+                    {formatDate(b.expiry_date)}
                   </p>
                 </div>
                 <div className="text-right shrink-0">
@@ -365,7 +366,7 @@ function UrgentModal({ products, batches, onClose }) {
         <div className="space-y-2">
           {expiringBatches.length === 0 && (
             <p className="text-center text-sm text-slate-400 py-8">
-              ✅ Không có lô hàng sắp hết hạn
+              Không có lô hàng sắp hết hạn
             </p>
           )}
           {expiringBatches.map((b) => {
@@ -382,7 +383,8 @@ function UrgentModal({ products, batches, onClose }) {
                     {b.productName}
                   </p>
                   <p className="text-xs text-slate-500">
-                    Lô: {b.batch_code} · HSD: {formatDate(b.expiry_date)}
+                    Lô: {b.batch_code} · Kho: {b.locationName || "N/A"} · HSD:{" "}
+                    {formatDate(b.expiry_date)}
                   </p>
                 </div>
                 <div className="text-right shrink-0">
diff --git a/frontend/src/components/inventory/dashboard/StockByProductChart.jsx b/frontend/src/components/inventory/dashboard/StockByProductChart.jsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
 import { TrendingUp, TrendingDown, BarChart3 } from "lucide-react";
-import { STOCK_STATUS_CONFIG } from "../../utils/inventory";
+import { STOCK_STATUS_CONFIG } from "../../../utils/inventory";
 
 // ─── Màu sắc bar ─────────────────────────────────────────────────
 const HIGH_COLORS = [
diff --git a/frontend/src/components/inventory/dashboard/StockHealthOverview.jsx b/frontend/src/components/inventory/dashboard/StockHealthOverview.jsx
@@ -3,7 +3,7 @@ import {
   STOCK_STATUS,
   STOCK_STATUS_CONFIG,
   formatNumber,
-} from "../../utils/inventory";
+} from "../../../utils/inventory";
 
 export default function StockHealthOverview({ products }) {
   const statusGroups = Object.values(STOCK_STATUS).map((status) => {
diff --git a/frontend/src/components/inventory/purchase/PurchaseOrderProductsTable.jsx b/frontend/src/components/inventory/purchase/PurchaseOrderProductsTable.jsx
diff --git a/frontend/src/components/inventory/purchase/PurchaseOrderRecordsTable.jsx b/frontend/src/components/inventory/purchase/PurchaseOrderRecordsTable.jsx
@@ -1,6 +1,6 @@
 ﻿import React from "react";
 import { useNavigate } from "react-router-dom";
-import { PO_STATUS_CONFIG } from "../../utils/purchaseOrder";
+import { PO_STATUS_CONFIG } from "../../../utils/purchaseOrder";
 
 function PurchaseOrderRecordsTable({ records, suppliers }) {
   const navigate = useNavigate();
diff --git a/frontend/src/components/inventory/purchase/PurchaseOrderSidebar.jsx b/frontend/src/components/inventory/purchase/PurchaseOrderSidebar.jsx
diff --git a/frontend/src/components/inventory/stock/ProductSearchList.jsx b/frontend/src/components/inventory/stock/ProductSearchList.jsx
diff --git a/frontend/src/components/inventory/stock/ProductStockTable.jsx b/frontend/src/components/inventory/stock/ProductStockTable.jsx
@@ -13,7 +13,7 @@ import {
   formatCurrency,
   formatNumber,
   STOCK_STATUS_CONFIG,
-} from "../../utils/inventory";
+} from "../../../utils/inventory";
 
 function SortIcon({ columnKey, sortConfig }) {
   if (sortConfig.key !== columnKey)
diff --git a/frontend/src/components/inventory/stock/ProductsTable.jsx b/frontend/src/components/inventory/stock/ProductsTable.jsx
diff --git a/frontend/src/pages/Inventory/Audit/InventoryAudit.jsx b/frontend/src/pages/Inventory/Audit/InventoryAudit.jsx
@@ -1,16 +1,16 @@
 import React from "react";
 import { useNavigate } from "react-router-dom";
-import { useInventoryCount } from "../../hooks/useInventoryCount";
-import { IC_STATUS } from "../../utils/inventoryCount";
+import { useInventoryCount } from "../../../hooks/useInventoryCount";
+import { IC_STATUS } from "../../../utils/inventoryCount";
 
 // Count Components
-import InventoryCountHeader from "../../components/inventory/count/InventoryCountHeader";
-import InventoryProgressBar from "../../components/inventory/count/InventoryProgressBar";
-import CountFilterBar from "../../components/inventory/count/CountFilterBar";
-import InventoryCountTable from "../../components/inventory/count/InventoryCountTable";
-import DifferenceReasonModal from "../../components/inventory/count/DifferenceReasonModal";
-import CountSummaryPanel from "../../components/inventory/count/CountSummaryPanel";
-import CountActionButtons from "../../components/inventory/count/CountActionButtons";
+import InventoryCountHeader from "../../../components/inventory/count/InventoryCountHeader";
+import InventoryProgressBar from "../../../components/inventory/count/InventoryProgressBar";
+import CountFilterBar from "../../../components/inventory/count/CountFilterBar";
+import InventoryCountTable from "../../../components/inventory/count/InventoryCountTable";
+import DifferenceReasonModal from "../../../components/inventory/count/DifferenceReasonModal";
+import CountSummaryPanel from "../../../components/inventory/count/CountSummaryPanel";
+import CountActionButtons from "../../../components/inventory/count/CountActionButtons";
 
 function InventoryAudit() {
   const navigate = useNavigate();
diff --git a/frontend/src/pages/Inventory/Count/InventoryCountDetail.jsx b/frontend/src/pages/Inventory/Count/InventoryCountDetail.jsx
@@ -1,16 +1,16 @@
 import React from "react";
 import { useNavigate, useParams } from "react-router-dom";
-import { useInventoryCount } from "../../hooks/useInventoryCount";
-import { IC_STATUS } from "../../utils/inventoryCount";
+import { useInventoryCount } from "../../../hooks/useInventoryCount";
+import { IC_STATUS } from "../../../utils/inventoryCount";
 
 // Count Components
-import InventoryCountHeader from "../../components/inventory/count/InventoryCountHeader";
-import InventoryProgressBar from "../../components/inventory/count/InventoryProgressBar";
-import CountFilterBar from "../../components/inventory/count/CountFilterBar";
-import InventoryCountTable from "../../components/inventory/count/InventoryCountTable";
-import DifferenceReasonModal from "../../components/inventory/count/DifferenceReasonModal";
-import CountSummaryPanel from "../../components/inventory/count/CountSummaryPanel";
-import CountActionButtons from "../../components/inventory/count/CountActionButtons";
+import InventoryCountHeader from "../../../components/inventory/count/InventoryCountHeader";
+import InventoryProgressBar from "../../../components/inventory/count/InventoryProgressBar";
+import CountFilterBar from "../../../components/inventory/count/CountFilterBar";
+import InventoryCountTable from "../../../components/inventory/count/InventoryCountTable";
+import DifferenceReasonModal from "../../../components/inventory/count/DifferenceReasonModal";
+import CountSummaryPanel from "../../../components/inventory/count/CountSummaryPanel";
+import CountActionButtons from "../../../components/inventory/count/CountActionButtons";
 
 function InventoryCountDetail() {
   const navigate = useNavigate();
diff --git a/frontend/src/pages/Inventory/Count/InventoryCountList.jsx b/frontend/src/pages/Inventory/Count/InventoryCountList.jsx
@@ -9,13 +9,13 @@ import {
   ChevronRight,
   ArrowLeft,
 } from "lucide-react";
-import { useInventoryCountList } from "../../hooks/useInventoryCountList";
+import { useInventoryCountList } from "../../../hooks/useInventoryCountList";
 import {
   IC_STATUS,
   IC_STATUS_CONFIG,
   formatVNDCount,
-} from "../../utils/inventoryCount";
-import CustomSelect from "../../components/common/CustomSelect";
+} from "../../../utils/inventoryCount";
+import CustomSelect from "../../../components/common/CustomSelect";
 
 function InventoryCountList() {
   const navigate = useNavigate();
diff --git a/frontend/src/pages/Inventory/Dashboard/InventoryDashboard.jsx b/frontend/src/pages/Inventory/Dashboard/InventoryDashboard.jsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { RefreshCw, Plus } from "lucide-react";
 import { useNavigate } from "react-router-dom";
-import { useInventoryDashboard } from "../../hooks/useInventoryData";
-import StatsCards from "../../components/inventory/StatsCards";
-import StockByProductChart from "../../components/inventory/StockByProductChart";
+import { useInventoryDashboard } from "../../../hooks/useInventoryData";
+import StatsCards from "../../../components/inventory/dashboard/StatsCards";
+import StockByProductChart from "../../../components/inventory/dashboard/StockByProductChart";
 
 function InventoryDashboard() {
   const navigate = useNavigate();
diff --git a/frontend/src/pages/Inventory/Disposal/DisposalCreate.jsx b/frontend/src/pages/Inventory/Disposal/DisposalCreate.jsx
@@ -4,9 +4,9 @@ import {
   getExpiredBatches,
   getNextDisposalCode,
   createDisposalVoucher,
-} from "../../services/disposalService";
-import { getActiveLocations } from "../../services/inventoryService";
-import { formatCurrency } from "../../utils/inventory";
+} from "../../../services/disposalService";
+import { getActiveLocations } from "../../../services/inventoryService";
+import { formatCurrency } from "../../../utils/inventory";
 
 const REASON_OPTIONS = [
   { value: "EXPIRED", label: "Hết hạn" },
diff --git a/frontend/src/pages/Inventory/Disposal/DisposalDetail.jsx b/frontend/src/pages/Inventory/Disposal/DisposalDetail.jsx
diff --git a/frontend/src/pages/Inventory/Disposal/DisposalList.jsx b/frontend/src/pages/Inventory/Disposal/DisposalList.jsx
diff --git a/frontend/src/pages/Inventory/Location/LocationManagement.jsx b/frontend/src/pages/Inventory/Location/LocationManagement.jsx
diff --git a/frontend/src/pages/Inventory/PurchaseOrder/CreatePurchaseOrder.jsx b/frontend/src/pages/Inventory/PurchaseOrder/CreatePurchaseOrder.jsx
diff --git a/frontend/src/pages/Inventory/PurchaseOrder/PurchaseOrderList.jsx b/frontend/src/pages/Inventory/PurchaseOrder/PurchaseOrderList.jsx

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.smalltrend.controller.inventory;`
	`1`	`+package com.smalltrend.controller.inventory.purchaseorder;`
`2`	`2`
`3`	`3`	`import com.smalltrend.entity.SupplierContract;`
`4`	`4`	`import com.smalltrend.entity.enums.ContractStatus;`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,5 @@ public class BatchStatusResponse {`
`18`	`18`	`private Integer daysUntilExpiry;`
`19`	`19`	`private BigDecimal value;`
`20`	`20`	`private LocalDate receivedDate;`
	`21`	`+ private String locationName;`
`21`	`22`	`}`