|
|
|
@@ -1463,6 +1463,7 @@ open class ProductProcessService( |
|
|
|
pickOrderStatus = pickOrder?.status?.value, |
|
|
|
jobOrderId = productProcesses.jobOrder?.id, |
|
|
|
stockInLineId = stockInLineId, |
|
|
|
stockInLineStatus = stockInLine?.status, |
|
|
|
jobOrderCode = jobOrder?.code, |
|
|
|
productProcessLineCount = productProcessLines.size, |
|
|
|
FinishedProductProcessLineCount = FinishedProductProcessLineCount, |
|
|
|
@@ -1507,6 +1508,7 @@ open class ProductProcessService( |
|
|
|
qcReady: Boolean?, |
|
|
|
bomType: String?, |
|
|
|
includePutaway: Boolean?, |
|
|
|
putawayStatus: String?, |
|
|
|
page: Int, |
|
|
|
size: Int |
|
|
|
): JobOrderProductProcessPageResponse { |
|
|
|
@@ -1612,9 +1614,18 @@ open class ProductProcessService( |
|
|
|
stockStatus != "rejected" && |
|
|
|
// completed 只有在不允許 putaway 時才排除 |
|
|
|
(allowPutaway || stockStatus != "completed") |
|
|
|
|
|
|
|
val putawayFilter = putawayStatus?.trim()?.lowercase() |
|
|
|
val includedByPutawayStatus = |
|
|
|
when (putawayFilter) { |
|
|
|
null, "", "all" -> true |
|
|
|
"completed" -> stockStatus?.lowercase() == "completed" |
|
|
|
"notcompleted", "not_completed", "not-completed", "waiting" -> stockStatus?.lowercase() != "completed" |
|
|
|
else -> true |
|
|
|
} |
|
|
|
val ready = includedInList && allLinesDone && stockInLine != null |
|
|
|
|
|
|
|
if (!includedInList) { |
|
|
|
if (!includedInList || !includedByPutawayStatus) { |
|
|
|
return@mapNotNull null |
|
|
|
} |
|
|
|
|
|
|
|
@@ -1741,6 +1752,7 @@ open class ProductProcessService( |
|
|
|
pickOrderStatus = pickOrder?.status?.value, |
|
|
|
jobOrderId = productProcess.jobOrder?.id, |
|
|
|
stockInLineId = stockInLine?.id, |
|
|
|
stockInLineStatus = stockInLine?.status, |
|
|
|
jobOrderCode = jobOrder?.code, |
|
|
|
productProcessLineCount = productProcessLines.size, |
|
|
|
FinishedProductProcessLineCount = finishedCount, |
|
|
|
|