瀏覽代碼

update

master
CANCERYS\kw093 11 小時之前
父節點
當前提交
d1a7b6f7cf
共有 2 個文件被更改,包括 10 次插入3 次删除
  1. +8
    -3
      src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
  2. +2
    -0
      src/main/java/com/ffii/fpsms/modules/productProcess/web/ProductProcessController.kt

+ 8
- 3
src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt 查看文件

@@ -1506,6 +1506,7 @@ open class ProductProcessService(
bomIds: List<Long>?, bomIds: List<Long>?,
qcReady: Boolean?, qcReady: Boolean?,
bomType: String?, bomType: String?,
includePutaway: Boolean?,
page: Int, page: Int,
size: Int size: Int
): JobOrderProductProcessPageResponse { ): JobOrderProductProcessPageResponse {
@@ -1603,10 +1604,14 @@ open class ProductProcessService(


val stockInLine = stockInLineByJobOrderId[jobOrderId] val stockInLine = stockInLineByJobOrderId[jobOrderId]
val stockStatus = stockInLine?.status 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 // 列表只排除 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 val ready = includedInList && allLinesDone && stockInLine != null


if (!includedInList) { if (!includedInList) {


+ 2
- 0
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) jobOrderCode: String?,
@RequestParam(required = false) bomIds: String?, @RequestParam(required = false) bomIds: String?,
@RequestParam(required = false) qcReady: Boolean?, @RequestParam(required = false) qcReady: Boolean?,
@RequestParam(required = false) includePutaway: Boolean?,
@RequestParam(name = "type", required = false) bomType: String?, @RequestParam(name = "type", required = false) bomType: String?,
@RequestParam(defaultValue = "0") page: Int, @RequestParam(defaultValue = "0") page: Int,
@RequestParam(defaultValue = "50") size: Int @RequestParam(defaultValue = "50") size: Int
@@ -225,6 +226,7 @@ class ProductProcessController(
jobOrderCode = jobOrderCode, jobOrderCode = jobOrderCode,
bomIds = parsedBomIds, bomIds = parsedBomIds,
qcReady = qcReady, qcReady = qcReady,
includePutaway = includePutaway,
bomType = bomType, bomType = bomType,
page = page, page = page,
size = size size = size


Loading…
取消
儲存