Pārlūkot izejas kodu

update qc/ put away part

master
CANCERYS\kw093 pirms 1 dienas
vecāks
revīzija
b9a93096f6
3 mainītis faili ar 18 papildinājumiem un 1 dzēšanām
  1. +13
    -1
      src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
  2. +3
    -0
      src/main/java/com/ffii/fpsms/modules/productProcess/web/ProductProcessController.kt
  3. +2
    -0
      src/main/java/com/ffii/fpsms/modules/productProcess/web/model/SaveProductProcessRequest.kt

+ 13
- 1
src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt Parādīt failu

@@ -1463,6 +1463,7 @@ open class ProductProcessService(
pickOrderStatus = pickOrder?.status?.value, pickOrderStatus = pickOrder?.status?.value,
jobOrderId = productProcesses.jobOrder?.id, jobOrderId = productProcesses.jobOrder?.id,
stockInLineId = stockInLineId, stockInLineId = stockInLineId,
stockInLineStatus = stockInLine?.status,
jobOrderCode = jobOrder?.code, jobOrderCode = jobOrder?.code,
productProcessLineCount = productProcessLines.size, productProcessLineCount = productProcessLines.size,
FinishedProductProcessLineCount = FinishedProductProcessLineCount, FinishedProductProcessLineCount = FinishedProductProcessLineCount,
@@ -1507,6 +1508,7 @@ open class ProductProcessService(
qcReady: Boolean?, qcReady: Boolean?,
bomType: String?, bomType: String?,
includePutaway: Boolean?, includePutaway: Boolean?,
putawayStatus: String?,
page: Int, page: Int,
size: Int size: Int
): JobOrderProductProcessPageResponse { ): JobOrderProductProcessPageResponse {
@@ -1612,9 +1614,18 @@ open class ProductProcessService(
stockStatus != "rejected" && stockStatus != "rejected" &&
// completed 只有在不允許 putaway 時才排除 // completed 只有在不允許 putaway 時才排除
(allowPutaway || stockStatus != "completed") (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 val ready = includedInList && allLinesDone && stockInLine != null


if (!includedInList) {
if (!includedInList || !includedByPutawayStatus) {
return@mapNotNull null return@mapNotNull null
} }


@@ -1741,6 +1752,7 @@ open class ProductProcessService(
pickOrderStatus = pickOrder?.status?.value, pickOrderStatus = pickOrder?.status?.value,
jobOrderId = productProcess.jobOrder?.id, jobOrderId = productProcess.jobOrder?.id,
stockInLineId = stockInLine?.id, stockInLineId = stockInLine?.id,
stockInLineStatus = stockInLine?.status,
jobOrderCode = jobOrder?.code, jobOrderCode = jobOrder?.code,
productProcessLineCount = productProcessLines.size, productProcessLineCount = productProcessLines.size,
FinishedProductProcessLineCount = finishedCount, FinishedProductProcessLineCount = finishedCount,


+ 3
- 0
src/main/java/com/ffii/fpsms/modules/productProcess/web/ProductProcessController.kt Parādīt failu

@@ -207,6 +207,8 @@ class ProductProcessController(
@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(required = false) includePutaway: Boolean?,
/** all | completed | notCompleted */
@RequestParam(required = false) putawayStatus: String?,
@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
@@ -227,6 +229,7 @@ class ProductProcessController(
bomIds = parsedBomIds, bomIds = parsedBomIds,
qcReady = qcReady, qcReady = qcReady,
includePutaway = includePutaway, includePutaway = includePutaway,
putawayStatus = putawayStatus,
bomType = bomType, bomType = bomType,
page = page, page = page,
size = size size = size


+ 2
- 0
src/main/java/com/ffii/fpsms/modules/productProcess/web/model/SaveProductProcessRequest.kt Parādīt failu

@@ -181,6 +181,8 @@ data class AllJoborderProductProcessInfoResponse(
val productProcessLineCount: Int, val productProcessLineCount: Int,
val FinishedProductProcessLineCount: Int, val FinishedProductProcessLineCount: Int,
val stockInLineId: Long?, val stockInLineId: Long?,
/** Stock-in-line current status (e.g. receiving/received/partially_completed/completed/rejected). */
val stockInLineStatus: String?,
val TimeNeedToComplete: Int?, val TimeNeedToComplete: Int?,
val isDrink: Boolean?, val isDrink: Boolean?,
val lines: List<ProductProcessInfoResponse> val lines: List<ProductProcessInfoResponse>


Notiek ielāde…
Atcelt
Saglabāt