From 2f74d6aca907af5984463e75681fa200c336f945 Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Thu, 26 Mar 2026 15:45:53 +0800 Subject: [PATCH] update --- .../com/ffii/core/response/RecordsRes.java | 38 +++++++++++++++++++ .../entity/InventoryLotLineRepository.kt | 9 +++++ 2 files changed, 47 insertions(+) diff --git a/src/main/java/com/ffii/core/response/RecordsRes.java b/src/main/java/com/ffii/core/response/RecordsRes.java index 0437711..7f7e7d6 100644 --- a/src/main/java/com/ffii/core/response/RecordsRes.java +++ b/src/main/java/com/ffii/core/response/RecordsRes.java @@ -10,6 +10,20 @@ public class RecordsRes { @JsonInclude(JsonInclude.Include.NON_NULL) private Integer total; + /** Lines where approver has not completed (approverQty and finalQty both null). */ + @JsonInclude(JsonInclude.Include.NON_NULL) + private Integer totalWaitingForApprover; + + /** Lines where approver has completed (approverQty or finalQty set). */ + @JsonInclude(JsonInclude.Include.NON_NULL) + private Integer totalApproved; + + /** + * 當 {@link #total} 表示全域 available 行數時,此欄為目前 API 篩選後的筆數(供分頁)。 + */ + @JsonInclude(JsonInclude.Include.NON_NULL) + private Integer filteredRecordCount; + public RecordsRes() { } @@ -38,4 +52,28 @@ public class RecordsRes { this.total = total; } + public Integer getTotalWaitingForApprover() { + return totalWaitingForApprover; + } + + public void setTotalWaitingForApprover(Integer totalWaitingForApprover) { + this.totalWaitingForApprover = totalWaitingForApprover; + } + + public Integer getTotalApproved() { + return totalApproved; + } + + public void setTotalApproved(Integer totalApproved) { + this.totalApproved = totalApproved; + } + + public Integer getFilteredRecordCount() { + return filteredRecordCount; + } + + public void setFilteredRecordCount(Integer filteredRecordCount) { + this.filteredRecordCount = filteredRecordCount; + } + } diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/InventoryLotLineRepository.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/InventoryLotLineRepository.kt index a1dd4a3..48a3420 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/entity/InventoryLotLineRepository.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/InventoryLotLineRepository.kt @@ -164,4 +164,13 @@ interface InventoryLotLineRepository : AbstractRepository