From d1a7b6f7cf4ca5d5831562c596e268953d327c6d Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Mon, 13 Apr 2026 17:42:47 +0800
Subject: [PATCH] update

---
 .../productProcess/service/ProductProcessService.kt   | 11 ++++++++---
 .../productProcess/web/ProductProcessController.kt    |  2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
index 0218cac..ebd8e76 100644
--- a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
@@ -1506,6 +1506,7 @@ open class ProductProcessService(
         bomIds: List<Long>?,
         qcReady: Boolean?,
         bomType: String?,
+        includePutaway: Boolean?,
         page: Int,
         size: Int
     ): JobOrderProductProcessPageResponse {
@@ -1603,10 +1604,14 @@ open class ProductProcessService(
 
             val stockInLine = stockInLineByJobOrderId[jobOrderId]
             val stockStatus = stockInLine?.status
-            val stockInEligibleForQc = stockStatus != "completed" && stockStatus != "rejected"
-
+            //val stockInEligibleForQc = stockStatus != "completed" && stockStatus != "rejected"
+            val allowPutaway = includePutaway == true
             // 列表只排除 completed/rejected（和 planning），null stockInLine 也会显示在 tab0
-            val includedInList = stockInEligibleForQc
+            val includedInList =
+    // rejected 一般還是要排除（維持原規則）
+    stockStatus != "rejected" &&
+    // completed 只有在不允許 putaway 時才排除
+    (allowPutaway || stockStatus != "completed")
             val ready = includedInList && allLinesDone && stockInLine != null
 
             if (!includedInList) {
diff --git a/src/main/java/com/ffii/fpsms/modules/productProcess/web/ProductProcessController.kt b/src/main/java/com/ffii/fpsms/modules/productProcess/web/ProductProcessController.kt
index 90b7a49..32cb2ec 100644
--- a/src/main/java/com/ffii/fpsms/modules/productProcess/web/ProductProcessController.kt
+++ b/src/main/java/com/ffii/fpsms/modules/productProcess/web/ProductProcessController.kt
@@ -206,6 +206,7 @@ class ProductProcessController(
         @RequestParam(required = false) jobOrderCode: String?,
         @RequestParam(required = false) bomIds: String?,
         @RequestParam(required = false) qcReady: Boolean?,
+        @RequestParam(required = false) includePutaway: Boolean?, 
         @RequestParam(name = "type", required = false) bomType: String?,
         @RequestParam(defaultValue = "0") page: Int,
         @RequestParam(defaultValue = "50") size: Int
@@ -225,6 +226,7 @@ class ProductProcessController(
             jobOrderCode = jobOrderCode,
             bomIds = parsedBomIds,
             qcReady = qcReady,
+            includePutaway = includePutaway,
             bomType = bomType,
             page = page,
             size = size