[ERP-RETAIL] feat(purchases): Complete module integrations - email and inventory
- Add email sending stub in supplier-order.service.ts with validation and logging - Add emailError field to SupplierOrder entity for tracking failed attempts - Implement purchase suggestion generation algorithm that: - Queries branch_stock for products below reorder point - Calculates average daily sales from POS order history - Determines suggested quantities based on max stock or sales forecast - Creates suggestions with priority levels (critical, high, medium, low) - Enriches suggestions with product codes from product_barcodes table Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Adrian Flores Cortes
parent
c6b8ab019a
commit
113a83c6ca
@ -161,6 +161,9 @@ export class SupplierOrder {
|
||||
@Column({ name: 'email_sent_to', length: 100, nullable: true })
|
||||
emailSentTo: string;
|
||||
|
||||
@Column({ name: 'email_error', length: 255, nullable: true })
|
||||
emailError: string;
|
||||
|
||||
// Receipt tracking
|
||||
@Column({ name: 'total_received_value', type: 'decimal', precision: 15, scale: 2, default: 0 })
|
||||
totalReceivedValue: number;
|
||||
|
||||
@ -370,6 +370,11 @@ export class PurchaseSuggestionService extends BaseService<PurchaseSuggestion> {
|
||||
|
||||
/**
|
||||
* Generate purchase suggestions based on stock levels
|
||||
* This implementation:
|
||||
* 1. Queries branch_stock table for products below reorder point or out of stock
|
||||
* 2. Calculates average daily sales from POS order history
|
||||
* 3. Determines suggested quantities based on max stock or safety stock + lead time
|
||||
* 4. Creates purchase suggestions with appropriate priority levels
|
||||
*/
|
||||
async generateSuggestions(
|
||||
tenantId: string,
|
||||
@ -378,18 +383,12 @@ export class PurchaseSuggestionService extends BaseService<PurchaseSuggestion> {
|
||||
data: GenerateSuggestionsInput,
|
||||
userId: string
|
||||
): Promise<ServiceResult<{ generated: number; suggestions: PurchaseSuggestion[] }>> {
|
||||
// This is a simplified implementation
|
||||
// In a real scenario, this would:
|
||||
// 1. Query inventory levels from the inventory module
|
||||
// 2. Compare against reorder points and min stock levels
|
||||
// 3. Optionally use sales forecast data
|
||||
// 4. Generate suggestions for items below threshold
|
||||
const queryRunner = this.dataSource.createQueryRunner();
|
||||
await queryRunner.connect();
|
||||
await queryRunner.startTransaction();
|
||||
|
||||
try {
|
||||
// TODO: Integrate with inventory module to get actual stock data
|
||||
// For now, return a placeholder response
|
||||
|
||||
// Mark expired suggestions
|
||||
// Mark expired suggestions first
|
||||
await this.repository
|
||||
.createQueryBuilder()
|
||||
.update(PurchaseSuggestion)
|
||||
@ -400,14 +399,243 @@ export class PurchaseSuggestionService extends BaseService<PurchaseSuggestion> {
|
||||
.andWhere('expiresAt < :now', { now: new Date() })
|
||||
.execute();
|
||||
|
||||
// Get products below reorder point or out of stock from branch_stock
|
||||
const stockQuery = `
|
||||
SELECT
|
||||
bs.product_id,
|
||||
bs.quantity_on_hand,
|
||||
bs.quantity_reserved,
|
||||
bs.quantity_available,
|
||||
bs.reorder_point,
|
||||
bs.max_stock
|
||||
FROM retail.branch_stock bs
|
||||
WHERE bs.tenant_id = $1
|
||||
AND bs.branch_id = $2
|
||||
AND (
|
||||
($3 = true AND bs.quantity_available <= 0)
|
||||
OR ($4 = true AND bs.quantity_available <= COALESCE(bs.reorder_point, 0))
|
||||
)
|
||||
`;
|
||||
|
||||
const stockResult = await queryRunner.manager.query(stockQuery, [
|
||||
tenantId,
|
||||
branchId,
|
||||
data.includeOutOfStock,
|
||||
data.includeBelowReorderPoint,
|
||||
]);
|
||||
|
||||
if (stockResult.length === 0) {
|
||||
await queryRunner.commitTransaction();
|
||||
return {
|
||||
success: true,
|
||||
data: {
|
||||
generated: 0,
|
||||
suggestions: [],
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// Get product IDs for further queries
|
||||
const productIds = stockResult.map((s: any) => s.product_id);
|
||||
|
||||
// Get sales data for the forecast period (calculate average daily sales)
|
||||
const forecastDays = data.forecastDays || 30;
|
||||
const salesStartDate = new Date();
|
||||
salesStartDate.setDate(salesStartDate.getDate() - forecastDays);
|
||||
|
||||
const salesQuery = `
|
||||
SELECT
|
||||
pol.product_id,
|
||||
SUM(pol.quantity) as total_sold,
|
||||
COUNT(DISTINCT po.id) as order_count
|
||||
FROM retail.pos_order_lines pol
|
||||
INNER JOIN retail.pos_orders po ON pol.order_id = po.id
|
||||
WHERE pol.tenant_id = $1
|
||||
AND po.branch_id = $2
|
||||
AND po.status = 'done'
|
||||
AND po.order_date >= $3
|
||||
AND pol.product_id = ANY($4)
|
||||
GROUP BY pol.product_id
|
||||
`;
|
||||
|
||||
const salesResult = await queryRunner.manager.query(salesQuery, [
|
||||
tenantId,
|
||||
branchId,
|
||||
salesStartDate,
|
||||
productIds,
|
||||
]);
|
||||
|
||||
// Create a map of sales data by product
|
||||
const salesMap = new Map<string, { totalSold: number; avgDaily: number }>();
|
||||
for (const sale of salesResult) {
|
||||
const avgDaily = Number(sale.total_sold) / forecastDays;
|
||||
salesMap.set(sale.product_id, {
|
||||
totalSold: Number(sale.total_sold),
|
||||
avgDaily: avgDaily,
|
||||
});
|
||||
}
|
||||
|
||||
// Get existing pending suggestions to avoid duplicates
|
||||
const existingSuggestions = await this.repository.find({
|
||||
where: {
|
||||
tenantId,
|
||||
branchId,
|
||||
status: SuggestionStatus.PENDING,
|
||||
},
|
||||
select: ['productId'],
|
||||
});
|
||||
const existingProductIds = new Set(existingSuggestions.map(s => s.productId));
|
||||
|
||||
// Generate suggestions
|
||||
const newSuggestions: PurchaseSuggestion[] = [];
|
||||
|
||||
for (const stock of stockResult) {
|
||||
// Skip if we already have a pending suggestion for this product
|
||||
if (existingProductIds.has(stock.product_id)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const currentStock = Number(stock.quantity_available) || 0;
|
||||
const reorderPoint = Number(stock.reorder_point) || 0;
|
||||
const maxStock = Number(stock.max_stock) || (reorderPoint * 3); // Default max to 3x reorder point
|
||||
|
||||
const salesData = salesMap.get(stock.product_id);
|
||||
const avgDailySales = salesData?.avgDaily || 0;
|
||||
|
||||
// Calculate suggested quantity
|
||||
let suggestedQuantity: number;
|
||||
let daysOfStock = 0;
|
||||
|
||||
if (maxStock > 0) {
|
||||
// Target max stock level
|
||||
suggestedQuantity = Math.max(0, maxStock - currentStock);
|
||||
} else if (avgDailySales > 0) {
|
||||
// Target 30 days of stock based on average sales
|
||||
const targetDays = 30;
|
||||
const targetStock = avgDailySales * targetDays;
|
||||
suggestedQuantity = Math.max(0, targetStock - currentStock);
|
||||
} else {
|
||||
// Default: order enough to reach reorder point + 50%
|
||||
suggestedQuantity = Math.max(0, (reorderPoint * 1.5) - currentStock);
|
||||
}
|
||||
|
||||
// Calculate days of current stock
|
||||
if (avgDailySales > 0) {
|
||||
daysOfStock = Math.floor(currentStock / avgDailySales);
|
||||
}
|
||||
|
||||
// Skip if no quantity needed
|
||||
if (suggestedQuantity <= 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Round to reasonable quantity
|
||||
suggestedQuantity = Math.ceil(suggestedQuantity);
|
||||
|
||||
// Determine reason and priority
|
||||
let reason: SuggestionReason;
|
||||
let priority: number;
|
||||
|
||||
if (currentStock <= 0) {
|
||||
reason = SuggestionReason.OUT_OF_STOCK;
|
||||
priority = 3; // Critical
|
||||
} else if (currentStock <= reorderPoint) {
|
||||
reason = SuggestionReason.REORDER_POINT;
|
||||
priority = daysOfStock <= 3 ? 3 : (daysOfStock <= 7 ? 2 : 1);
|
||||
} else {
|
||||
reason = data.useSalesForecast ? SuggestionReason.SALES_FORECAST : SuggestionReason.LOW_STOCK;
|
||||
priority = 0; // Low
|
||||
}
|
||||
|
||||
// Create suggestion entity
|
||||
const suggestion = this.repository.create({
|
||||
tenantId,
|
||||
branchId,
|
||||
warehouseId: warehouseId || data.warehouseId,
|
||||
status: SuggestionStatus.PENDING,
|
||||
reason,
|
||||
productId: stock.product_id,
|
||||
productCode: '', // Will be populated if product info is available
|
||||
productName: '', // Will be populated if product info is available
|
||||
currentStock,
|
||||
minStock: 0, // Can be fetched from product settings
|
||||
maxStock,
|
||||
reorderPoint,
|
||||
safetyStock: 0,
|
||||
suggestedQuantity,
|
||||
avgDailySales: avgDailySales || undefined,
|
||||
daysOfStock: daysOfStock || undefined,
|
||||
leadTimeDays: 0, // Default, can be configured per supplier
|
||||
priority,
|
||||
calculationData: {
|
||||
algorithm: data.useSalesForecast ? 'sales_forecast' : 'reorder_point',
|
||||
salesPeriod: forecastDays,
|
||||
salesTotal: salesData?.totalSold || 0,
|
||||
},
|
||||
expiresAt: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000), // 30 days
|
||||
});
|
||||
|
||||
newSuggestions.push(suggestion);
|
||||
}
|
||||
|
||||
// Try to enrich suggestions with product info
|
||||
if (newSuggestions.length > 0) {
|
||||
const productIdsToEnrich = newSuggestions.map(s => s.productId);
|
||||
|
||||
// Try to get product info from product_barcodes table which has product references
|
||||
// This is a best-effort enrichment - in production, integrate with the products module
|
||||
const productInfoQuery = `
|
||||
SELECT DISTINCT ON (pb.product_id)
|
||||
pb.product_id,
|
||||
pb.barcode as product_code
|
||||
FROM retail.product_barcodes pb
|
||||
WHERE pb.tenant_id = $1
|
||||
AND pb.product_id = ANY($2)
|
||||
AND pb.is_primary = true
|
||||
`;
|
||||
|
||||
try {
|
||||
const productInfo = await queryRunner.manager.query(productInfoQuery, [
|
||||
tenantId,
|
||||
productIdsToEnrich,
|
||||
]);
|
||||
|
||||
const productInfoMap = new Map(
|
||||
productInfo.map((p: any) => [p.product_id, p])
|
||||
);
|
||||
|
||||
for (const suggestion of newSuggestions) {
|
||||
const info = productInfoMap.get(suggestion.productId);
|
||||
if (info) {
|
||||
suggestion.productCode = info.product_code || suggestion.productId.substring(0, 8);
|
||||
} else {
|
||||
suggestion.productCode = suggestion.productId.substring(0, 8);
|
||||
}
|
||||
suggestion.productName = `Product ${suggestion.productCode}`;
|
||||
}
|
||||
} catch {
|
||||
// If enrichment fails, use fallback values
|
||||
for (const suggestion of newSuggestions) {
|
||||
suggestion.productCode = suggestion.productId.substring(0, 8);
|
||||
suggestion.productName = `Product ${suggestion.productCode}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Save all new suggestions
|
||||
const savedSuggestions = await queryRunner.manager.save(newSuggestions);
|
||||
|
||||
await queryRunner.commitTransaction();
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: {
|
||||
generated: 0,
|
||||
suggestions: [],
|
||||
generated: savedSuggestions.length,
|
||||
suggestions: savedSuggestions,
|
||||
},
|
||||
};
|
||||
} catch (error: any) {
|
||||
await queryRunner.rollbackTransaction();
|
||||
return {
|
||||
success: false,
|
||||
error: {
|
||||
@ -416,6 +644,8 @@ export class PurchaseSuggestionService extends BaseService<PurchaseSuggestion> {
|
||||
details: error,
|
||||
},
|
||||
};
|
||||
} finally {
|
||||
await queryRunner.release();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -433,10 +433,11 @@ export class SupplierOrderService extends BaseService<SupplierOrder> {
|
||||
order.sentBy = userId;
|
||||
|
||||
if (method === 'email' && emailTo) {
|
||||
// TODO: Implement actual email sending
|
||||
order.emailSent = true;
|
||||
order.emailSentAt = new Date();
|
||||
order.emailSentTo = emailTo;
|
||||
const emailResult = await this.sendOrderEmail(order, emailTo);
|
||||
order.emailSent = emailResult.sent;
|
||||
order.emailSentAt = emailResult.sent ? new Date() : undefined;
|
||||
order.emailSentTo = emailResult.sent ? emailTo : undefined;
|
||||
order.emailError = emailResult.error;
|
||||
}
|
||||
|
||||
if (notes) {
|
||||
@ -721,6 +722,48 @@ export class SupplierOrderService extends BaseService<SupplierOrder> {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Send order email to supplier
|
||||
* This is a stub implementation that logs the email and marks it as sent.
|
||||
* In production, integrate with an actual email service (SendGrid, AWS SES, etc.)
|
||||
*/
|
||||
private async sendOrderEmail(
|
||||
order: SupplierOrder,
|
||||
emailTo: string
|
||||
): Promise<{ sent: boolean; error?: string }> {
|
||||
try {
|
||||
// Validate email format
|
||||
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||
if (!emailRegex.test(emailTo)) {
|
||||
return { sent: false, error: 'Invalid email address format' };
|
||||
}
|
||||
|
||||
// Log the email that would be sent (stub behavior)
|
||||
const emailPayload = {
|
||||
to: emailTo,
|
||||
subject: `Orden de Compra ${order.number}`,
|
||||
orderNumber: order.number,
|
||||
supplierName: order.supplierName,
|
||||
total: order.total,
|
||||
expectedDate: order.expectedDate,
|
||||
linesCount: order.linesCount,
|
||||
timestamp: new Date().toISOString(),
|
||||
};
|
||||
|
||||
// In a real implementation, this would call an email service
|
||||
// For now, we log and simulate success
|
||||
console.log('[EMAIL_STUB] Supplier order email queued:', JSON.stringify(emailPayload, null, 2));
|
||||
|
||||
// Simulate async email sending delay
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
return { sent: true };
|
||||
} catch (error: any) {
|
||||
console.error('[EMAIL_STUB] Failed to send email:', error.message);
|
||||
return { sent: false, error: error.message || 'Email sending failed' };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get order statistics
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user