diff --git a/src/components/PutAwayScan/PutAwayModal.tsx b/src/components/PutAwayScan/PutAwayModal.tsx
index 4eec24a..2f8e6f9 100644
--- a/src/components/PutAwayScan/PutAwayModal.tsx
+++ b/src/components/PutAwayScan/PutAwayModal.tsx
@@ -439,7 +439,7 @@ const PutAwayModal: React.FC<Props> = ({ open, onClose, warehouse, stockInLineId
           component="form"
           onSubmit={formProps.handleSubmit(onSubmit)}
         >
-          <Box sx={{ overflow: "hidden", flex: 1, display: "flex", flexDirection: "column" }}>
+          <Box sx={{ overflow: "auto", flex: 1, display: "flex", flexDirection: "column" }}>
             <Grid container xs={12}>
               <Grid item xs={12}>
                 {itemDetail != undefined ? (
@@ -451,9 +451,9 @@ const PutAwayModal: React.FC<Props> = ({ open, onClose, warehouse, stockInLineId
                       <Box sx={{ "& .MuiFormControl-root": { mb: 0.5 }, "& .MuiTextField-root": { mb: 0.5 }, "& .MuiGrid-item": { mb: 0.25 } }}>
                         <Grid item xs={12}>
                           {itemDetail.jobOrderId ? (
-                            <FgStockInForm itemDetail={itemDetail} disabled={true} putawayMode={true}/>
+                            <FgStockInForm itemDetail={itemDetail} disabled={true} putawayMode={true} compactFields={true}/>
                           ) : (
-                            <StockInForm itemDetail={itemDetail} disabled={true} putawayMode={true}/>
+                            <StockInForm itemDetail={itemDetail} disabled={true} putawayMode={true} compactFields={true}/>
                           )}
                         </Grid>
                       </Box>
diff --git a/src/components/StockIn/FgStockInForm.tsx b/src/components/StockIn/FgStockInForm.tsx
index ab42d46..3cb2f76 100644
--- a/src/components/StockIn/FgStockInForm.tsx
+++ b/src/components/StockIn/FgStockInForm.tsx
@@ -178,7 +178,7 @@ return (
         container
         justifyContent="flex-start"
         alignItems="flex-start"
-        spacing={2}
+        spacing={compactFields ? 1 : 2}
         sx={{ mt: 0.5 }}
       >
         {putawayMode && (
diff --git a/src/components/StockIn/StockInForm.tsx b/src/components/StockIn/StockInForm.tsx
index c22c7ad..7894f67 100644
--- a/src/components/StockIn/StockInForm.tsx
+++ b/src/components/StockIn/StockInForm.tsx
@@ -162,7 +162,7 @@ const StockInForm: React.FC<Props> = ({
         container
         justifyContent="flex-start"
         alignItems="flex-start"
-        spacing={2}
+        spacing={compactFields ? 1 : 2}
         sx={{ mt: 0.5 }}
       >
         <Grid item xs={6}>
diff --git a/src/config/reportConfig.ts b/src/config/reportConfig.ts
index 4154022..83b71f1 100644
--- a/src/config/reportConfig.ts
+++ b/src/config/reportConfig.ts
@@ -73,8 +73,8 @@ export const REPORTS: ReportDefinition[] = [
     apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-stock-in-traceability`,
     fields: [
       
-      { label: "入倉日期:由 Last In Date Start", name: "lastInDateStart", type: "date", required: true },
-      { label: "入倉日期:至 Last In Date End", name: "lastInDateEnd", type: "date", required: true },
+      { label: "入倉日期:由 Last In Date Start", name: "lastInDateStart", type: "date", required: false },
+      { label: "入倉日期:至 Last In Date End", name: "lastInDateEnd", type: "date", required: false },
       { label: "物料編號 Item Code", name: "itemCode", type: "text", required: false},
     ]
   },
@@ -94,8 +94,8 @@ export const REPORTS: ReportDefinition[] = [
     title: "庫存盤點報告",
     apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-stock-take-variance`,
     fields: [
-      { label: "庫存日期:由 Last In Date Start", name: "lastInDateStart", type: "date", required: false },
-      { label: "庫存日期:至 Last In Date End", name: "lastInDateEnd", type: "date", required: false },
+      { label: "盤點日期:由 Stock Take Date Start", name: "lastInDateStart", type: "date", required: false },
+      { label: "盤點日期:至 Stock Take Date End", name: "lastInDateEnd", type: "date", required: false },
       { label: "物料編號 Item Code", name: "itemCode", type: "text", required: false},
     ]
   },