refactor: changes to inventory status (approved/unapprove)
All checks were successful
Koori-ERP-Deploy-System / deploy-demo (push) Successful in 1m6s
Koori-ERP-Deploy-System / deploy-production (push) Has been skipped

This commit is contained in:
2026-01-29 13:04:54 +08:00
parent 46753cc3bc
commit 56e30a85bb
11 changed files with 683 additions and 398 deletions

View File

@@ -220,11 +220,11 @@ export default function Index({ auth, docs, warehouses, filters }: any) {
</div>
</div>
<DialogFooter>
<Button type="button" variant="outline" onClick={() => setIsCreateDialogOpen(false)}>
<Button type="button" variant="outline" className="button-outlined-primary" onClick={() => setIsCreateDialogOpen(false)}>
</Button>
<Button type="submit" className="button-filled-primary" disabled={processing || !data.warehouse_id}>
</Button>
</DialogFooter>
</form>
@@ -244,6 +244,7 @@ export default function Index({ auth, docs, warehouses, filters }: any) {
<TableHead></TableHead>
<TableHead></TableHead>
<TableHead></TableHead>
<TableHead></TableHead>
<TableHead></TableHead>
<TableHead></TableHead>
<TableHead className="text-center"></TableHead>
@@ -252,7 +253,7 @@ export default function Index({ auth, docs, warehouses, filters }: any) {
<TableBody>
{docs.data.length === 0 ? (
<TableRow>
<TableCell colSpan={8} className="text-center h-24 text-gray-500">
<TableCell colSpan={9} className="text-center h-24 text-gray-500">
</TableCell>
</TableRow>
@@ -266,6 +267,11 @@ export default function Index({ auth, docs, warehouses, filters }: any) {
<TableCell>{doc.warehouse_name}</TableCell>
<TableCell>{getStatusBadge(doc.status)}</TableCell>
<TableCell className="text-gray-500 text-sm">{doc.snapshot_date}</TableCell>
<TableCell>
<span className="font-medium text-gray-700">{doc.counted_items}</span>
<span className="text-gray-400 mx-1">/</span>
<span className="text-gray-500">{doc.total_items}</span>
</TableCell>
<TableCell className="text-gray-500 text-sm">{doc.completed_at || '-'}</TableCell>
<TableCell className="text-sm">{doc.created_by}</TableCell>
<TableCell className="text-center">
@@ -279,11 +285,10 @@ export default function Index({ auth, docs, warehouses, filters }: any) {
title={doc.status === 'completed' ? '查閱' : '盤點'}
>
{doc.status === 'completed' ? (
<Eye className="w-4 h-4 mr-1" />
<Eye className="w-4 h-4" />
) : (
<Pencil className="w-4 h-4 mr-1" />
<Pencil className="w-4 h-4" />
)}
{doc.status === 'completed' ? '查閱' : '盤點'}
</Button>
</Link>
</Can>

View File

@@ -0,0 +1,166 @@
import { useEffect, useRef } from 'react';
import { Head } from '@inertiajs/react';
import JsBarcode from 'jsbarcode';
interface PrintProps {
doc: {
doc_no: string;
warehouse_name: string;
snapshot_date: string;
created_at: string;
print_date: string;
created_by: string;
items: Array<{
id: string;
product_name: string;
product_code: string;
specification: string;
unit: string;
quantity: number;
counted_qty: number | null;
notes: string;
}>;
};
}
export default function Print({ doc }: PrintProps) {
const barcodeRef = useRef<SVGSVGElement>(null);
useEffect(() => {
if (barcodeRef.current) {
try {
JsBarcode(barcodeRef.current, doc.doc_no, {
format: "CODE128",
width: 2, // Thicker bars for better scanning
height: 50, // Taller
displayValue: false,
margin: 10, // Mandatory quiet zone for scanners
marginBottom: 5
});
} catch (e) {
console.error("Barcode generation failed", e);
}
}
// Delay print slightly to ensure render
const timer = setTimeout(() => {
window.print();
}, 500);
return () => clearTimeout(timer);
}, [doc.doc_no]);
return (
<div className="bg-white text-black font-sans text-sm min-h-screen">
<Head title={`列印盤點單 ${doc.doc_no}`} />
<style>{`
@media print {
@page {
size: A4 landscape;
margin: 10mm;
}
body {
-webkit-print-color-adjust: exact;
print-color-adjust: exact;
}
/* Hide browser default header/footer if possible (browser dependent) */
}
`}</style>
{/* Header Section */}
<div className="relative mb-6">
{/* Barcode - Top Right */}
<div className="absolute top-0 right-0 flex flex-col items-end">
<svg ref={barcodeRef}></svg>
{/* <span className="text-xs font-mono mt-1">{doc.doc_no}</span> */}
</div>
{/* Company & Title - Center */}
<div className="text-center pt-4">
<h1 className="text-2xl font-bold tracking-widest mb-2"></h1>
<h2 className="text-xl font-bold tracking-widest"></h2>
</div>
</div>
{/* Info Section */}
<div className="flex justify-between items-end mb-2 border-b-2 border-black pb-2">
<div className="space-y-1">
<div className="flex gap-4">
<span className="font-bold"></span>
<span className="font-mono font-bold">{doc.doc_no}</span>
</div>
<div className="flex gap-4">
<span className="font-bold"></span>
<span>{doc.created_at}</span>
</div>
<div className="flex gap-4">
<span className="font-bold"></span>
<span>{doc.warehouse_name}</span>
</div>
</div>
<div className="text-right">
<div className="flex gap-4">
<span className="font-bold"></span>
<span>{doc.print_date}</span>
</div>
</div>
</div>
{/* Table Section */}
<table className="w-full border-collapse border border-black mb-8">
<thead>
<tr className="bg-gray-100">
<th className="border border-black px-2 py-1 w-12 text-center"></th>
<th className="border border-black px-2 py-1 w-32 text-left"></th>
<th className="border border-black px-2 py-1 text-left"></th>
<th className="border border-black px-2 py-1 w-32 text-left"></th>
<th className="border border-black px-2 py-1 w-20 text-right"></th>
<th className="border border-black px-2 py-1 w-16 text-center"></th>
<th className="border border-black px-2 py-1 w-32 text-left"></th>
</tr>
</thead>
<tbody>
{doc.items.map((item, index) => (
<tr key={item.id}>
<td className="border border-black px-2 py-2 text-center">{index + 1}</td>
<td className="border border-black px-2 py-2 font-mono">{item.product_code}</td>
<td className="border border-black px-2 py-2">{item.product_name}</td>
<td className="border border-black px-2 py-2">{item.specification || '-'}</td>
<td className="border border-black px-2 py-2 text-right">
{item.counted_qty !== null ? Number(item.counted_qty).toFixed(2) : ''}
</td>
<td className="border border-black px-2 py-2 text-center">{item.unit || '-'}</td>
<td className="border border-black px-2 py-2">{item.notes}</td>
</tr>
))}
{/* Empty rows filler if needed, but usually not required unless strictly paging */}
</tbody>
</table>
{/* Footer Section */}
<div className="fixed bottom-0 w-full mb-4">
<div className="flex justify-between items-end px-4">
<div className="w-1/3 border-b border-black pb-1 mb-1">
<span className="font-bold"></span>
<span className="ml-2">{doc.created_by}</span>
</div>
<div className="w-1/3 border-b border-black pb-1 mb-1 mx-4">
<span className="font-bold"></span>
</div>
<div className="w-1/3 border-b border-black pb-1 mb-1">
<span className="font-bold"></span>
</div>
</div>
<div className="flex justify-between items-center text-xs mt-4 px-4">
<div>
&nbsp;&nbsp; {doc.created_by}
</div>
<div>
1 / 1
</div>
</div>
</div>
</div>
);
}

View File

@@ -1,5 +1,5 @@
import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout';
import { Head, useForm } from '@inertiajs/react';
import { Head, useForm, Link } from '@inertiajs/react'; // Added Link
import {
Table,
TableBody,
@@ -11,7 +11,7 @@ import {
import { Button } from '@/Components/ui/button';
import { Input } from '@/Components/ui/input';
import { Badge } from '@/Components/ui/badge';
import { Save, CheckCircle, Printer, Trash2, ClipboardCheck } from 'lucide-react';
import { Save, CheckCircle, Printer, Trash2, ClipboardCheck, ArrowLeft, RotateCcw } from 'lucide-react'; // Added ArrowLeft
import {
AlertDialog,
AlertDialogAction,
@@ -55,6 +55,14 @@ export default function Show({ doc }: any) {
destroy(route('inventory.count.destroy', [doc.id]));
};
const handleReopen = () => {
if (confirm('確定要取消核准嗎?單據將回復為盤點中狀態,且庫存異動將被撤回(若已過帳)。')) {
router.visit(route('inventory.count.reopen', [doc.id]), {
method: 'put',
});
}
}
const isCompleted = doc.status === 'completed';
// Calculate progress
@@ -72,28 +80,62 @@ export default function Show({ doc }: any) {
>
<Head title={`盤點單 ${doc.doc_no}`} />
<div className="container mx-auto p-6 max-w-7xl animate-in fade-in duration-500">
<div className="space-y-6">
<div className="container mx-auto p-6 max-w-7xl animate-in fade-in duration-500 space-y-6">
<div>
<Link href={route('inventory.count.index')}>
<Button
variant="outline"
className="gap-2 button-outlined-primary mb-6"
>
<ArrowLeft className="h-4 w-4" />
</Button>
</Link>
<div className="flex flex-col md:flex-row md:items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div>
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<ClipboardCheck className="h-6 w-6 text-primary-main" />
: {doc.doc_no}
</h1>
{doc.status === 'completed' ? (
<Badge className="bg-green-500 hover:bg-green-600"></Badge>
) : (
<Badge className="bg-blue-500 hover:bg-blue-600"></Badge>
)}
</div>
<p className="text-sm text-gray-500 mt-1 font-medium">
: {doc.warehouse_name} <span className="mx-2">|</span> : {doc.created_by} <span className="mx-2">|</span> : {doc.snapshot_date}
</p>
<div>
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<ClipboardCheck className="h-6 w-6 text-primary-main" />
: {doc.doc_no}
</h1>
{doc.status === 'completed' ? (
<Badge className="bg-green-500 hover:bg-green-600"></Badge>
) : (
<Badge className="bg-blue-500 hover:bg-blue-600"></Badge>
)}
</div>
<p className="text-sm text-gray-500 mt-1 font-medium">
: {doc.warehouse_name} <span className="mx-2">|</span> : {doc.created_by} <span className="mx-2">|</span> : {doc.snapshot_date}
</p>
</div>
<div className="flex items-center gap-2">
<Button
variant="outline"
size="sm"
className="button-outlined-primary"
onClick={() => window.open(route('inventory.count.print', [doc.id]), '_blank')}
>
<Printer className="w-4 h-4 mr-2" />
</Button>
{isCompleted && (
<Can permission="inventory.adjust">
<Button
variant="outline"
size="sm"
className="button-outlined-error"
onClick={handleReopen}
disabled={processing}
>
<RotateCcw className="w-4 h-4 mr-2" />
</Button>
</Can>
)}
{!isCompleted && (
<div className="flex items-center gap-2">
<Can permission="inventory.view">
@@ -101,7 +143,7 @@ export default function Show({ doc }: any) {
<AlertDialogTrigger asChild>
<Button variant="outline" size="sm" disabled={processing} className="button-outlined-error">
<Trash2 className="w-4 h-4 mr-2" />
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
@@ -126,7 +168,7 @@ export default function Show({ doc }: any) {
disabled={processing}
>
<Save className="w-4 h-4 mr-2" />
</Button>
<Button
size="sm"
@@ -135,142 +177,142 @@ export default function Show({ doc }: any) {
disabled={processing}
>
<CheckCircle className="w-4 h-4 mr-2" />
</Button>
</Can>
</div>
)}
{isCompleted && (
<Button variant="outline" size="sm" onClick={() => window.print()}>
<Printer className="w-4 h-4 mr-2" />
</Button>
)}
</div>
</div>
{!isCompleted && (
<div className="bg-white rounded-lg shadow-sm border p-6 space-y-4">
<div className="flex items-center justify-between text-sm">
<span className="text-gray-500 font-medium">: {countedItems} / {totalItems} </span>
<span className="font-bold text-primary-main">{progress}%</span>
</div>
<div className="w-full bg-gray-200 rounded-full h-2">
<div className="bg-primary-main h-2 rounded-full transition-all duration-300" style={{ width: `${progress}%` }}></div>
</div>
</div>
)}
<div className="bg-white rounded-lg shadow-sm border p-6 space-y-4">
<div className="flex items-center justify-between">
<div>
<h3 className="font-semibold text-lg text-grey-900"></h3>
<p className="text-sm text-grey-500">
</p>
</div>
</div>
<div className="border rounded-lg overflow-hidden">
<Table>
<TableHeader className="bg-gray-50">
<TableRow>
<TableHead className="w-[50px] text-center font-medium text-grey-600">#</TableHead>
<TableHead className="font-medium text-grey-600"> / </TableHead>
<TableHead className="font-medium text-grey-600"></TableHead>
<TableHead className="text-right font-medium text-grey-600"></TableHead>
<TableHead className="text-right w-32 font-medium text-grey-600"></TableHead>
<TableHead className="text-right font-medium text-grey-600"></TableHead>
<TableHead className="font-medium text-grey-600"></TableHead>
<TableHead className="font-medium text-grey-600"></TableHead>
</TableRow>
</TableHeader>
<TableBody>
{doc.items.map((item: any, index: number) => {
const formItem = data.items[index];
const diff = formItem.counted_qty !== '' && formItem.counted_qty !== null
? (parseFloat(formItem.counted_qty) - item.system_qty)
: 0;
const hasDiff = Math.abs(diff) > 0.0001;
return (
<TableRow key={item.id} className={hasDiff && formItem.counted_qty !== '' ? "bg-red-50/30" : ""}>
<TableCell className="text-gray-500 font-medium text-center">
{index + 1}
</TableCell>
<TableCell className="py-3">
<div className="flex flex-col">
<span className="font-semibold text-gray-900">{item.product_name}</span>
<span className="text-xs text-gray-500 font-mono">{item.product_code}</span>
</div>
</TableCell>
<TableCell className="text-sm font-mono">{item.batch_number || '-'}</TableCell>
<TableCell className="text-right font-medium">{item.system_qty.toFixed(2)}</TableCell>
<TableCell className="text-right px-1 py-3">
{isCompleted ? (
<span className="font-semibold mr-2">{item.counted_qty}</span>
) : (
<Input
type="number"
step="0.01"
value={formItem.counted_qty ?? ''}
onChange={(e) => updateItem(index, 'counted_qty', e.target.value)}
onWheel={(e: any) => e.target.blur()}
disabled={processing}
className="h-9 text-right font-medium focus:ring-primary-main"
placeholder="盤點..."
/>
)}
</TableCell>
<TableCell className="text-right">
<span className={`font-bold ${!hasDiff
? 'text-gray-400'
: diff > 0
? 'text-green-600'
: 'text-red-600'
}`}>
{formItem.counted_qty !== '' && formItem.counted_qty !== null
? diff.toFixed(2)
: '-'}
</span>
</TableCell>
<TableCell className="text-sm text-gray-500">{item.unit || item.unit_name}</TableCell>
<TableCell className="px-1">
{isCompleted ? (
<span className="text-sm text-gray-600">{item.notes}</span>
) : (
<Input
value={formItem.notes}
onChange={(e) => updateItem(index, 'notes', e.target.value)}
disabled={processing}
className="h-9 text-sm"
placeholder="備註..."
/>
)}
</TableCell>
</TableRow>
);
})}
</TableBody>
</Table>
</div>
</div>
<div className="bg-gray-50/80 border border-dashed border-grey-200 rounded-lg p-4 flex items-start gap-3">
<div className="bg-blue-100 p-2 rounded-lg">
<Save className="w-5 h-5 text-blue-600" />
</div>
<div>
<h4 className="font-semibold text-gray-900 mb-1 text-sm"></h4>
<p className="text-xs text-gray-500 leading-relaxed">
</p>
</div>
</div>
</div>
{!isCompleted && (
<div className="bg-white rounded-lg shadow-sm border p-6 space-y-4">
<div className="flex items-center justify-between text-sm">
<span className="text-gray-500 font-medium">: {countedItems} / {totalItems} </span>
<span className="font-bold text-primary-main">{progress}%</span>
</div>
<div className="w-full bg-gray-200 rounded-full h-2">
<div className="bg-primary-main h-2 rounded-full transition-all duration-300" style={{ width: `${progress}%` }}></div>
</div>
</div>
)}
<div className="bg-white rounded-lg shadow-sm border p-6 space-y-4">
<div className="flex items-center justify-between">
<div>
<h3 className="font-semibold text-lg text-grey-900"></h3>
<p className="text-sm text-grey-500">
</p>
</div>
</div>
<div className="border rounded-lg overflow-hidden">
<Table>
<TableHeader className="bg-gray-50">
<TableRow>
<TableHead className="w-[50px] text-center font-medium text-grey-600">#</TableHead>
<TableHead className="font-medium text-grey-600"> / </TableHead>
<TableHead className="font-medium text-grey-600"></TableHead>
<TableHead className="text-right font-medium text-grey-600"></TableHead>
<TableHead className="text-right w-32 font-medium text-grey-600"></TableHead>
<TableHead className="text-right font-medium text-grey-600"></TableHead>
<TableHead className="font-medium text-grey-600"></TableHead>
<TableHead className="font-medium text-grey-600"></TableHead>
{!isCompleted && <TableHead className="w-[50px]"></TableHead>}
</TableRow>
</TableHeader>
<TableBody>
{doc.items.map((item: any, index: number) => {
const formItem = data.items[index];
const diff = formItem.counted_qty !== '' && formItem.counted_qty !== null
? (parseFloat(formItem.counted_qty) - item.system_qty)
: 0;
const hasDiff = Math.abs(diff) > 0.0001;
return (
<TableRow key={item.id} className={hasDiff && formItem.counted_qty !== '' ? "bg-red-50/30" : ""}>
<TableCell className="text-gray-500 font-medium text-center">
{index + 1}
</TableCell>
<TableCell className="py-3">
<div className="flex flex-col">
<span className="font-semibold text-gray-900">{item.product_name}</span>
<span className="text-xs text-gray-500 font-mono">{item.product_code}</span>
</div>
</TableCell>
<TableCell className="text-sm font-mono">{item.batch_number || '-'}</TableCell>
<TableCell className="text-right font-medium">{item.system_qty.toFixed(2)}</TableCell>
<TableCell className="text-right px-1 py-3">
{isCompleted ? (
<span className="font-semibold mr-2">{item.counted_qty}</span>
) : (
<Input
type="number"
step="0.01"
value={formItem.counted_qty ?? ''}
onChange={(e) => updateItem(index, 'counted_qty', e.target.value)}
onWheel={(e: any) => e.target.blur()}
disabled={processing}
className="h-9 text-right font-medium focus:ring-primary-main"
placeholder="盤點..."
/>
)}
</TableCell>
<TableCell className="text-right">
<span className={`font-bold ${!hasDiff
? 'text-gray-400'
: diff > 0
? 'text-green-600'
: 'text-red-600'
}`}>
{formItem.counted_qty !== '' && formItem.counted_qty !== null
? diff.toFixed(2)
: '-'}
</span>
</TableCell>
<TableCell className="text-sm text-gray-500">{item.unit || item.unit_name}</TableCell>
<TableCell className="px-1">
{isCompleted ? (
<span className="text-sm text-gray-600">{item.notes}</span>
) : (
<Input
value={formItem.notes}
onChange={(e) => updateItem(index, 'notes', e.target.value)}
disabled={processing}
className="h-9 text-sm"
placeholder="備註..."
/>
)}
</TableCell>
{!isCompleted && (
<TableCell className="text-center">
<Button
variant="ghost"
size="sm"
className="h-8 w-8 text-red-400 hover:text-red-600 hover:bg-red-50 p-0"
onClick={() => {
updateItem(index, 'counted_qty', '');
}}
>
<Trash2 className="h-4 w-4" />
</Button>
</TableCell>
)
}
</TableRow>
);
})}
</TableBody>
</Table>
</div>
</div>
</div>
</AuthenticatedLayout>
</AuthenticatedLayout >
);
}