|
|
|
@@ -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) { |
|
|
|
|