Subversion Repositories SmartDukaan

Rev

Rev 12591 | Rev 12800 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 12591 Rev 12658
Line 432... Line 432...
432
	 #{itemId} 
432
	 #{itemId} 
433
	</foreach> 
433
	</foreach> 
434
	and t.destinationWarehouseId in (select id from inventory.warehouse where vendor_id= 40 
434
	and t.destinationWarehouseId in (select id from inventory.warehouse where vendor_id= 40 
435
	and inventoryType = 'GOOD' and warehouseType ='OURS_THIRDPARTY' and source = 3) 
435
	and inventoryType = 'GOOD' and warehouseType ='OURS_THIRDPARTY' and source = 3) 
436
	AND t.status in ('TRANSFER_COMPLETE','IN_TRANSIT','PARTIAL_TRANSFER') 
436
	AND t.status in ('TRANSFER_COMPLETE','IN_TRANSIT','PARTIAL_TRANSFER') 
437
	AND i.transferStatus is not null AND type='WAREHOUSE_TRANSFER_OUT' 
437
	AND i.transferStatus is not null AND s.type='WAREHOUSE_TRANSFER_OUT' 
438
	GROUP BY i.itemId, s.transferLotId, i.purchaseId, i.id order by s.scannedAt desc) 
438
	GROUP BY i.itemId, s.transferLotId, i.purchaseId, i.id order by s.scannedAt desc) 
439
	as X GROUP BY X.inventoryItemId 
439
	as X GROUP BY X.inventoryItemId 
440
	UNION SELECT Y.itemId, Y.purchaseId, Y.purchaseDate, Y.quantity, Y.unitPrice, Y.nlc, Y.brand, 
440
	UNION SELECT Y.itemId, Y.purchaseId, Y.purchaseDate, Y.quantity, Y.unitPrice, Y.nlc, Y.brand, 
441
	Y.modelName, Y.modelNumber, Y.category, Y.color , Y.inventoryItemId, Y.scanTime, Y.taxType 
441
	Y.modelName, Y.modelNumber, Y.category, Y.color , Y.inventoryItemId, Y.scanTime, Y.taxType 
442
	FROM (SELECT i.itemId as itemId, i.purchaseId as purchaseId, p.receivedOn as purchaseDate, 
442
	FROM (SELECT i.itemId as itemId, i.purchaseId as purchaseId, p.receivedOn as purchaseDate,