feat: 實作銷售單匯入管理、貨道扣庫優化及 UI 細節調整
All checks were successful
Koori-ERP-Deploy-System / deploy-demo (push) Has been skipped
Koori-ERP-Deploy-System / deploy-production (push) Successful in 1m8s

This commit is contained in:
2026-02-09 14:36:47 +08:00
parent 590580e20a
commit b6fe9ad9f3
22 changed files with 1274 additions and 33 deletions

View File

@@ -1160,3 +1160,58 @@ import { Pencil } from 'lucide-react';
- **取消按鈕**`variant="outline"`,且為 `button-outlined-primary`
- **提交按鈕**`button-filled-primary`,且在處理中時顯示 `Loader2`
---
## 16. 詳情頁面項目清單規範 (Detail Page Item List Standards)
為了確保詳情頁面(如:採購單詳情、進貨單詳情、銷售匯入詳情)的資訊層級清晰且視覺統一,所有項目清單必須遵循以下規範。
### 16.1 容器結構 (Container Structure)
項目清單應封裝在一個帶有內距的卡片容器中,而不是讓表格直接緊貼外層卡片邊緣。
1. **外層卡片**`bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden`
2. **標題區塊**`p-6 border-b border-gray-100 bg-gray-50/30`
3. **內容內距**:標題下方的內容區塊應加上 `p-6`
4. **表格包裹層**:表格應再包裹一層 `border rounded-lg overflow-hidden`,以確保表格內部的邊角與隔線視覺完整。
```tsx
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
{/* 標題 */}
<div className="p-6 border-b border-gray-100 bg-gray-50/30">
<h2 className="text-lg font-bold text-gray-900">項目清單標題</h2>
</div>
{/* 內容區塊 */}
<div className="p-6">
<div className="border rounded-lg overflow-hidden">
<Table>
<TableHeader>
<TableRow className="bg-gray-50 hover:bg-gray-50">
{/* 標頭欄位 */}
</TableRow>
</TableHeader>
<TableBody>
{/* 表格內容 */}
</TableBody>
</Table>
</div>
{/* 若有分頁,直接放在 p-6 容器內,並加 mt-6 分隔 */}
<div className="mt-6">
<Pagination ... />
</div>
</div>
</div>
```
### 16.2 表格樣式細節 (Table Styling)
1. **標頭背景**`TableHeader` 的第一個 `TableRow` 應使用 `bg-gray-50 hover:bg-gray-50` 強化視覺區隔。
2. **文字顏色**:主體文字使用 `text-gray-900`(標題/重要數據)或 `text-gray-500`(輔助/序號)。
3. **數據對齊**
* **數量/序號**:文字置中 (`text-center`) 或依據數據類型對齊。
* **金額**:金額欄位必須使用 `text-right` 並視情況加粗 (`font-bold`) 或加上 `text-primary-main` 顏色。
4. **表格隔線**:確保表格具有清晰但不過於突出的水平隔線,提升長列表的可讀性。

View File

@@ -15,16 +15,15 @@ interface InventoryServiceInterface
public function checkStock(int $productId, int $warehouseId, float $quantity): bool;
/**
* Decrease stock for a product (e.g., when an order is placed).
*
* @param int $productId
* @param int $warehouseId
* @param float $quantity
* @param string|null $reason
* @param bool $force
* @param string|null $slot
* @return void
*/
public function decreaseStock(int $productId, int $warehouseId, float $quantity, ?string $reason = null, bool $force = false): void;
public function decreaseStock(int $productId, int $warehouseId, float $quantity, ?string $reason = null, bool $force = false, ?string $slot = null): void;
/**
* Get all active warehouses.

View File

@@ -555,6 +555,7 @@ class InventoryController extends Controller
'userName' => $user ? $user->name : '系統',
'actualTime' => $tx->actual_time ? $tx->actual_time->format('Y-m-d H:i') : $tx->created_at->format('Y-m-d H:i'),
'batchNumber' => $tx->inventory?->batch_number ?? '-', // 補上批號資訊
'slot' => $tx->inventory?->location, // 加入貨道資訊
];
});
@@ -585,7 +586,7 @@ class InventoryController extends Controller
$userIds = $inventory->transactions->pluck('user_id')->filter()->unique()->toArray();
$users = $this->coreService->getUsersByIds($userIds)->keyBy('id');
$transactions = $inventory->transactions->map(function ($tx) use ($users) {
$transactions = $inventory->transactions->map(function ($tx) use ($users, $inventory) {
$user = $tx->user_id ? ($users[$tx->user_id] ?? null) : null;
return [
'id' => (string) $tx->id,
@@ -596,6 +597,7 @@ class InventoryController extends Controller
'reason' => $tx->reason,
'userName' => $user ? $user->name : '系統', // 手動對應
'actualTime' => $tx->actual_time ? $tx->actual_time->format('Y-m-d H:i') : $tx->created_at->format('Y-m-d H:i'),
'slot' => $inventory->location, // 加入貨道資訊
];
});

View File

@@ -59,13 +59,18 @@ class InventoryService implements InventoryServiceInterface
return $stock >= $quantity;
}
public function decreaseStock(int $productId, int $warehouseId, float $quantity, ?string $reason = null, bool $force = false): void
public function decreaseStock(int $productId, int $warehouseId, float $quantity, ?string $reason = null, bool $force = false, ?string $slot = null): void
{
DB::transaction(function () use ($productId, $warehouseId, $quantity, $reason, $force) {
$inventories = Inventory::where('product_id', $productId)
DB::transaction(function () use ($productId, $warehouseId, $quantity, $reason, $force, $slot) {
$query = Inventory::where('product_id', $productId)
->where('warehouse_id', $warehouseId)
->where('quantity', '>', 0)
->orderBy('arrival_date', 'asc')
->where('quantity', '>', 0);
if ($slot) {
$query->where('location', $slot);
}
$inventories = $query->orderBy('arrival_date', 'asc')
->get();
$remainingToDecrease = $quantity;
@@ -80,19 +85,25 @@ class InventoryService implements InventoryServiceInterface
if ($remainingToDecrease > 0) {
if ($force) {
// Find any existing inventory record in this warehouse to subtract from, or create one
$inventory = Inventory::where('product_id', $productId)
->where('warehouse_id', $warehouseId)
->first();
// Find any existing inventory record in this warehouse/slot to subtract from, or create one
$query = Inventory::where('product_id', $productId)
->where('warehouse_id', $warehouseId);
if ($slot) {
$query->where('location', $slot);
}
$inventory = $query->first();
if (!$inventory) {
$inventory = Inventory::create([
'warehouse_id' => $warehouseId,
'product_id' => $productId,
'location' => $slot,
'quantity' => 0,
'unit_cost' => 0,
'total_value' => 0,
'batch_number' => 'POS-AUTO-' . time(),
'batch_number' => 'POS-AUTO-' . ($slot ? $slot . '-' : '') . time(),
'arrival_date' => now(),
'origin_country' => 'TW',
'quality_status' => 'normal',

View File

@@ -0,0 +1,152 @@
<?php
namespace App\Modules\Sales\Controllers;
use App\Http\Controllers\Controller;
use App\Modules\Sales\Models\SalesImportBatch;
use App\Modules\Sales\Imports\SalesImport;
use App\Modules\Inventory\Services\InventoryService; // Assuming this exists or we need to use ProductService
use Illuminate\Http\Request;
use Inertia\Inertia;
use Maatwebsite\Excel\Facades\Excel;
use Illuminate\Support\Facades\DB;
class SalesImportController extends Controller
{
public function index(Request $request)
{
$perPage = $request->input('per_page', 10);
$batches = SalesImportBatch::with('importer')
->orderByDesc('created_at')
->paginate($perPage)
->withQueryString();
return Inertia::render('Sales/Import/Index', [
'batches' => $batches,
'filters' => [
'per_page' => $perPage,
],
]);
}
public function create()
{
return Inertia::render('Sales/Import/Create');
}
public function store(Request $request)
{
$request->validate([
'file' => 'required|file|mimes:xlsx,xls,csv,zip',
]);
DB::transaction(function () use ($request) {
$batch = SalesImportBatch::create([
'import_date' => now(),
'imported_by' => auth()->id(),
'status' => 'pending',
'tenant_id' => tenant('id'), // If tenant context requires it, but usually automatic
]);
Excel::import(new SalesImport($batch), $request->file('file'));
});
return redirect()->route('sales-imports.index')->with('success', '匯入成功,請確認內容。');
}
public function show(Request $request, SalesImportBatch $import)
{
$import->load(['items', 'importer']);
$perPage = $request->input('per_page', 10);
return Inertia::render('Sales/Import/Show', [
'import' => $import,
'items' => $import->items()->with(['product', 'warehouse'])->paginate($perPage)->withQueryString(),
'filters' => [
'per_page' => $perPage,
],
]);
}
public function confirm(SalesImportBatch $import, InventoryService $inventoryService)
{
if ($import->status !== 'pending') {
return back()->with('error', '此批次無法確認。');
}
DB::transaction(function () use ($import, $inventoryService) {
// 1. Prepare Aggregation
$aggregatedDeductions = []; // Key: "warehouse_id:product_id:slot"
// Pre-load necessary warehouses for matching
$machineIds = $import->items->pluck('machine_id')->filter()->unique();
$warehouses = \App\Modules\Inventory\Models\Warehouse::whereIn('code', $machineIds)->get()->keyBy('code');
foreach ($import->items as $item) {
// Only process shipped items with a valid product
if ($item->product_id && $item->original_status === '已出貨') {
// Resolve Warehouse from Machine ID
$warehouse = $warehouses->get($item->machine_id);
// Skip if machine_id is empty or warehouse not found
if (!$warehouse) {
continue;
}
// Aggregation Key includes Slot (貨道)
$slot = $item->slot ?: '';
$key = "{$warehouse->id}:{$item->product_id}:{$slot}";
if (!isset($aggregatedDeductions[$key])) {
$aggregatedDeductions[$key] = [
'warehouse_id' => $warehouse->id,
'product_id' => $item->product_id,
'slot' => $slot,
'quantity' => 0,
'details' => []
];
}
$aggregatedDeductions[$key]['quantity'] += $item->quantity;
$aggregatedDeductions[$key]['details'][] = $item->transaction_serial;
}
}
// 2. Execute Aggregated Deductions
foreach ($aggregatedDeductions as $deduction) {
// Construct a descriptive reason
$serialCount = count($deduction['details']);
$reason = "銷售出貨彙總 (批號: {$import->id}, 貨道: {$deduction['slot']}, 共 {$serialCount} 筆交易)";
$inventoryService->decreaseStock(
$deduction['product_id'],
$deduction['warehouse_id'],
$deduction['quantity'],
$reason,
true, // Force deduction
$deduction['slot'] // Location/Slot
);
}
// 3. Update Batch Status
$import->update([
'status' => 'confirmed',
'confirmed_at' => now(),
]);
});
return redirect()->route('sales-imports.index')->with('success', '已彙總(含貨道)並扣除庫存。');
}
public function destroy(SalesImportBatch $import)
{
if ($import->status !== 'pending') {
return back()->with('error', '只能刪除待確認的批次。');
}
$import->delete();
return redirect()->route('sales-imports.index')->with('success', '已刪除匯入批次。');
}
}

View File

@@ -0,0 +1,24 @@
<?php
namespace App\Modules\Sales\Imports;
use App\Modules\Sales\Models\SalesImportBatch;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
class SalesImport implements WithMultipleSheets
{
protected $batch;
public function __construct(SalesImportBatch $batch)
{
$this->batch = $batch;
}
public function sheets(): array
{
// Only import the first sheet (index 0)
return [
0 => new SalesImportSheet($this->batch),
];
}
}

View File

@@ -0,0 +1,106 @@
<?php
namespace App\Modules\Sales\Imports;
use App\Modules\Sales\Models\SalesImportBatch;
use App\Modules\Sales\Models\SalesImportItem;
use App\Modules\Inventory\Models\Product;
use Illuminate\Support\Collection;
use Maatwebsite\Excel\Concerns\ToCollection;
use Maatwebsite\Excel\Concerns\WithStartRow;
use Carbon\Carbon;
class SalesImportSheet implements ToCollection, WithStartRow
{
protected $batch;
protected $products;
public function __construct(SalesImportBatch $batch)
{
$this->batch = $batch;
// Pre-load all products to minimize queries (keyed by code)
$this->products = Product::pluck('id', 'code'); // assumes code is unique
}
public function startRow(): int
{
return 3;
}
public function collection(Collection $rows)
{
$totalQuantity = 0;
$totalAmount = 0;
$items = [];
foreach ($rows as $row) {
// Index mapping based on analysis:
// 0: 銷貨單號 (Serial)
// 1: 機台編號 (Machine ID)
// 4: 訂單狀態 (Original Status)
// 7: 產品代號 (Product Code)
// 9: 銷貨日期 (Transaction At)
// 11: 金額 (Amount)
// 19: 貨道 (Slot)
// Quantity default to 1
$serial = $row[0];
$machineId = $row[1];
$originalStatus = $row[4];
$productCode = $row[7];
$transactionAt = $row[9];
$amount = $row[11];
$slot = $row[19] ?? null;
// Skip empty rows
if (empty($serial) && empty($productCode)) {
continue;
}
// Parse Date
try {
// Formatting might be needed depending on Excel date format
$transactionAt = Carbon::parse($transactionAt);
} catch (\Exception $e) {
$transactionAt = now();
}
$quantity = 1; // Default
// Clean amount (remove comma etc if needed)
$amount = is_numeric($amount) ? $amount : 0;
$items[] = [
'batch_id' => $this->batch->id,
'machine_id' => $machineId,
'slot' => $slot,
'product_code' => $productCode,
'product_id' => $this->products[$productCode] ?? null,
'transaction_at' => $transactionAt,
'transaction_serial' => $serial,
'quantity' => (int)$quantity,
'amount' => $amount,
'original_status' => $originalStatus,
'created_at' => now(),
'updated_at' => now(),
];
$totalQuantity += $quantity;
$totalAmount += $amount;
}
// Bulk insert items (chunk if necessary, but assuming reasonable size)
foreach (array_chunk($items, 1000) as $chunk) {
SalesImportItem::insert($chunk);
}
// Update Batch Totals
// Increment totals instead of overwriting, in case we decide to process multiple sheets later?
// But for now, since we only process sheet 0, overwriting or incrementing is fine.
// Given we strictly return [0 => ...], only one sheet runs.
$this->batch->update([
'total_quantity' => $totalQuantity,
'total_amount' => $totalAmount,
]);
}
}

View File

@@ -0,0 +1,43 @@
<?php
namespace App\Modules\Sales\Models;
use App\Modules\Core\Models\User;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
class SalesImportBatch extends Model
{
use HasFactory;
protected $table = 'sales_import_batches';
protected $fillable = [
'import_date',
'total_quantity',
'total_amount',
'status',
'imported_by',
'confirmed_at',
'note',
];
protected $casts = [
'import_date' => 'date',
'confirmed_at' => 'datetime',
'total_quantity' => 'decimal:4',
'total_amount' => 'decimal:4',
];
public function items(): HasMany
{
return $this->hasMany(SalesImportItem::class, 'batch_id');
}
public function importer(): BelongsTo
{
return $this->belongsTo(User::class, 'imported_by');
}
}

View File

@@ -0,0 +1,51 @@
<?php
namespace App\Modules\Sales\Models;
use App\Modules\Inventory\Models\Product;
use App\Modules\Inventory\Models\Warehouse;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class SalesImportItem extends Model
{
use HasFactory;
protected $table = 'sales_import_items';
protected $fillable = [
'batch_id',
'machine_id',
'slot',
'product_code',
'product_id',
'transaction_at',
'transaction_serial',
'quantity',
'amount',
'original_status',
];
protected $casts = [
'transaction_at' => 'datetime',
'quantity' => 'integer',
'amount' => 'decimal:4',
'original_status' => 'string',
];
public function batch(): BelongsTo
{
return $this->belongsTo(SalesImportBatch::class, 'batch_id');
}
public function product(): BelongsTo
{
return $this->belongsTo(Product::class, 'product_id');
}
public function warehouse(): BelongsTo
{
return $this->belongsTo(Warehouse::class, 'machine_id', 'code');
}
}

View File

@@ -0,0 +1,13 @@
<?php
use Illuminate\Support\Facades\Route;
use App\Modules\Sales\Controllers\SalesImportController;
Route::middleware(['auth', 'verified'])->prefix('sales')->name('sales-imports.')->group(function () {
Route::get('/imports', [SalesImportController::class, 'index'])->name('index');
Route::get('/imports/create', [SalesImportController::class, 'create'])->name('create');
Route::post('/imports', [SalesImportController::class, 'store'])->name('store');
Route::get('/imports/{import}', [SalesImportController::class, 'show'])->name('show');
Route::post('/imports/{import}/confirm', [SalesImportController::class, 'confirm'])->name('confirm');
Route::delete('/imports/{import}', [SalesImportController::class, 'destroy'])->name('destroy');
});

View File

@@ -11,16 +11,18 @@ return new class extends Migration
*/
public function up(): void
{
Schema::create('personal_access_tokens', function (Blueprint $table) {
$table->id();
$table->morphs('tokenable');
$table->text('name');
$table->string('token', 64)->unique();
$table->text('abilities')->nullable();
$table->timestamp('last_used_at')->nullable();
$table->timestamp('expires_at')->nullable()->index();
$table->timestamps();
});
if (!Schema::hasTable('personal_access_tokens')) {
Schema::create('personal_access_tokens', function (Blueprint $table) {
$table->id();
$table->morphs('tokenable');
$table->text('name');
$table->string('token', 64)->unique();
$table->text('abilities')->nullable();
$table->timestamp('last_used_at')->nullable();
$table->timestamp('expires_at')->nullable()->index();
$table->timestamps();
});
}
}
/**

View File

@@ -0,0 +1,52 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('sales_import_batches', function (Blueprint $table) {
$table->id();
$table->date('import_date')->default(now());
$table->decimal('total_quantity', 12, 4)->default(0);
$table->decimal('total_amount', 12, 4)->default(0);
$table->string('status')->default('pending')->comment('pending, confirmed, cancelled');
$table->foreignId('imported_by')->nullable()->constrained('users')->nullOnDelete();
$table->timestamp('confirmed_at')->nullable();
$table->text('note')->nullable();
$table->timestamps();
});
Schema::create('sales_import_items', function (Blueprint $table) {
$table->id();
$table->foreignId('batch_id')->constrained('sales_import_batches')->cascadeOnDelete();
$table->string('machine_id')->nullable()->comment('機台編號');
$table->string('product_code')->comment('商品代碼');
// product_id could be null if product not found at import time, but we should try to link it.
// Constraint might fail if product doesn't exist, so maybe just foreignId without constrained first,
// or nullable constrained. Since we might import data for products not yet in system?
// Better to allow null product_id.
$table->foreignId('product_id')->nullable()->constrained('products')->nullOnDelete();
$table->timestamp('transaction_at')->nullable()->comment('交易時間');
$table->string('transaction_serial')->nullable()->comment('交易序號');
$table->decimal('quantity', 12, 4)->default(0);
$table->decimal('amount', 12, 4)->default(0);
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('sales_import_items');
Schema::dropIfExists('sales_import_batches');
}
};

View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('sales_import_items', function (Blueprint $table) {
$table->string('original_status')->nullable()->after('amount')->comment('原始檔案狀態');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('sales_import_items', function (Blueprint $table) {
$table->dropColumn('original_status');
});
}
};

View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('sales_import_items', function (Blueprint $table) {
$table->string('slot')->nullable()->after('machine_id')->comment('貨道');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('sales_import_items', function (Blueprint $table) {
$table->dropColumn('slot');
});
}
};

Binary file not shown.

View File

@@ -9,6 +9,7 @@ export interface Transaction {
userName: string;
actualTime: string;
batchNumber?: string; // 商品層級查詢時顯示批號
slot?: string; // 貨道資訊
}
interface TransactionTableProps {
@@ -27,6 +28,8 @@ export default function TransactionTable({ transactions, showBatchNumber = false
// 自動偵測是否需要顯示批號(如果任一筆記錄有 batchNumber
const shouldShowBatchNumber = showBatchNumber || transactions.some(tx => tx.batchNumber);
// 自動偵測是否需要顯示貨道(如果任一筆記錄有 slot
const shouldShowSlot = transactions.some(tx => tx.slot);
return (
<div className="overflow-x-auto">
@@ -39,6 +42,7 @@ export default function TransactionTable({ transactions, showBatchNumber = false
<th className="px-4 py-3"></th>
<th className="px-4 py-3 text-right"></th>
<th className="px-4 py-3 text-right"></th>
{shouldShowSlot && <th className="px-4 py-3"></th>}
<th className="px-4 py-3"></th>
<th className="px-4 py-3">/</th>
</tr>
@@ -66,6 +70,9 @@ export default function TransactionTable({ transactions, showBatchNumber = false
{tx.quantity > 0 ? '+' : ''}{tx.quantity}
</td>
<td className="px-4 py-3 text-right">{tx.balanceAfter}</td>
{shouldShowSlot && (
<td className="px-4 py-3 font-medium text-primary-main">{tx.slot || '-'}</td>
)}
<td className="px-4 py-3">{tx.userName}</td>
<td className="px-4 py-3 text-gray-500">{tx.reason || '-'}</td>
</tr>

View File

@@ -23,7 +23,9 @@ import {
FileSpreadsheet,
BookOpen,
ClipboardCheck,
ArrowLeftRight
ArrowLeftRight,
TrendingUp,
FileUp
} from "lucide-react";
import { toast, Toaster } from "sonner";
import { useState, useEffect, useMemo, useRef } from "react";
@@ -159,6 +161,21 @@ export default function AuthenticatedLayout({
},
],
},
{
id: "sales-management",
label: "銷售管理",
icon: <TrendingUp className="h-5 w-5" />,
// permission: ["sales.view_imports"], // Temporarily disabled for immediate visibility
children: [
{
id: "sales-import-list",
label: "銷售單匯入",
icon: <FileUp className="h-4 w-4" />,
route: "/sales/imports",
// permission: "sales.view_imports",
},
],
},
{
id: "production-management",
label: "生產管理",

View File

@@ -140,15 +140,15 @@ export default function ViewGoodsReceiptPage({ receipt }: Props) {
</div>
{/* 品項清單卡片 */}
<div className="bg-white rounded-lg border shadow-sm overflow-hidden">
<div className="p-6 border-b border-gray-100">
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
<div className="p-6 border-b border-gray-100 bg-gray-50/30">
<h2 className="text-lg font-bold text-gray-900"></h2>
</div>
<div className="p-0">
<div className="overflow-x-auto">
<div className="p-6">
<div className="border rounded-lg overflow-hidden">
<Table>
<TableHeader>
<TableRow className="bg-gray-50/50">
<TableRow className="bg-gray-50 hover:bg-gray-50">
<TableHead className="w-[80px] text-center">#</TableHead>
<TableHead></TableHead>
<TableHead className="text-right"></TableHead>

View File

@@ -0,0 +1,90 @@
import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout';
import { Head, useForm, Link } from '@inertiajs/react';
import { Button } from '@/Components/ui/button';
import { Input } from '@/Components/ui/input';
import { Label } from '@/Components/ui/label';
import { Upload, ArrowLeft, FileSpreadsheet } from 'lucide-react';
import React from 'react';
export default function SalesImportCreate() {
const { data, setData, post, processing, errors } = useForm({
file: null as File | null,
});
const submit = (e: React.FormEvent) => {
e.preventDefault();
post(route('sales-imports.store'));
};
return (
<AuthenticatedLayout
breadcrumbs={[
{ label: '銷售管理', href: '#' },
{ label: '銷售單匯入', href: route('sales-imports.index') },
{ label: '新增匯入', href: route('sales-imports.create'), isPage: true },
]}
>
<Head title="新增銷售匯入" />
<div className="container mx-auto p-6 max-w-3xl">
<div className="mb-6">
<Link href={route('sales-imports.index')}>
<Button variant="outline" type="button" className="gap-2 mb-4">
<ArrowLeft className="h-4 w-4" />
</Button>
</Link>
<h1 className="text-2xl font-bold text-gray-900 flex items-center gap-2">
<FileSpreadsheet className="h-6 w-6 text-primary-main" />
</h1>
</div>
<div className="bg-white rounded-lg border shadow-sm p-8">
<form onSubmit={submit} className="space-y-6">
<div className="space-y-2">
<Label htmlFor="file" className="text-lg font-medium"> Excel </Label>
<div className="border-2 border-dashed border-gray-300 rounded-xl p-10 flex flex-col items-center justify-center bg-gray-50 hover:bg-gray-100 transition-colors cursor-pointer relative">
<Input
id="file"
type="file"
accept=".xlsx,.xls,.csv"
onChange={(e) => setData('file', e.target.files ? e.target.files[0] : null)}
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
/>
<Upload className="h-10 w-10 text-gray-400 mb-4" />
<div className="text-center">
<p className="text-sm font-medium text-gray-700">
{data.file ? data.file.name : '點擊或拖曳檔案至此'}
</p>
<p className="text-xs text-gray-500 mt-1"> .xlsx, .xls, .csv</p>
</div>
</div>
{errors.file && <p className="text-red-500 text-sm">{errors.file}</p>}
</div>
<div className="flex justify-end pt-4">
<Button
type="submit"
size="lg"
className="button-filled-primary w-full md:w-auto px-8"
disabled={processing}
>
{processing ? '處理中...' : '開始匯入'}
</Button>
</div>
</form>
</div>
<div className="mt-8 bg-blue-50 p-6 rounded-lg border border-blue-100">
<h3 className="font-bold text-blue-800 mb-2"></h3>
<ul className="list-disc list-inside text-sm text-blue-700 space-y-1">
<li>使 Excel </li>
<li></li>
<li></li>
</ul>
</div>
</div>
</AuthenticatedLayout>
);
}

View File

@@ -0,0 +1,203 @@
import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout';
import { Head, Link } from '@inertiajs/react';
import { Button } from '@/Components/ui/button';
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from '@/Components/ui/table';
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
} from "@/Components/ui/alert-dialog";
import { Badge } from "@/Components/ui/badge";
import { Plus, FileUp, Eye, Trash2 } from 'lucide-react';
import { useState, useEffect } from "react";
import { format } from 'date-fns';
import Pagination from "@/Components/shared/Pagination";
import { SearchableSelect } from "@/Components/ui/searchable-select";
import { router } from "@inertiajs/react";
interface ImportBatch {
id: number;
import_date: string;
status: 'pending' | 'confirmed';
total_quantity: number;
total_amount: number;
importer?: {
name: string;
};
created_at: string;
}
interface Props {
batches: {
data: ImportBatch[];
links: any[]; // Pagination links
};
filters?: { // Add filters prop if not present, though we main need per_page state
per_page?: string;
}
}
export default function SalesImportIndex({ batches, filters = {} }: Props) {
const [perPage, setPerPage] = useState(filters?.per_page?.toString() || "10");
useEffect(() => {
if (filters?.per_page) {
setPerPage(filters.per_page.toString());
}
}, [filters?.per_page]);
const handlePerPageChange = (value: string) => {
setPerPage(value);
router.get(
route("sales-imports.index"),
{ per_page: value },
{ preserveState: true, preserveScroll: true, replace: true }
);
};
return (
<AuthenticatedLayout
breadcrumbs={[
{ label: '銷售管理', href: '#' },
{ label: '銷售單匯入', href: route('sales-imports.index'), isPage: true },
]}
>
<Head title="銷售單匯入管理" />
<div className="container mx-auto p-6 max-w-7xl">
<div className="flex justify-between items-center mb-6">
<div>
<h1 className="text-2xl font-bold text-gray-900 flex items-center gap-2">
<FileUp className="h-6 w-6 text-primary-main" />
</h1>
<p className="text-gray-500 mt-1">
</p>
</div>
<Link href={route('sales-imports.create')}>
<Button className="button-filled-primary gap-2">
<Plus className="h-4 w-4" />
</Button>
</Link>
</div>
<div className="bg-white rounded-lg border shadow-sm overflow-hidden">
<Table>
<TableHeader className="bg-gray-50">
<TableRow>
<TableHead className="w-[100px]">ID</TableHead>
<TableHead></TableHead>
<TableHead></TableHead>
<TableHead className="text-center w-[120px]"></TableHead>
<TableHead className="text-right w-[150px]"></TableHead>
<TableHead className="text-center w-[100px]"></TableHead>
<TableHead className="text-center w-[120px]"></TableHead>
</TableRow>
</TableHeader>
<TableBody>
{batches.data.length === 0 ? (
<TableRow>
<TableCell colSpan={7} className="text-center py-8 text-gray-500">
</TableCell>
</TableRow>
) : (
batches.data.map((batch) => (
<TableRow key={batch.id} className="hover:bg-gray-50/50">
<TableCell className="font-medium">#{batch.id}</TableCell>
<TableCell>
{format(new Date(batch.created_at), 'yyyy/MM/dd HH:mm')}
</TableCell>
<TableCell>{batch.importer?.name || '--'}</TableCell>
<TableCell className="text-center font-bold text-gray-900">
{Math.floor(batch.total_quantity || 0).toLocaleString()}
</TableCell>
<TableCell className="text-right font-bold text-primary-main">
NT$ {Number(batch.total_amount || 0).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 })}
</TableCell>
<TableCell className="text-center">
<Badge variant={batch.status === 'confirmed' ? 'default' : 'secondary'}>
{batch.status === 'confirmed' ? '已確認' : '待確認'}
</Badge>
</TableCell>
<TableCell>
<div className="flex justify-center gap-2">
<Link href={route('sales-imports.show', batch.id)}>
<Button variant="outline" size="sm" className="button-outlined-primary" title="查看詳情">
<Eye className="h-4 w-4" />
</Button>
</Link>
{batch.status === 'pending' && (
<AlertDialog>
<AlertDialogTrigger asChild>
<Button variant="outline" size="sm" className="button-outlined-error" title="刪除">
<Trash2 className="h-4 w-4" />
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle></AlertDialogTitle>
<AlertDialogDescription>
#{batch.id}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel></AlertDialogCancel>
<AlertDialogAction
className="bg-red-600 hover:bg-red-700"
onClick={() => router.delete(route('sales-imports.destroy', batch.id), { preserveScroll: true })}
>
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
)}
</div>
</TableCell>
</TableRow>
))
)}
</TableBody>
</Table>
</div>
{/* Pagination */}
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span></span>
<SearchableSelect
value={perPage}
onValueChange={handlePerPageChange}
options={[
{ label: "10", value: "10" },
{ label: "20", value: "20" },
{ label: "50", value: "50" },
{ label: "100", value: "100" },
]}
className="w-[100px] h-8"
showSearch={false}
/>
<span></span>
</div>
<Pagination links={batches.links} />
</div>
</div>
</AuthenticatedLayout>
);
}

View File

@@ -0,0 +1,338 @@
import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout';
import { Head, Link, useForm, router } from '@inertiajs/react'; // Add router import
import { useState, useEffect } from "react";
import { SearchableSelect } from "@/Components/ui/searchable-select";
import { Button } from '@/Components/ui/button';
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from '@/Components/ui/table';
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
} from "@/Components/ui/alert-dialog";
import { Badge } from "@/Components/ui/badge";
import { ArrowLeft, CheckCircle, Trash2, Printer } from 'lucide-react';
import { format } from 'date-fns';
import Pagination from "@/Components/shared/Pagination";
interface ImportItem {
id: number;
transaction_serial: string;
machine_id: string;
slot: string | null;
product_code: string;
product_id: number | null;
product?: {
name: string;
};
quantity: number;
amount: number;
transaction_at: string;
original_status: string;
warehouse?: {
name: string;
};
}
interface ImportBatch {
id: number;
import_date: string;
status: 'pending' | 'confirmed';
total_quantity: number;
total_amount: number;
items: ImportItem[]; // Note: items might be paginated in props, handled below
created_at: string;
confirmed_at?: string;
}
interface Props {
import: ImportBatch;
items: {
data: ImportItem[];
links: any[];
current_page: number;
per_page: number;
total: number;
};
filters?: {
per_page?: string;
};
flash?: {
success?: string;
error?: string;
};
}
export default function SalesImportShow({ import: batch, items, filters = {} }: Props) {
const { post, processing } = useForm({});
const [perPage, setPerPage] = useState(filters?.per_page?.toString() || "10");
// Sync state with prop if it changes via navigation
useEffect(() => {
if (filters?.per_page) {
setPerPage(filters.per_page.toString());
}
}, [filters?.per_page]);
const handlePerPageChange = (value: string) => {
setPerPage(value);
router.get(
route("sales-imports.show", batch.id),
{ per_page: value },
{ preserveState: true, preserveScroll: true, replace: true }
);
};
const handleConfirm = () => {
post(route('sales-imports.confirm', batch.id));
};
const handleDelete = () => {
router.delete(route('sales-imports.destroy', batch.id));
};
return (
<AuthenticatedLayout
breadcrumbs={[
{ label: '銷售管理', href: '#' },
{ label: '銷售單匯入', href: route('sales-imports.index') },
{ label: '匯入明細', href: '#', isPage: true },
]}
>
<Head title={`匯入批次 #${batch.id}`} />
<div className="container mx-auto p-6 max-w-7xl">
{/* Header */}
<div className="mb-6">
<Link href={route('sales-imports.index')}>
<Button
variant="outline"
className="gap-2 button-outlined-primary mb-6"
>
<ArrowLeft className="h-4 w-4" />
</Button>
</Link>
<div className="flex items-center justify-between mb-6">
<div>
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<CheckCircle className="h-6 w-6 text-primary-main" />
</h1>
<p className="text-gray-500 mt-1">#{batch.id} | {format(new Date(batch.created_at), 'yyyy/MM/dd HH:mm')}</p>
</div>
<div className="flex items-center gap-3">
<Badge variant={batch.status === 'confirmed' ? 'default' : 'secondary'}>
{batch.status === 'confirmed' ? '已確認' : '待確認'}
</Badge>
{batch.status === 'pending' && (
<>
<AlertDialog>
<AlertDialogTrigger asChild>
<Button
variant="outline"
className="gap-2 button-outlined-error"
>
<Trash2 className="h-4 w-4" />
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle></AlertDialogTitle>
<AlertDialogDescription>
#{batch.id}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel></AlertDialogCancel>
<AlertDialogAction
className="bg-red-600 hover:bg-red-700"
onClick={handleDelete}
>
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
<AlertDialog>
<AlertDialogTrigger asChild>
<Button
className="button-filled-primary gap-2"
disabled={processing}
>
<CheckCircle className="h-4 w-4" />
{processing ? '處理中...' : '確認並扣庫'}
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle></AlertDialogTitle>
<AlertDialogDescription>
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel></AlertDialogCancel>
<AlertDialogAction
className="button-filled-primary"
onClick={handleConfirm}
>
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</>
)}
{batch.status === 'confirmed' && (
<Button variant="outline" className="gap-2 button-outlined-primary">
<Printer className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
<div className="grid grid-cols-1 gap-8">
{/* 統計資訊卡片 */}
<div className="bg-white rounded-xl border border-gray-200 shadow-sm p-6">
<h2 className="text-lg font-bold text-gray-900 mb-6 border-b pb-4"></h2>
<div className="grid grid-cols-1 md:grid-cols-3 gap-x-8 gap-y-6">
<div>
<span className="text-sm text-gray-500 block mb-1 font-medium"></span>
<span className="text-2xl font-bold text-gray-900">{Math.floor(batch.total_quantity || 0).toLocaleString()}</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1 font-medium"></span>
<span className="text-2xl font-bold text-primary-main">
NT$ {Number(batch.total_amount || 0).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 })}
</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1 font-medium"></span>
<span className="text-2xl font-bold text-gray-900">
{batch.confirmed_at ? format(new Date(batch.confirmed_at), 'yyyy/MM/dd HH:mm') : '--'}
</span>
</div>
</div>
</div>
{/* 匯入明細清單 */}
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
<div className="p-6 border-b border-gray-100 bg-gray-50/30">
<h2 className="text-lg font-bold text-gray-900"></h2>
</div>
<div className="p-6">
<div className="border rounded-lg overflow-hidden">
<Table>
<TableHeader>
<TableRow className="bg-gray-50 hover:bg-gray-50">
<TableHead className="w-[80px] text-center">#</TableHead>
<TableHead> / </TableHead>
<TableHead> ()</TableHead>
<TableHead></TableHead>
<TableHead></TableHead>
<TableHead className="w-[120px] text-center"> / </TableHead>
<TableHead className="text-center"></TableHead>
<TableHead className="text-right w-[100px]"></TableHead>
<TableHead className="text-right"></TableHead>
</TableRow>
</TableHeader>
<TableBody>
{items.data.length === 0 ? (
<TableRow>
<TableCell colSpan={9} className="h-24 text-center text-gray-500">
</TableCell>
</TableRow>
) : (
items.data.map((item, index) => (
<TableRow key={item.id}>
<TableCell className="text-center text-gray-500">
{(items.current_page - 1) * items.per_page + index + 1}
</TableCell>
<TableCell>
<div className="flex flex-col">
<span className="font-mono text-sm font-bold text-gray-900">{item.transaction_serial}</span>
<span className="text-[10px] text-gray-400">
{format(new Date(item.transaction_at), 'yyyy/MM/dd HH:mm:ss')}
</span>
</div>
</TableCell>
<TableCell>
<div className="flex flex-col">
<span className="text-sm font-medium text-gray-900">{item.warehouse?.name || '--'}</span>
<span className="font-mono text-[10px] text-gray-400">{item.machine_id}</span>
</div>
</TableCell>
<TableCell>
<div className="font-mono text-sm font-bold text-gray-900">{item.product_code}</div>
</TableCell>
<TableCell>
<div className="text-sm text-gray-600 truncate max-w-[200px]" title={item.product?.name}>
{item.product?.name || '--'}
</div>
</TableCell>
<TableCell className="text-center font-bold">
{item.slot || '--'}
</TableCell>
<TableCell className="text-center">
<Badge variant="outline" className={item.original_status === '已出貨' ? "text-green-600 border-green-200 bg-green-50" : "text-gray-500"}>
{item.original_status}
</Badge>
</TableCell>
<TableCell className="text-right font-medium">{Math.floor(item.quantity)}</TableCell>
<TableCell className="text-right font-bold text-primary">
NT$ {Number(item.amount).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 })}
</TableCell>
</TableRow>
))
)}
</TableBody>
</Table>
</div>
{/* Pagination */}
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span></span>
<SearchableSelect
value={perPage}
onValueChange={handlePerPageChange}
options={[
{ label: "10", value: "10" },
{ label: "20", value: "20" },
{ label: "50", value: "50" },
{ label: "100", value: "100" },
]}
className="w-[100px] h-8"
showSearch={false}
/>
<span></span>
</div>
<Pagination links={items.links} />
</div>
</div>
</div>
</div>
</div>
</AuthenticatedLayout>
);
}

View File

@@ -1,4 +1,4 @@
import { useState, useMemo } from "react";
import { useState, useMemo, useEffect } from "react";
import { ArrowLeft, PackagePlus, AlertTriangle, Shield, Boxes, FileUp } from "lucide-react";
import { Button } from "@/Components/ui/button";
import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout";
@@ -36,11 +36,31 @@ export default function WarehouseInventoryPage({
safetyStockSettings,
availableProducts,
}: Props) {
const [searchTerm, setSearchTerm] = useState("");
const [typeFilter, setTypeFilter] = useState<string>("all");
// 從 URL 讀取初始狀態
const queryParams = new URLSearchParams(window.location.search);
const [searchTerm, setSearchTerm] = useState(queryParams.get("search") || "");
const [typeFilter, setTypeFilter] = useState<string>(queryParams.get("type") || "all");
const [deleteId, setDeleteId] = useState<string | null>(null);
const [importDialogOpen, setImportDialogOpen] = useState(false);
// 當搜尋或篩選變更時,同步到 URL (使用 replace: true 避免產生過多歷史紀錄)
useEffect(() => {
const params: any = {};
if (searchTerm) params.search = searchTerm;
if (typeFilter !== "all") params.type = typeFilter;
router.get(
route("warehouses.inventory.index", warehouse.id),
params,
{
preserveState: true,
preserveScroll: true,
replace: true,
only: ["inventories"], // 僅重新拉取數據,避免全頁重新渲染 (如有後端過濾)
}
);
}, [searchTerm, typeFilter]);
// 篩選庫存列表
const filteredInventories = useMemo(() => {
return inventories.filter((group) => {