diff --git a/resources/js/Components/Product/ProductDialog.tsx b/resources/js/Components/Product/ProductDialog.tsx
index 1e55fe3..eea361a 100644
--- a/resources/js/Components/Product/ProductDialog.tsx
+++ b/resources/js/Components/Product/ProductDialog.tsx
@@ -115,6 +115,15 @@ export default function ProductDialog({
     setData("barcode", randomDigits.toString());
   };
 
+  const generateRandomCode = () => {
+    const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+    let result = "";
+    for (let i = 0; i < 8; i++) {
+      result += chars.charAt(Math.floor(Math.random() * chars.length));
+    }
+    setData("code", result);
+  };
+
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent className="max-w-3xl max-h-[90vh] overflow-y-auto">
@@ -164,14 +173,26 @@ export default function ProductDialog({
                 <Label htmlFor="code">
                   商品代號 <span className="text-red-500">*</span>
                 </Label>
-                <Input
-                  id="code"
-                  value={data.code}
-                  onChange={(e) => setData("code", e.target.value)}
-                  placeholder="例：A1 (2-8碼)"
-                  maxLength={8}
-                  className={errors.code ? "border-red-500" : ""}
-                />
+                <div className="flex gap-2">
+                  <Input
+                    id="code"
+                    value={data.code}
+                    onChange={(e) => setData("code", e.target.value)}
+                    placeholder="例：A1 (2-8碼)"
+                    maxLength={8}
+                    className={`flex-1 ${errors.code ? "border-red-500" : ""}`}
+                  />
+                  <Button
+                    type="button"
+                    variant="outline"
+                    size="icon"
+                    onClick={generateRandomCode}
+                    title="隨機生成代號"
+                    className="shrink-0 button-outlined-primary"
+                  >
+                    <Wand2 className="h-4 w-4" />
+                  </Button>
+                </div>
                 {errors.code && <p className="text-sm text-red-500">{errors.code}</p>}
               </div>