Merge remote-tracking branch 'origin/MergeProblem1' into MergeProblem1

# Conflicts:
#	src/config/reportConfig.ts

src/config/reportConfig.ts

@@ -69,7 +69,7 @@ export const REPORTS: ReportDefinition[] = [
   //},
   {
     id: "rep-004",
-    title: "入倉記錄報告",
+    title: "入倉追蹤報告",
     apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-stock-in-traceability`,
     fields: [
       
@@ -78,42 +78,39 @@ export const REPORTS: ReportDefinition[] = [
       { label: "物料編號 Item Code", name: "itemCode", type: "text", required: false},
     ]
   },
+
   {
-    id: "rep-005",
-    title: "成品/半成品生產分析報告",
-    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-semi-fg-production-analysis`,
+    id: "rep-008",
+    title: "成品出倉報告",
+    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-fg-delivery-report`,
     fields: [
-      { label: "完成生產日期:由 Last Out Date Start", name: "lastOutDateStart", type: "date", required: false, placeholder: "dd/mm/yyyy" },
-      { label: "完成生產日期:至 Last Out Date End", name: "lastOutDateEnd", type: "date", required: false, placeholder: "dd/mm/yyyy" },
-      { label: "物料編號 Item Code", name: "itemCode", type: "select", required: false, 
-        multiple: true,
-        allowInput: true, 
-        dynamicOptions: true,
-        dynamicOptionsEndpoint: `${NEXT_PUBLIC_API_URL}/report/semi-fg-item-codes`,
-        dynamicOptionsParam: "stockCategory",
-        options: [] }, 
+      { label: "出貨日期:由 Last Out Date Start", name: "lastOutDateStart", type: "date", required: false },
+      { label: "出貨日期:至 Last Out Date End", name: "lastOutDateEnd", type: "date", required: false },
       { label: "年份 Year", name: "year", type: "text", required: false, placeholder: "e.g. 2026" },
-
+      { label: "物料編號 Item Code", name: "itemCode", type: "text", required: false},
     ]
   },
-  {
-    id: "rep-006",
-    title: "庫存材料消耗趨勢報告",
-    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-stock-item-consumption-trend`,
+
+  { id: "rep-012",
+    title: "庫存盤點報告",
+    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-stock-take-variance`,
     fields: [
-      { label: "材料消耗日期:由 Last Out Date Start", name: "lastOutDateStart", type: "date", required: false },
-      { label: "材料消耗日期:至 Last Out Date End", name: "lastOutDateEnd", type: "date", required: false },
-      { label: "物料編號 Item Code", name: "itemCode", type: "select", required: false,
-        multiple: true,
-        allowInput: true,
-        dynamicOptions: true,
-        dynamicOptionsEndpoint: `${NEXT_PUBLIC_API_URL}/report/stock-item-code-prefixes`,
-        dynamicOptionsParam: "stockCategory",
-        options: [] },
-      { label: "年份 Year", name: "year", type: "text", required: false, placeholder: "e.g. 2026" },
+      { 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},
+    ]
+  },
 
+  { id: "rep-011",
+    title: "庫存明細報告",
+    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-stock-ledger`,
+    fields: [
+      { 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},
     ]
   },
+
   {
     id: "rep-007",
     title: "庫存結餘報告",
@@ -126,18 +123,7 @@ export const REPORTS: ReportDefinition[] = [
       { label: "物料編號 Item Code", name: "itemCode", type: "text", required: false},
     ]
   },
-
-  {
-    id: "rep-008",
-    title: "成品出倉報告",
-    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-fg-delivery-report`,
-    fields: [
-      { label: "出貨日期:由 Last Out Date Start", name: "lastOutDateStart", type: "date", required: false },
-      { label: "出貨日期:至 Last Out Date End", name: "lastOutDateEnd", type: "date", required: false },
-      { label: "年份 Year", name: "year", type: "text", required: false, placeholder: "e.g. 2026" },
-      { label: "物料編號 Item Code", name: "itemCode", type: "text", required: false},
-    ]
-  },
+  
   { id: "rep-009",
     title: "成品出倉追蹤報告",
     apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-fg-stock-out-traceability`,
@@ -186,4 +172,51 @@ export const REPORTS: ReportDefinition[] = [
       { label: "物料編號 Item Code", name: "itemCode", type: "text", required: false},
     ]
   },
+
+    { id: "rep-010",
+    title: "庫存品質檢測報告",
+    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-item-qc-fail`,
+    fields: [
+      
+      { label: "QC 不合格日期:由 Last In Date Start", name: "lastInDateStart", type: "date", required: false },
+      { label: "QC 不合格日期:至 Last In Date End", name: "lastInDateEnd", type: "date", required: false },
+      { label: "物料編號 Item Code", name: "itemCode", type: "text", required: false},
+    ]
+  },
+
+    {
+    id: "rep-006",
+    title: "庫存材料消耗趨勢報告",
+    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-stock-item-consumption-trend`,
+    fields: [
+      { label: "材料消耗日期:由 Last Out Date Start", name: "lastOutDateStart", type: "date", required: false },
+      { label: "材料消耗日期:至 Last Out Date End", name: "lastOutDateEnd", type: "date", required: false },
+      { label: "年份 Year", name: "year", type: "text", required: false, placeholder: "e.g. 2026" },
+      { label: "物料編號 Item Code", name: "itemCode", type: "select", required: false,
+        multiple: true,
+        allowInput: true,
+        dynamicOptions: true,
+        dynamicOptionsEndpoint: `${NEXT_PUBLIC_API_URL}/report/stock-item-code-prefixes`,
+        dynamicOptionsParam: "stockCategory",
+        options: [] },
+    ]
+  },
+
+  {
+    id: "rep-005",
+    title: "成品/半成品生產分析報告",
+    apiEndpoint: `${NEXT_PUBLIC_API_URL}/report/print-semi-fg-production-analysis`,
+    fields: [
+      { label: "完成生產日期:由 Last Out Date Start", name: "lastOutDateStart", type: "date", required: false, placeholder: "dd/mm/yyyy" },
+      { label: "完成生產日期:至 Last Out Date End", name: "lastOutDateEnd", type: "date", required: false, placeholder: "dd/mm/yyyy" },
+      { label: "年份 Year", name: "year", type: "text", required: false, placeholder: "e.g. 2026" },
+      { label: "物料編號 Item Code", name: "itemCode", type: "select", required: false, 
+        multiple: true,
+        allowInput: true, 
+        dynamicOptions: true,
+        dynamicOptionsEndpoint: `${NEXT_PUBLIC_API_URL}/report/semi-fg-item-codes`,
+        dynamicOptionsParam: "stockCategory",
+        options: [] },
+    ]
+  }
 ]