备份:大改造前的完整版本 - 修复合同细节/付款节点/文件上传/施工管理/项目保存等BUG
This commit is contained in:
@@ -61,7 +61,7 @@ router.get('/', async (req, res) => {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
message: '获取验收单列表失败',
|
||||
error: error.message
|
||||
error: process.env.NODE_ENV === 'development' ? error.message : '操作失败'
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -108,7 +108,7 @@ router.get('/:id', async (req, res) => {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
message: '获取验收单详情失败',
|
||||
error: error.message
|
||||
error: process.env.NODE_ENV === 'development' ? error.message : '操作失败'
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -152,8 +152,9 @@ router.post('/', async (req, res) => {
|
||||
(code, purchase_order_id, logistics_record_id, verification_type,
|
||||
verification_date, verifier, items, total_ordered, total_received,
|
||||
total_verified, total_rejected, project_id, storage_type, status, remark, attachments, created_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending', ?, ?, CURRENT_TIMESTAMP)
|
||||
`, [code, purchase_order_id, logistics_record_id, verification_type || 'direct',
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, 'pending', $14, $15, CURRENT_TIMESTAMP)
|
||||
RETURNING id`,
|
||||
[code, purchase_order_id, logistics_record_id, verification_type || 'direct',
|
||||
verification_date, verifier, itemsJson, totalOrdered, totalReceived,
|
||||
totalVerified, totalRejected, project_id, storage_type, remark, attachments]);
|
||||
|
||||
@@ -173,7 +174,7 @@ router.post('/', async (req, res) => {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
message: '创建验收单失败',
|
||||
error: error.message
|
||||
error: process.env.NODE_ENV === 'development' ? error.message : '操作失败'
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -233,8 +234,9 @@ router.post('/:id/confirm', async (req, res) => {
|
||||
await db.query(`
|
||||
INSERT INTO project_material_inventory
|
||||
(project_id, product_id, product_name, unit, received_quantity, current_quantity, total_amount, average_price, created_at, updated_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
|
||||
`, [verification.project_id, item.product_id, item.product_name, item.unit,
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
|
||||
RETURNING id`,
|
||||
[verification.project_id, item.product_id, item.product_name, item.unit,
|
||||
item.verified_quantity, item.verified_quantity,
|
||||
item.verified_quantity * item.unit_price || 0, item.unit_price || 0]);
|
||||
}
|
||||
@@ -263,7 +265,7 @@ router.post('/:id/confirm', async (req, res) => {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
message: '确认验收失败',
|
||||
error: error.message
|
||||
error: process.env.NODE_ENV === 'development' ? error.message : '操作失败'
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -289,7 +291,7 @@ router.post('/:id/reject', async (req, res) => {
|
||||
res.json({ success: true, message: '验收已驳回' });
|
||||
} catch (error) {
|
||||
console.error('驳回验收失败:', error);
|
||||
res.status(500).json({ success: false, message: '驳回验收失败', error: error.message });
|
||||
res.status(500).json({ success: false, message: '驳回验收失败' });
|
||||
}
|
||||
});
|
||||
|
||||
@@ -341,7 +343,7 @@ router.put('/:id', async (req, res) => {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
message: '更新验收单失败',
|
||||
error: error.message
|
||||
error: process.env.NODE_ENV === 'development' ? error.message : '操作失败'
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -371,7 +373,7 @@ router.delete('/:id', async (req, res) => {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
message: '删除验收单失败',
|
||||
error: error.message
|
||||
error: process.env.NODE_ENV === 'development' ? error.message : '操作失败'
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -424,7 +426,7 @@ router.get('/order-items/:orderId', async (req, res) => {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
message: '获取订单商品明细失败',
|
||||
error: error.message
|
||||
error: process.env.NODE_ENV === 'development' ? error.message : '操作失败'
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user