diff --git a/src/main/java/com/utopiaindustries/controller/FinishingController.java b/src/main/java/com/utopiaindustries/controller/FinishingController.java index 0e5391a..87fa001 100644 --- a/src/main/java/com/utopiaindustries/controller/FinishingController.java +++ b/src/main/java/com/utopiaindustries/controller/FinishingController.java @@ -48,6 +48,7 @@ public class FinishingController { @RequestParam(value = "start-date", required = false) String startDate, @RequestParam(value = "end-date", required = false) String endDate, @RequestParam(value = "job-card-id", required = false) String jobCardId, + @RequestParam(value = "status", required = false) String status, @RequestParam(value = "count", required = false) Long count, Model model) { @@ -55,7 +56,7 @@ public class FinishingController { LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate); model.addAttribute("startDate", startDate1); model.addAttribute("endDate", endDate1); - List itemList = bundleService.getFinishedItem(id, itemId, sku, startDate1.toString(), endDate1.toString(), jobCardId, count); + List itemList = bundleService.getFinishedItem(id, itemId, sku, startDate1.toString(), endDate1.toString(), jobCardId, status, count); model.addAttribute("items", itemList); return "finishing/finished-item-list"; diff --git a/src/main/java/com/utopiaindustries/controller/QualityControlController.java b/src/main/java/com/utopiaindustries/controller/QualityControlController.java index 2d90a97..83154d0 100644 --- a/src/main/java/com/utopiaindustries/controller/QualityControlController.java +++ b/src/main/java/com/utopiaindustries/controller/QualityControlController.java @@ -64,13 +64,14 @@ public class QualityControlController { @RequestParam(value = "start-date", required = false) String startDate, @RequestParam(value = "end-date", required = false) String endDate, @RequestParam(value = "job-card-id", required = false) String jobCardId, + @RequestParam(value = "status", required = false) String status, @RequestParam(value = "count", required = false, defaultValue = "100") Long count, Model model) { LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate); LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate); model.addAttribute("startDate", startDate1); model.addAttribute("endDate", endDate1); - List itemList = bundleService.getFinishedItem(id, itemId, sku, startDate1.toString(), endDate1.toString(), jobCardId, count); + List itemList = bundleService.getFinishedItem(id, itemId, sku, startDate1.toString(), endDate1.toString(), jobCardId, status, count); model.addAttribute("items", itemList); return "/quality-control/qc-items-list"; } diff --git a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java index fc5fc94..d1764ca 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java @@ -22,19 +22,19 @@ public class StitchingOfflineItemDAO { private final String TABLE_NAME = "cut_to_pack.stitching_offline_item"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); - private final String SELECT_QUERY_BY_JOB_CARD = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id", TABLE_NAME ); + private final String SELECT_QUERY_BY_JOB_CARD = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id AND inline_received = TRUE", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, item_id, sku, barcode, created_at, created_by, job_card_id, is_qa, qa_remarks, qa_status,bundle_id, qc_done_at, inline_received) VALUES (:id, :item_id, :sku, :barcode, :created_at, :created_by, :job_card_id, :is_qa, :qa_remarks, :qa_status, :bundle_id, :qc_done_at, :inline_received) ON DUPLICATE KEY UPDATE item_id = VALUES(item_id), sku = VALUES(sku), barcode = VALUES(barcode), created_at = VALUES(created_at), created_by = VALUES(created_by), job_card_id = VALUES(job_card_id), is_qa = VALUES(is_qa), qa_remarks = VALUES(qa_remarks), qa_status = VALUES(qa_status), bundle_id = VALUES(bundle_id), qc_done_at = VALUES(qc_done_at), inline_received = VALUES(inline_received)", TABLE_NAME ); private final String SELECT_BY_LIMIT = String.format("SELECT * FROM %s ORDER BY id DESC LIMIT :limit", TABLE_NAME ); - private final String FIND_TOTAL_COUNT = String.format("SELECT COUNT(*) FROM %s where job_card_id = :job_card_id And item_id = :item_id", TABLE_NAME ); + private final String FIND_TOTAL_COUNT = String.format("SELECT COUNT(*) FROM %s where job_card_id = :job_card_id And item_id = :item_id AND inline_received = TRUE", TABLE_NAME ); private final String SELECT_BY_IDS = String.format( "SELECT * FROM %s WHERE id IN (:ids)", TABLE_NAME ); private final String SELECT_BY_TERM = String.format( "SELECT * FROM %s WHERE barcode LIKE :term AND inline_received = TRUE ORDER BY ID DESC", TABLE_NAME ); private final String SELECT_BY_BUNDLE_ID = String.format( "SELECT * FROM %s WHERE bundle_id = :bundle_id", TABLE_NAME ); - private final String COUNT_TOTAL_QA_ITEMS= String.format("SELECT COUNT(*) FROM %s WHERE job_card_id = :job_card_id AND is_qa IS TRUE",TABLE_NAME); - private final String SELECT_BY_TIME_AND_CARD_ID= String.format("SELECT * FROM %s WHERE job_card_id = :job_card_id ORDER BY created_at DESC LIMIT 1;",TABLE_NAME); - private final String SELECT_BY_JOB_CARD_AND_DATE = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id AND (:start_date IS NULL OR :end_date IS NULL OR created_at BETWEEN :start_date AND :end_date)", TABLE_NAME ); - private final String SELECT_BY_DATE_QA_STATUS = String.format( "SELECT COUNT(*) FROM %s WHERE (:start_date IS NULL OR qc_done_at >= :start_date) AND qc_done_at <= :end_date AND qa_status = :qa_status AND id IN (:ids)", TABLE_NAME ); - private final String SELECT_BY_DATE_QA_STATUS_APPROVED= String.format( "SELECT COUNT(*) FROM %s WHERE (:start_date IS NULL OR qc_done_at >= :start_date) AND qc_done_at <= :end_date AND qa_status = :qa_status", TABLE_NAME ); + private final String COUNT_TOTAL_QA_ITEMS= String.format("SELECT COUNT(*) FROM %s WHERE job_card_id = :job_card_id AND inline_received = TRUE AND is_qa IS TRUE",TABLE_NAME); + private final String SELECT_BY_TIME_AND_CARD_ID= String.format("SELECT * FROM %s WHERE job_card_id = :job_card_id AND inline_received = TRUE ORDER BY created_at DESC LIMIT 1;",TABLE_NAME); + private final String SELECT_BY_JOB_CARD_AND_DATE = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id AND inline_received = TRUE AND (:start_date IS NULL OR :end_date IS NULL OR created_at BETWEEN :start_date AND :end_date)", TABLE_NAME ); + private final String SELECT_BY_DATE_QA_STATUS = String.format( "SELECT COUNT(*) FROM %s WHERE (:start_date IS NULL OR qc_done_at >= :start_date) AND inline_received = TRUE AND qc_done_at <= :end_date AND qa_status = :qa_status AND id IN (:ids)", TABLE_NAME ); + private final String SELECT_BY_DATE_QA_STATUS_APPROVED= String.format( "SELECT COUNT(*) FROM %s WHERE (:start_date IS NULL OR qc_done_at >= :start_date) AND inline_received = TRUE AND qc_done_at <= :end_date AND qa_status = :qa_status", TABLE_NAME ); public StitchingOfflineItemDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate) { this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/FinishedItemQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/FinishedItemQueryBuilder.java index 456ff45..2dc8de1 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/FinishedItemQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/FinishedItemQueryBuilder.java @@ -9,7 +9,7 @@ import java.time.LocalDate; public class FinishedItemQueryBuilder { - public static String buildQuery(String id, String itemId, String sku, String createdStartDate, String createdEndDate, String jobCardId, Long count) { + public static String buildQuery(String id, String itemId, String sku, String createdStartDate, String createdEndDate, String jobCardId, String status, Long count) { // format date String formattedDate; String formattedEndDate; @@ -38,6 +38,8 @@ public class FinishedItemQueryBuilder { .and() .columnEquals("job_card_id", jobCardId ) .and() + .columnEquals("qa_status", status ) + .and() .columnEqualToOrGreaterThan("created_at", startDate1) .and() .columnEqualToOrLessThan("created_at", endDate1 ) diff --git a/src/main/java/com/utopiaindustries/service/BundleService.java b/src/main/java/com/utopiaindustries/service/BundleService.java index f5fc8f0..196086a 100644 --- a/src/main/java/com/utopiaindustries/service/BundleService.java +++ b/src/main/java/com/utopiaindustries/service/BundleService.java @@ -110,13 +110,13 @@ public class BundleService { /* * find finished Items by params * */ - public List getFinishedItem(String id, String itemId, String sku, String createdStartDate, String createdEndDate, String jobCardId, Long count ){ + public List getFinishedItem(String id, String itemId, String sku, String createdStartDate, String createdEndDate, String jobCardId, String status ,Long count ){ List finishedItems = new ArrayList<>(); if( count == null ){ count = 100L; } - if( StringUtils.isAnyNotNullOrEmpty(id, itemId, sku, createdStartDate, createdEndDate, jobCardId ) ){ - String query = FinishedItemQueryBuilder.buildQuery( id, itemId, sku, createdStartDate, createdEndDate, jobCardId , count ); + if( StringUtils.isAnyNotNullOrEmpty(id, itemId, sku, createdStartDate, createdEndDate, jobCardId, status ) ){ + String query = FinishedItemQueryBuilder.buildQuery( id, itemId, sku, createdStartDate, createdEndDate, jobCardId, status, count ); System.out.println( query ); finishedItems = finishedItemDAO.findByQuery( query ); } else { diff --git a/src/main/java/com/utopiaindustries/service/InventoryService.java b/src/main/java/com/utopiaindustries/service/InventoryService.java index 45953dc..742ffc9 100644 --- a/src/main/java/com/utopiaindustries/service/InventoryService.java +++ b/src/main/java/com/utopiaindustries/service/InventoryService.java @@ -338,35 +338,25 @@ public class InventoryService { * */ @Transactional(rollbackFor = Exception.class, propagation = Propagation.NESTED) public void createStitchingOfflineItemsFromBundle(List bundles) { - List updatedItems = new ArrayList<>(); - JobCard jobCard = null; - for (Bundle subBundle : bundles) { + for (Bundle subBundle : bundles) { if (subBundle.getCurrentProduction() != null && subBundle.getCurrentProduction().compareTo(BigDecimal.ZERO) != 0) { Bundle bundle = bundleDAO.find(subBundle.getId()); - jobCard = jobCardDAO.find(subBundle.getJobCardId()); - long production = (bundle.getProduction() == null) ? 0 : bundle.getProduction().longValue(); JobCardItem jobCardItem = jobCardItemDAO.findByCardIdAndItemId(subBundle.getJobCardId(), subBundle.getItemId()); - BigDecimal previousTotalProduction = jobCardItem.getTotalProduction() == null ? BigDecimal.ZERO : jobCardItem.getTotalProduction(); // create stitchingOfflineItems items createStitchingOfflineItems(subBundle.getCurrentProduction(), jobCardItem, subBundle.getId()); - //update job card item and then add in list - jobCardItem.setTotalProduction(previousTotalProduction.add(subBundle.getCurrentProduction())); - jobCardItem.setJobCardId(jobCard.getId()); - updatedItems.add(jobCardItem); - // update bundle production - BigDecimal pro = BigDecimal.valueOf(production + subBundle.getCurrentProduction().longValue()); + BigDecimal pro = BigDecimal.valueOf(subBundle.getCurrentProduction().longValue()); bundle.setProduction(pro); bundleDAO.save(bundle); } } - jobCardItemDAO.saveAll(updatedItems); } @Transactional(rollbackFor = Exception.class, propagation = Propagation.NESTED) public void createStitchingOfflineItemsTransactionWhenReceivedMasterBundle(BundleWrapper wrapper) { + List updatedItems = new ArrayList<>(); //switching table transaction in Transaction Table InventoryTransaction transaction = createInventoryTransaction("Against Movement from Stitching to Stitched Offline Item"); inventoryTransactionDAO.save(transaction); @@ -381,14 +371,22 @@ public class InventoryService { // create IN Transactions of Finished Items into account createTransactions(stitchingOfflineItems, accountId, InventoryArtifactType.STITCHING_OFFLINE.name()); Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - List updatedItems = stitchingOfflineItems.stream().map(e-> { + List updatedStitchItems = stitchingOfflineItems.stream().map(e-> { e.setInlineReceived(true); e.setCreatedBy(authentication.getName()); return e; }).collect(Collectors.toList()); - stitchingOfflineItemDAO.saveAll(updatedItems); + stitchingOfflineItemDAO.saveAll(updatedStitchItems); + + JobCardItem jobCardItem = jobCardItemDAO.findByCardIdAndItemId(subBundle.getJobCardId(), subBundle.getItemId()); + BigDecimal previousTotalProduction = jobCardItem.getTotalProduction() == null ? BigDecimal.ZERO : jobCardItem.getTotalProduction(); + //update job card item and then add in list + jobCardItem.setTotalProduction(previousTotalProduction.add(subBundle.getWrapQuantity())); + updatedItems.add(jobCardItem); + } + jobCardItemDAO.saveAll(updatedItems); } @@ -544,6 +542,7 @@ public class InventoryService { createInventoryTransactionLeg(transaction, preCreatedItem, fromAccount, InventoryTransactionLeg.Type.OUT.name(), InventoryArtifactType.FINISHED_ITEM.name()); } stitchingOfflineItem.setIsQa(true); + stitchingOfflineItem.setInlineReceived(true); preCreatedItem.setIsQa(true); finishedItemsForUlter.add(preCreatedItem); // create IN in finishing Account Finished Item @@ -556,6 +555,7 @@ public class InventoryService { finishedItemsForUlter.add(preCreatedItem); } stitchingOfflineItem.setIsQa(false); + stitchingOfflineItem.setInlineReceived(true); } stitchingOfflineItem.setQaStatus(qaStatus); stitchingOfflineItem.setQcDoneAt(LocalDateTime.now()); diff --git a/src/main/resources/templates/stitching/_finished-item-sidebar.html b/src/main/resources/templates/finishing/_finished-item-sidebar.html similarity index 82% rename from src/main/resources/templates/stitching/_finished-item-sidebar.html rename to src/main/resources/templates/finishing/_finished-item-sidebar.html index 1ef7e6b..f87604a 100644 --- a/src/main/resources/templates/stitching/_finished-item-sidebar.html +++ b/src/main/resources/templates/finishing/_finished-item-sidebar.html @@ -33,10 +33,13 @@
- + + + + + +
diff --git a/src/main/resources/templates/finishing/finished-item-list.html b/src/main/resources/templates/finishing/finished-item-list.html index 283d652..e99259a 100644 --- a/src/main/resources/templates/finishing/finished-item-list.html +++ b/src/main/resources/templates/finishing/finished-item-list.html @@ -7,7 +7,7 @@
- +
@@ -26,7 +26,6 @@ Item ID Sku Job Card ID - Is QA Created At Created By Segregated @@ -38,23 +37,19 @@ - - NOT PERFORMED -
- PERFORMED -
-
- -
- - PENDING - REVERTED +
+ PENDING +
+
+ REVERTED +
DONE
+ diff --git a/src/main/resources/templates/quality-control/qc-items-list.html b/src/main/resources/templates/quality-control/qc-items-list.html index 509bfe9..2111a41 100644 --- a/src/main/resources/templates/quality-control/qc-items-list.html +++ b/src/main/resources/templates/quality-control/qc-items-list.html @@ -7,7 +7,7 @@
- +
diff --git a/src/main/resources/templates/stitching/_stitching-sidebar.html b/src/main/resources/templates/stitching/_stitching-sidebar.html new file mode 100644 index 0000000..e68804d --- /dev/null +++ b/src/main/resources/templates/stitching/_stitching-sidebar.html @@ -0,0 +1,59 @@ + + + + + + + +
+ + +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/stitching/stitched-offline-items.html b/src/main/resources/templates/stitching/stitched-offline-items.html index 3218a67..66fa578 100644 --- a/src/main/resources/templates/stitching/stitched-offline-items.html +++ b/src/main/resources/templates/stitching/stitched-offline-items.html @@ -7,7 +7,7 @@
- +
@@ -62,7 +62,7 @@ -

No Finished Items found.

+

No Stitching Items found.