WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 @Service
 public class BulkOrderService {
     private static final Logger LOGGER = LogManager.getLogger(BulkOrderService.class);
                 //Set here created by
                 Transaction transaction = transactionRepository.selectById(transactionId);
                 transaction.setCreatedBy(creatorId);
                 LOGGER.info("transaction created by {}", transaction.getCreatedBy());
                 commonPaymentService.payThroughWallet(transactionId);
+                // First PO always requires approval
+                if (isFirstPO) {
+                    approvalRequired = true;
+                }
                 if (approvalRequired) {
-                    this.createApproval(transactionId);
+                    this.createApproval(transactionId, isFirstPO);
                     if (loanId > 0) {
                         LoanTransaction loanTransaction = new LoanTransaction();
                         loanTransaction.setLoanId(loanId);
                         loanTransaction.setTransactionId(transactionId);
                         loanTransactionRepository.persist(loanTransaction);
+                    }
                 } else {
                     transactionService.processTransaction(transactionId, loanId);
+                }
-                // Send approval email to Sales L3 only for first PO
+                // Send approval email and track timeline for first PO
                 if (isFirstPO) {
                     try {
                         sendFirstPOApprovalEmail(fofoStore, transactionId, totalPayableAmount, creatorId);
                     } catch (Exception e) {
                         LOGGER.error("Failed to send first PO approval email for fofoId: " + fofoId, e);
                         if (fofoStore != null && fofoStore.getCode() != null) {
                             com.spice.profitmandi.dao.entity.fofo.PartnerOnBoardingPanel pob =
                                     partnerOnBoardingPanelRepository.selectByCode(fofoStore.getCode());
                             if (pob != null) {
                                 storeTimelineTatService.onPoCreationComplete(pob.getId());
-                                // If no approval required, PO is auto-approved
-                                if (!approvalRequired) {
-                                    storeTimelineTatService.onPoApprovalComplete(pob.getId());
-                                }
+                            }
+                        }
                     } catch (Exception e) {
                         LOGGER.error("Failed to track PO_CREATION timeline for fofoId: " + fofoId, e);
+                    }
+        }
         return finalBidStatus;
+    }
-    public void createApproval(int transactionId) {
+    public void createApproval(int transactionId, boolean firstPo) {
         TransactionApproval transactionApproval = new TransactionApproval();
         transactionApproval.setId(transactionId);
         transactionApproval.setStatus(TransactionApprovalStatus.PENDING);
+        transactionApproval.setFirstPo(firstPo);
         transactionApprovalRepository.persist(transactionApproval);
+    }
     private BulkOrderModel createBulkModel(XSSFRow row) throws ProfitMandiBusinessException {
         BulkOrderModel bulkOrderModel = new BulkOrderModel();
         List<TransactionApprovalModel> approvalModelList = new ArrayList<>();
         for (TransactionApproval transactionApproval : transactionApprovals) {
             List<Order> orderList = orderRepository.selectAllByTransactionId(transactionApproval.getId());
             Transaction transaction = transactionRepository.selectById(transactionApproval.getId());
             List<LineItemModel> lineItemModelList = new ArrayList<>();
+            // Fetch stock availability for all items in this order
+            Map<Integer, List<com.spice.profitmandi.model.WarehouseItemQtyModel>> stockMap = Collections.emptyMap();
+            try {
+                int retailerId = transaction.getRetailerId();
+                FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(retailerId);
+                if (fofoStore != null) {
+                    List<Integer> itemIds = orderList.stream()
+                            .map(o -> o.getLineItem().getItemId())
+                            .collect(java.util.stream.Collectors.toList());
+                    stockMap = orderRepository.getItemAvailability(fofoStore.getWarehouseId(), itemIds);
+                }
+            } catch (Exception e) {
+                LOGGER.error("Failed to fetch stock availability for transactionId: {}", transactionApproval.getId(), e);
+            }
             for (Order order : orderList) {
                 LineItem lineItem = order.getLineItem();
                 LineItemModel lineItemModel = new LineItemModel();
                 lineItemModel.setItemId(lineItem.getItemId());
                 lineItemModel.setItemName(lineItem.getItem().getItemDescription());
                 lineItemModel.setItemQuantity(lineItem.getQuantity());
                 lineItemModel.setSellingPrice(lineItem.getUnitPrice());
                 lineItemModel.setDp(tagListingRepository.selectByItemId(lineItem.getItemId()).getSellingPrice());
+                // Set available stock (show 0 if negative — negative means over-committed)
+                List<com.spice.profitmandi.model.WarehouseItemQtyModel> itemStock = stockMap.get(lineItem.getItemId());
+                if (itemStock != null && !itemStock.isEmpty()) {
+                    int totalAvailable = itemStock.stream().mapToInt(s -> s.getNetAvailability()).sum();
+                    lineItemModel.setAvailableStock(Math.max(0, totalAvailable));
+                }
                 lineItemModelList.add(lineItemModel);
+            }
             AuthUser authUser = authRepository.selectById(transaction.getCreatedBy());
             TransactionApprovalModel transactionApprovalModel = new TransactionApprovalModel();
             String retailerName = " ";
                 transactionApprovalModel.setCreatedBy(authUser.getFullName());
+            }
             transactionApprovalModel.setCreatedOn(transaction.getCreateTimestamp());
             transactionApprovalModel.setTransactionId(transactionApproval.getId());
             transactionApprovalModel.setLineItemModels(lineItemModelList);
+            transactionApprovalModel.setFirstPo(transactionApproval.isFirstPo());
             approvalModelList.add(transactionApprovalModel);
+        }
         return approvalModelList;
+    }
             model.setLineItemModels(lineItemModelList);
             model.setStatus(transactionApproval.getStatus().name());
             model.setApprovedBy(transactionApproval.getApprovedBy());
             model.setApprovedOn(transactionApproval.getApprovedOn());
             model.setRemark(transactionApproval.getRemark());
+            model.setFirstPo(transactionApproval.isFirstPo());
             approvalModelList.add(model);
+        }
         return approvalModelList;
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java – Rev 35971 → 35995