Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37099 5 d 13 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ GRN: default supplier invoiceDate to received date when blank

Operators frequently leave invoiceDate empty on PO-based GRN uploads
(addPORowModels), persisting NULL invoice.invoiceDate (~26% of received
invoices historically). This breaks the warehouse ageing/valuation
reports that key off invoiceDate. Default it to the received date at the
single feed into addWarehouseSupplierInvoice, matching the historical
backfill convention. Fofo newReceiveInvoice already enforces this.
 
36910 27 d 15 h amit /trunk/profitmandi-dao/src/main/ Internal PO: map created transaction to PO; block warehouse change for PO-mapped orders

- WarehousePurchaseOrder: add transactionId column + selectByTransactionId
- createOrderInternally returns txn id; createPurchaseOrder maps it onto the PO
- Block order.setWarehouseId for PO-mapped orders in changeFulfillmentWarehouse; cron moveOrders skips them
- Migration: add warehouse.purchaseorder.transactionId
 
36640 60 d 7 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ Fix NPE in addQuantity when inventory snapshot missing for partner warehouse - use addAvailability which creates snapshot if absent  
36624 61 d 12 h amit /trunk/profitmandi-dao/src/main/java/ Thrift cleanup: migrate types, remove dead code, add moved files

- Added Affiliate.java POJO (replaces Thrift struct)
- Moved from profitmandi-common: WalletHistoryModel, ExcelUtils, CustomOrder
- Removed dead createReturnTransaction method from ReturnService/Impl
- Removed dead getPartnerStockOnDate from InventoryService/Impl
- Replaced CatalogServiceException with Exception in PdfPoSheetGenerator
- Removed Thrift client imports from UserServiceImpl
 
36611 62 d 12 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ Allow GRN corrections for SALE_RET items in addition to PURCHASE - serial correction, serialized item change, and non-serialized item change paths all now accept SALE_RET scan type since the item is back in warehouse custody  
36586 64 d 14 h aman /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix:Restructure mail send  
36542 68 d 7 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ Validate oldItemId exists on invoice at GRN correction request creation time  
36450 80 d 9 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Refactor applyReceipt: extract scan creation to WarehouseInventoryService.recordReturnScan with validation for all return types (SALE_RET/DOA_IN/SALE_RET_UNUSABLE), qty>0, sold-qty capacity check, and SALE_RET warehouse capacity check  
36417 84 d 8 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ Fix:PO item swap — update/delete old PURCHASE scan record when reducing quantity on swapped inventory item  
36414 84 d 10 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ without vendor catalog pricing po will not create  
36399 85 d 12 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked  
36314 92 d 14 h amit /trunk/profitmandi-dao/src/main/ Fix Dummy warehouse creation defaults and backfill invoice receiveDate

- ensureDummyForBillingRegion: set isAvailabilityMonitored=0, transferDelayInHours=0,
source=0 explicitly; copy logisticsLocation and pincode from billing warehouse
(matches createVendorWarehouse pattern)
- Add SQL to backfill warehouse.invoice.receiveDate from warehouse.purchase.receivedOn
for received invoices where receiveDate is NULL
 
36309 93 d 2 h amit /trunk/profitmandi-dao/src/main/ Route phantom orders to per-region Dummy warehouse; complete applyColorChange rename

- Phantom allocations in getFulfillments route to the Dummy/GOOD/OURS warehouse under
vendor 40 for the partner's billing region. WarehouseServiceImpl.ensureDummyForBillingRegion
returns the existing Dummy or creates one on the fly. createVendorWarehouse hook auto-seeds
a Dummy when a new billing region's first warehouse is created.
- WarehouseRepository.selectByVendorBillingAndType supports the lookup.
- OrderService interface: rename notifyColorChange -> applyColorChange to match r36305's impl
rename (r36305 renamed only the impl, leaving trunk inconsistent).
- PurchaseOrderServiceImpl: remove auto-rebalance on PO receive. Real-wh rebalancing and
phantom-to-real binding are now ops-driven via the order billing UI
(changeFulfillmentWarehouse / applyColorChange / moveOrdersFulfilmentWarehouse).
- migration_dummy_warehouses.sql: idempotent seeding script for 14 Dummy/GOOD/OURS warehouses
under vendor 40, one per WAREHOUSE_MAP billing region that lacked one. Already applied to
hadb1 and local.
 
36298 95 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ GRN correction: auto-approve IMEI-only and color-only changes

When a correction request contains only IMEI swaps or item swaps where
old and new items share modelName+modelNumber (color-only change), the
request is persisted as APPROVED with requester as approver and applied
immediately. Mixed/model/qty changes continue to go through the existing
PENDING approval flow.
 
36283 96 d 7 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ uday sing maill added in po approval  
36272 98 d 8 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Add receiveDate to WarehouseSupplierInvoice

Added receiveDate field to warehouse.invoice entity to track when goods
were physically received. Set from PORowModel.getReceivedDate() during
GRN processing in PurchaseOrderServiceImpl.addPORowModels.
 
36270 98 d 9 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ Fix purchase.receivedOn to use actual GRN time instead of invoice registration date  
36208 106 d 6 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ GRN correction approval: validate IMEI count matches qty, suggest rejection on mismatch  
36207 106 d 6 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ GRN correction approval: split space/comma-separated IMEIs in applyQtyCorrections for existing requests  
36205 106 d 6 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ GRN correction: split space/comma-separated IMEIs, validate count matches qty  

Show All