diff --git a/src/main/java/com/utopiaindustries/config/DataSourceConfiguration.java b/src/main/java/com/utopiaindustries/config/DataSourceConfiguration.java index 3b7fa28..4dd9cc3 100644 --- a/src/main/java/com/utopiaindustries/config/DataSourceConfiguration.java +++ b/src/main/java/com/utopiaindustries/config/DataSourceConfiguration.java @@ -35,22 +35,22 @@ public class DataSourceConfiguration { /* COSMOS */ - @Bean(name = "dataSourceCosmos") - @ConfigurationProperties(prefix = "spring.cosmosdatasource") - public DataSource cosmosDataSource() { - return DataSourceBuilder.create().build(); - } - - - @Bean(name = "jdbcTemplateCosmos") - public JdbcTemplate cosmosJdbcTemplate( @Qualifier( "dataSourceCosmos" ) DataSource ds ) { - return new JdbcTemplate( ds ); - } - - @Bean(name = "namedParameterJdbcTemplateCosmos") - public NamedParameterJdbcTemplate cosmosNamedParameterJdbcTemplate( @Qualifier( "dataSourceCosmos" ) DataSource ds ) { - return new NamedParameterJdbcTemplate( ds ); - } +// @Bean(name = "dataSourceCosmos") +// @ConfigurationProperties(prefix = "spring.cosmosdatasource") +// public DataSource cosmosDataSource() { +// return DataSourceBuilder.create().build(); +// } +// +// +// @Bean(name = "jdbcTemplateCosmos") +// public JdbcTemplate cosmosJdbcTemplate( @Qualifier( "dataSourceCosmos" ) DataSource ds ) { +// return new JdbcTemplate( ds ); +// } +// +// @Bean(name = "namedParameterJdbcTemplateCosmos") +// public NamedParameterJdbcTemplate cosmosNamedParameterJdbcTemplate( @Qualifier( "dataSourceCosmos" ) DataSource ds ) { +// return new NamedParameterJdbcTemplate( ds ); +// } /* LOCAL */ @@ -73,6 +73,4 @@ public class DataSourceConfiguration { public NamedParameterJdbcTemplate localNamedParameterJdbcTemplate( @Qualifier( "dataSourceLocal" ) DataSource ds ) { return new NamedParameterJdbcTemplate( ds ); } - - } diff --git a/src/main/java/com/utopiaindustries/controller/PackagingController.java b/src/main/java/com/utopiaindustries/controller/PackagingController.java index fbbeb60..a1b1f5b 100644 --- a/src/main/java/com/utopiaindustries/controller/PackagingController.java +++ b/src/main/java/com/utopiaindustries/controller/PackagingController.java @@ -35,6 +35,7 @@ public class PackagingController { @GetMapping("/receive-inventory") public String packagingItemReceive( Model model ){ + model.addAttribute("accounts", inventoryAccountService.findInventoryAccounts(6L)); model.addAttribute("wrapper", new FinishedItemWrapper() ); return "/packaging/receive-inventory-form"; } diff --git a/src/main/java/com/utopiaindustries/controller/ReportingController.java b/src/main/java/com/utopiaindustries/controller/ReportingController.java index 99d85bc..31bd530 100644 --- a/src/main/java/com/utopiaindustries/controller/ReportingController.java +++ b/src/main/java/com/utopiaindustries/controller/ReportingController.java @@ -34,6 +34,11 @@ public class ReportingController { this.inventoryAccountService = inventoryAccountService; } + @GetMapping + public String homePage( Model model ){ + return "redirect:/reporting/po-report"; + } + @GetMapping( "/summary") public String summary(@RequestParam(value = "item-id", required = false ) String itemId, @RequestParam(value = "sku" , required = false) String sku, @RequestParam(value = "start-date", required = false) String startDate, @RequestParam(value = "end-date", required = false) String endDate, Model model ){ diff --git a/src/main/java/com/utopiaindustries/controller/StoreController.java b/src/main/java/com/utopiaindustries/controller/StoreController.java index 3fc517c..0793816 100644 --- a/src/main/java/com/utopiaindustries/controller/StoreController.java +++ b/src/main/java/com/utopiaindustries/controller/StoreController.java @@ -33,6 +33,7 @@ public class StoreController { @GetMapping("/receive-inventory") public String packagingItemReceive( Model model ){ + model.addAttribute("accounts", inventoryAccountService.findInventoryAccounts(9L)); model.addAttribute("wrapper", new FinishedItemWrapper() ); return "/store/receive-inventory-form"; } @@ -43,7 +44,6 @@ public class StoreController { RedirectAttributes redirectAttributes, Model model ){ try { - System.out.println(wrapper); storeService.createStoreItems( wrapper ); redirectAttributes.addFlashAttribute("success", "Items Successfully received !" ); } catch ( Exception e ){ @@ -65,7 +65,7 @@ public class StoreController { if(StringUtils.isNullOrEmpty( active )){ return "redirect:/store/inventory-accounts?id=&title=&active=1&created-by=&start-date=&end-date=&site-id=&site-title=&count=100"; } - model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , null, null,true ) ); + model.addAttribute("accounts", inventoryAccountService.findInventoryAccounts(9L)); model.addAttribute("locations", locationService.findAll() ); return "/store/inventory-accounts"; } diff --git a/src/main/java/com/utopiaindustries/model/ctp/FinishedItemWrapper.java b/src/main/java/com/utopiaindustries/model/ctp/FinishedItemWrapper.java index 1785347..c9ec995 100644 --- a/src/main/java/com/utopiaindustries/model/ctp/FinishedItemWrapper.java +++ b/src/main/java/com/utopiaindustries/model/ctp/FinishedItemWrapper.java @@ -5,7 +5,7 @@ import java.util.List; public class FinishedItemWrapper { private String qaStatus; - private long accountId; + private Long accountId; private List items; @@ -25,11 +25,11 @@ public class FinishedItemWrapper { this.qaStatus = qaStatus; } - public long getAccountId() { + public Long getAccountId() { return accountId; } - public void setAccountId(long accountId) { + public void setAccountId(Long accountId) { this.accountId = accountId; } diff --git a/src/main/java/com/utopiaindustries/service/DashboardService.java b/src/main/java/com/utopiaindustries/service/DashboardService.java index 1ba3ea3..119d0bd 100644 --- a/src/main/java/com/utopiaindustries/service/DashboardService.java +++ b/src/main/java/com/utopiaindustries/service/DashboardService.java @@ -80,10 +80,10 @@ public class DashboardService { approvedStitchingOfflineItems = stitchingOfflineItemDAO.findByQCOperationDateAndApproved(startDate1, endDate1, "APPROVED"); qcReject = stitchingOfflineItemDAO.findByQCOperationDateAndIds(startDate1, endDate1, "REJECT", stitchingItemIds); remaininfQcAlterPieces = stitchingOfflineItemDAO.findByQCOperationDateAndIds(null, forPreviousDate, "REJECT", stitchingItemIds); - approvedStitchingOfflineItemsThenReject = stitchingOfflineItemDAO.findByQCOperationDateAndIds(startDate1, endDate1, "REJECT", stitchingOutIds); - } - + if(stitchingOutIds != null && !stitchingOutIds.isEmpty()) { + approvedStitchingOfflineItemsThenReject = stitchingOfflineItemDAO.findByQCOperationDateAndIds(startDate1, endDate1, "REJECT", stitchingOutIds); + } //set finishing related details Long alterationPieceFinish = 0L; Long rejectFinishedItem = 0L; @@ -127,7 +127,7 @@ public class DashboardService { progress.put("totalWips", (float) stitchingItemIds.size() - qcReject); progress.put("Alteration", (float) qcReject + approvedStitchingOfflineItemsThenReject); - progress.put("finishing", (float) approved + operationNotPerformed); + progress.put("finishing", (float) approved ); progress.put("ALTER", (float) alterationPieceFinish); progress.put("Reject", (float) rejectFinishedItem); progress.put("wash", (float) washFinishedItem); diff --git a/src/main/java/com/utopiaindustries/service/InventoryService.java b/src/main/java/com/utopiaindustries/service/InventoryService.java index fbc6199..5831ae7 100644 --- a/src/main/java/com/utopiaindustries/service/InventoryService.java +++ b/src/main/java/com/utopiaindustries/service/InventoryService.java @@ -614,6 +614,7 @@ public class InventoryService { createInventoryTransactionLeg(transaction, finishedItem, lastOutTransaction.getAccountId(), InventoryTransactionLeg.Type.IN.name(), InventoryArtifactType.FINISHED_ITEM.name()); finishedItem.setQaStatus("ALTER"); finishedItem.setIsSegregated(false); + finishedItem.setIsQa(false); } } @@ -661,7 +662,7 @@ public class InventoryService { * Packaging items * */ @Transactional(rollbackFor = Exception.class, propagation = Propagation.NESTED) - public void createPackagingItemAndTransaction(FinishedItemWrapper wrapper) { + public void createPackagingItemAndTransaction(FinishedItemWrapper wrapper, long accountId) { if (wrapper != null && wrapper.getItems() != null) { List items = wrapper.getItems(); @@ -693,9 +694,10 @@ public class InventoryService { if (lastInvTransaction != null) { // OUT long fromAccount = lastInvTransaction.getAccountId(); + packagingItems1.setAccountId(fromAccount); createInventoryTransactionLeg(transaction, finishedItem, fromAccount, InventoryTransactionLeg.Type.OUT.name(), InventoryArtifactType.FINISHED_ITEM.name()); // IN - createInventoryTransactionLeg(transaction, packagingItems1, 8, InventoryTransactionLeg.Type.IN.name(), InventoryArtifactType.PACKAGING.name()); + createInventoryTransactionLeg(transaction, packagingItems1, accountId, InventoryTransactionLeg.Type.IN.name(), InventoryArtifactType.PACKAGING.name()); } finishedItem.setIsSegregated(true); finishedItem.setPackaging(true); @@ -744,6 +746,7 @@ public class InventoryService { if (lastInvTransaction != null) { // OUT long fromAccount = lastInvTransaction.getAccountId(); + storeItem.setAccountId(fromAccount); createInventoryTransactionLeg(transaction, finishedItem, fromAccount, InventoryTransactionLeg.Type.OUT.name(), InventoryArtifactType.FINISHED_ITEM.name()); // IN createInventoryTransactionLeg(transaction, storeItem, toAccount, InventoryTransactionLeg.Type.IN.name(), InventoryArtifactType.STORED_ITEM.name()); diff --git a/src/main/java/com/utopiaindustries/service/PackagingService.java b/src/main/java/com/utopiaindustries/service/PackagingService.java index f0b86b2..734ef99 100644 --- a/src/main/java/com/utopiaindustries/service/PackagingService.java +++ b/src/main/java/com/utopiaindustries/service/PackagingService.java @@ -16,7 +16,7 @@ public class PackagingService { } public void createPackagingItem(FinishedItemWrapper wrapper){ - inventoryService.createPackagingItemAndTransaction(wrapper); + inventoryService.createPackagingItemAndTransaction(wrapper, wrapper.getAccountId()); } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9c396ee..7c3f62d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,8 +1,8 @@ spring: uinddatasource: - jdbcUrl: jdbc:mysql://192.168.90.147:3306 - username: utopia - password: Utopia01 + jdbcUrl: jdbc:mysql://utopia-industries-rr.c5qech8o9lgg.us-east-1.rds.amazonaws.com:3306/inventory + username: cut-to-pack + password: mAzFAivImnTqKJx4KNJ0 driverClassName: com.mysql.cj.jdbc.Driver logbackUrl: jdbc:mysql://192.168.90.147:3306/uind_logs?serverTimezone=Asia/Karachi hikari: @@ -19,7 +19,7 @@ spring: pool-name: UINDCosmosPool leak-detection-threshold: 2000 localdatasource: - jdbcUrl: jdbc:mysql://192.168.90.147:3306/cut_to_pack + jdbcUrl: jdbc:mysql://localhost:3306/cut_to_pack username: utopia password: Utopia01 driverClassName: com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 1f8f01f..b7c3b85 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -9,7 +9,7 @@ spring: minimum-idle: 5 idle-timeout: 30000 # 30 seconds max-lifetime: 1800000 # 30 minutes - connection-timeout: 30000 # 30 seconds + connection-timeout: 60000 # 30 seconds leak-detection-threshold: 10000 cosmosdatasource: jdbcUrl: jdbc:mysql://192.168.90.147:3307 diff --git a/src/main/resources/templates/_fragments.html b/src/main/resources/templates/_fragments.html index ab908a6..c41fdf4 100644 --- a/src/main/resources/templates/_fragments.html +++ b/src/main/resources/templates/_fragments.html @@ -79,7 +79,7 @@ th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/store') ? 'active' : ''}">Store
  • - Reporting
    • @@ -141,6 +141,17 @@ + + + + + + diff --git a/src/main/resources/templates/packaging/receive-inventory-form.html b/src/main/resources/templates/packaging/receive-inventory-form.html index 6f390e7..8171fa2 100644 --- a/src/main/resources/templates/packaging/receive-inventory-form.html +++ b/src/main/resources/templates/packaging/receive-inventory-form.html @@ -7,10 +7,11 @@
    +
    -

    Receive Finished Items

    +

    Receive Packing Items

    -
    +
    @@ -21,13 +22,13 @@
    - - - - - - - + +
    diff --git a/src/main/resources/templates/purchaseOrder/purchase-order-list.html b/src/main/resources/templates/purchaseOrder/purchase-order-list.html index 2483b41..d95b5ed 100644 --- a/src/main/resources/templates/purchaseOrder/purchase-order-list.html +++ b/src/main/resources/templates/purchaseOrder/purchase-order-list.html @@ -13,7 +13,7 @@
    -

    Job Cards

    +

    All PO's

    Add New
    @@ -55,7 +55,7 @@ -

    No cards found.

    +

    No POs found.

    diff --git a/src/main/resources/templates/store/inventory-accounts.html b/src/main/resources/templates/store/inventory-accounts.html index b5739df..ae0a17c 100644 --- a/src/main/resources/templates/store/inventory-accounts.html +++ b/src/main/resources/templates/store/inventory-accounts.html @@ -1,7 +1,7 @@ - +
    @@ -13,7 +13,7 @@
    -

    Packaging Inventory Accounts

    +

    Store Inventory Accounts

    diff --git a/src/main/resources/templates/store/receive-inventory-form.html b/src/main/resources/templates/store/receive-inventory-form.html index 1546ead..5170b90 100644 --- a/src/main/resources/templates/store/receive-inventory-form.html +++ b/src/main/resources/templates/store/receive-inventory-form.html @@ -1,33 +1,34 @@ - +
    +
    -

    Receive Finished Items

    +

    Receive Rejected Items

    - +
    -
    - - - - - - - - +
    +
    + +
    @@ -38,7 +39,7 @@ v-on:remove-item="removeItem" >
    -
    Duplicate Item Selected
    +
    Duplicate Item Selected
    Cancel