diff --git a/src/main/java/com/utopiaindustries/model/ctp/JobCardItemWrapper.java b/src/main/java/com/utopiaindustries/model/ctp/JobCardItemWrapper.java index 512f2ac..3d7311e 100644 --- a/src/main/java/com/utopiaindustries/model/ctp/JobCardItemWrapper.java +++ b/src/main/java/com/utopiaindustries/model/ctp/JobCardItemWrapper.java @@ -10,7 +10,7 @@ public class JobCardItemWrapper { private List pieces; private BigDecimal actualProduction; private int perBundleQuantity; - private boolean finalReceived; + private boolean cuttingComplete; public long getJobCardId() { return jobCardId; @@ -52,12 +52,12 @@ public class JobCardItemWrapper { this.perBundleQuantity = perBundleQuantity; } - public boolean getFinalReceived() { - return finalReceived; + public boolean getCuttingComplete() { + return cuttingComplete; } - public void setFinalReceived(boolean finalReceived) { - this.finalReceived = finalReceived; + public void setCuttingComplete(boolean finalReceived) { + this.cuttingComplete = finalReceived; } @Override diff --git a/src/main/java/com/utopiaindustries/service/InventoryService.java b/src/main/java/com/utopiaindustries/service/InventoryService.java index a397ba5..40ea767 100644 --- a/src/main/java/com/utopiaindustries/service/InventoryService.java +++ b/src/main/java/com/utopiaindustries/service/InventoryService.java @@ -100,7 +100,7 @@ public class InventoryService { boolean cuttingComplete = jobCardItemWrappers.stream() .filter(e -> e.getJobCardItemId() == jobCardItem.getId()) - .map(JobCardItemWrapper::getFinalReceived) + .map(JobCardItemWrapper::getCuttingComplete) .findFirst() .orElse(false); diff --git a/src/main/resources/static/js/receive-inventory.js b/src/main/resources/static/js/receive-inventory.js index c0ec570..6f001da 100644 --- a/src/main/resources/static/js/receive-inventory.js +++ b/src/main/resources/static/js/receive-inventory.js @@ -50,7 +50,7 @@ - + {{ populateCuttingAccount() }}