diff --git a/inventory/templates/inventory/sale_item_form.html b/inventory/templates/inventory/sale_item_form.html index 6193151..f3c72c5 100644 --- a/inventory/templates/inventory/sale_item_form.html +++ b/inventory/templates/inventory/sale_item_form.html @@ -476,16 +476,19 @@

添加销售商品

- {% for item in sale.saleitems.all %} + {% for item in items %} {{ item.product.name }} {{ item.quantity }} {{ item.actual_price }} {{ item.subtotal }} - - - +
+ {% csrf_token %} + +
{% endfor %} diff --git a/inventory/templates/inventory/system/delete_backup.html b/inventory/templates/inventory/system/delete_backup.html new file mode 100644 index 0000000..ce1e195 --- /dev/null +++ b/inventory/templates/inventory/system/delete_backup.html @@ -0,0 +1,60 @@ +{% extends 'inventory/base.html' %} + +{% block title %}删除备份 - {{ block.super }}{% endblock %} + +{% block content %} +
+
+
+
+
+
+

删除备份

+

确认删除系统备份

+
+ + 返回备份列表 + +
+
+
+
+
+ +
+
+
+
+
+ 删除确认 +
+
+
+
+ 警告：此操作不可逆！ +

备份 {{ backup_name }} 将被永久删除，删除后无法用于恢复系统数据。

+
+ +
+ {% csrf_token %} +
+ + +
+ +
+ + 取消 + + +
+
+
+
+
+
+{% endblock %} diff --git a/inventory/tests/test_sale_status.py b/inventory/tests/test_sale_status.py index 270e7a3..1b427a6 100644 --- a/inventory/tests/test_sale_status.py +++ b/inventory/tests/test_sale_status.py @@ -160,6 +160,44 @@ def test_delete_item_persists_recalculated_total(self): sale.refresh_from_db() self.assertEqual(sale.total_amount, Decimal('20.00')) # 删除后总额已落库 + def test_delete_item_requires_post_and_preserves_inventory_on_get(self): + sale = self._make_sale(status='DRAFT') + item = sale.items.get() + self.inventory.refresh_from_db() + before = self.inventory.quantity + + response = self.client.get(reverse('sale_item_delete', args=[sale.id, item.id])) + + self.assertEqual(response.status_code, 405) + self.assertTrue(SaleItem.objects.filter(pk=item.pk).exists()) + self.inventory.refresh_from_db() + self.assertEqual(self.inventory.quantity, before) + + def test_sale_item_create_page_lists_existing_items(self): + sale = self._make_sale(status='DRAFT') + + response = self.client.get(reverse('sale_item_create', args=[sale.id])) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, self.product.name) + + def test_sale_detail_does_not_rewrite_persisted_amounts(self): + sale = self._make_sale(status='COMPLETED') + Sale.objects.filter(pk=sale.pk).update( + total_amount=Decimal('1.00'), + discount_amount=Decimal('0.00'), + final_amount=Decimal('1.00'), + balance_paid=Decimal('20.00'), + ) + + response = self.client.get(reverse('sale_detail', args=[sale.id])) + + self.assertEqual(response.status_code, 200) + sale.refresh_from_db() + self.assertEqual(sale.total_amount, Decimal('1.00')) + self.assertEqual(sale.final_amount, Decimal('1.00')) + self.assertEqual(sale.balance_paid, Decimal('20.00')) + def test_sale_complete_page_renders_for_draft_sale(self): sale = self._make_sale(status='DRAFT') diff --git a/inventory/tests/test_views.py b/inventory/tests/test_views.py index 5ed657d..27bc999 100644 --- a/inventory/tests/test_views.py +++ b/inventory/tests/test_views.py @@ -1,10 +1,12 @@ import json import os import tempfile +from unittest.mock import patch from django.core import management from django.test import TestCase, Client from django.urls import reverse +from django.contrib.admin.models import LogEntry from django.contrib.auth.models import User, Permission, Group from decimal import Decimal @@ -315,9 +317,134 @@ def test_restore_backup_flushes_records_missing_from_snapshot(self): with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir): response = self.client.post( reverse('restore_backup', args=[backup_name]), - {'confirm': 'on'}, + {'confirm_restore': 'on'}, ) self.assertEqual(response.status_code, 302) self.assertEqual(response['Location'], reverse('system_settings')) self.assertFalse(Product.objects.filter(pk=product.pk).exists()) + + def test_restore_backup_page_uses_view_context(self): + backup_name = 'snapshot' + backup_dir = os.path.join(self.backup_root, backup_name) + os.makedirs(backup_dir, exist_ok=True) + with open(os.path.join(backup_dir, 'backup_info.json'), 'w', encoding='utf-8') as backup_info: + json.dump( + { + 'name': backup_name, + 'created_at': '2026-05-30T11:00:00', + 'created_by': self.user.username, + 'includes_media': False, + }, + backup_info, + ) + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir): + response = self.client.get(reverse('restore_backup', args=[backup_name])) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, backup_name) + self.assertContains(response, 'confirm_restore') + + def test_restore_backup_media_stage_failure_preserves_current_data(self): + backup_name = 'snapshot' + backup_dir = os.path.join(self.backup_root, backup_name) + media_root = os.path.join(self.temp_parent.name, 'media') + backup_media_dir = os.path.join(backup_dir, 'media') + os.makedirs(backup_media_dir, exist_ok=True) + os.makedirs(media_root, exist_ok=True) + db_file = os.path.join(backup_dir, 'db.json') + current_media_file = os.path.join(media_root, 'current.txt') + with open(current_media_file, 'w', encoding='utf-8') as current_media: + current_media.write('keep current media') + with open(os.path.join(backup_media_dir, 'backup.txt'), 'w', encoding='utf-8') as backup_media: + backup_media.write('backup media') + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=media_root): + management.call_command( + 'dumpdata', + '--exclude', + 'auth.permission', + '--exclude', + 'contenttypes', + '--exclude', + 'sessions.session', + '--indent', + '4', + '--output', + db_file, + verbosity=0, + ) + + with open(os.path.join(backup_dir, 'backup_info.json'), 'w', encoding='utf-8') as backup_info: + json.dump( + { + 'name': backup_name, + 'created_at': '2026-05-30T11:00:00', + 'created_by': self.user.username, + 'includes_media': True, + }, + backup_info, + ) + + category = Category.objects.create(name='备份后分类') + product = Product.objects.create( + barcode='post-backup-media-product', + name='备份后媒体测试商品', + category=category, + price=Decimal('10.00'), + cost=Decimal('5.00'), + ) + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=media_root): + with patch('inventory.views.system.backup.shutil.copytree', side_effect=OSError('copy failed')): + response = self.client.post( + reverse('restore_backup', args=[backup_name]), + {'confirm_restore': 'on', 'restore_media': 'on'}, + ) + + self.assertEqual(response.status_code, 200) + self.assertTrue(os.path.exists(current_media_file)) + self.assertTrue(Product.objects.filter(pk=product.pk).exists()) + + def test_delete_backup_confirmation_page_and_post_delete(self): + backup_name = 'snapshot' + backup_dir = os.path.join(self.backup_root, backup_name) + os.makedirs(backup_dir, exist_ok=True) + with open(os.path.join(backup_dir, 'backup_info.json'), 'w', encoding='utf-8') as backup_info: + json.dump( + { + 'name': backup_name, + 'created_at': '2026-05-30T11:00:00', + 'created_by': self.user.username, + 'includes_media': False, + }, + backup_info, + ) + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir): + get_response = self.client.get(reverse('delete_backup', args=[backup_name])) + post_response = self.client.post(reverse('delete_backup', args=[backup_name]), {'confirm': 'on'}) + + self.assertEqual(get_response.status_code, 200) + self.assertEqual(post_response.status_code, 302) + self.assertFalse(os.path.exists(backup_dir)) + + def test_download_log_file_records_nullable_content_type(self): + log_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'logs') + os.makedirs(log_dir, exist_ok=True) + log_file = os.path.join(log_dir, 'download-test.log') + with open(log_file, 'w', encoding='utf-8') as log: + log.write('download me') + self.addCleanup(lambda: os.path.exists(log_file) and os.remove(log_file)) + + response = self.client.get(reverse('download_log_file', args=['download-test.log'])) + + self.assertEqual(response.status_code, 200) + self.assertTrue( + LogEntry.objects.filter( + user=self.user, + object_id='download-test.log', + content_type__isnull=True, + ).exists() + ) diff --git a/inventory/views/sales.py b/inventory/views/sales.py index 0fc02a4..f734bc9 100644 --- a/inventory/views/sales.py +++ b/inventory/views/sales.py @@ -13,6 +13,7 @@ from django.conf import settings from django.utils.safestring import mark_safe from django.urls import reverse +from django.views.decorators.http import require_POST from inventory.models import Sale, SaleItem, Inventory, InventoryTransaction, Member, MemberTransaction, OperationLog, Product, Category, Supplier, MemberLevel from inventory.forms import SaleForm, SaleItemForm @@ -80,31 +81,6 @@ def sale_detail(request, sale_id): sale = get_object_or_404(Sale, pk=sale_id) items = SaleItem.objects.filter(sale=sale).select_related('product') - # 确保销售单金额与商品项总和一致 - items_total = sum(item.subtotal for item in items) - if items_total > 0 and (sale.total_amount == 0 or abs(sale.total_amount - items_total) > 1): - print(f"警告: 销售单金额({sale.total_amount})与商品项总和({items_total})不一致，正在修复") - # 更新销售单金额 - discount_rate = Decimal('1.0') - if sale.member and sale.member.level and sale.member.level.discount: - try: - discount_rate = Decimal(str(sale.member.level.discount)) - except: - discount_rate = Decimal('1.0') - - discount_amount = items_total * (Decimal('1.0') - discount_rate) - final_amount = items_total - discount_amount - - # 使用原始SQL直接更新数据库 - with connection.cursor() as cursor: - cursor.execute( - "UPDATE inventory_sale SET total_amount = %s, discount_amount = %s, final_amount = %s WHERE id = %s", - [items_total, discount_amount, final_amount, sale.id] - ) - - # 重新加载销售单数据 - sale = get_object_or_404(Sale, pk=sale_id) - context = { 'sale': sale, 'items': items, @@ -779,43 +755,50 @@ def sale_cancel(request, sale_id): return render(request, 'inventory/sale_cancel.html', {'sale': sale}) @login_required +@require_POST def sale_delete_item(request, sale_id, item_id): """删除销售单商品视图""" - sale = get_object_or_404(Sale, id=sale_id) - item = get_object_or_404(SaleItem, id=item_id, sale=sale) - - # 检查销售单状态 - if sale.status != 'DRAFT': - messages.error(request, '只有未完成的销售单可以修改商品') - return redirect('sale_detail', sale_id=sale.id) - - # 恢复库存 - inventory = Inventory.objects.get(product=item.product) - inventory.quantity += item.quantity - inventory.save() - - # 创建入库交易记录 - InventoryTransaction.objects.create( - product=item.product, - transaction_type='IN', - quantity=item.quantity, - operator=request.user, - notes=f'从销售单 #{sale.id} 中删除商品，恢复库存' - ) - - # 记录操作日志 - OperationLog.objects.create( - operator=request.user, - operation_type='SALE', - details=f'从销售单 #{sale.id} 中删除商品 {item.product.name}', - related_object_id=sale.id, - related_content_type=ContentType.objects.get_for_model(Sale) - ) - - # 删除商品并更新销售单总额 - item.delete() - sale.update_total_amount() - sale.save() + with transaction.atomic(): + sale = get_object_or_404(Sale.objects.select_for_update(), id=sale_id) + + # 检查销售单状态 + if sale.status != 'DRAFT': + messages.error(request, '只有未完成的销售单可以修改商品') + return redirect('sale_detail', sale_id=sale.id) + + item = get_object_or_404( + SaleItem.objects.select_for_update().select_related('product'), + id=item_id, + sale=sale + ) + + # 恢复库存 + inventory = Inventory.objects.select_for_update().get(product=item.product) + inventory.quantity += item.quantity + inventory.save() + + # 创建入库交易记录 + InventoryTransaction.objects.create( + product=item.product, + transaction_type='IN', + quantity=item.quantity, + operator=request.user, + notes=f'从销售单 #{sale.id} 中删除商品，恢复库存' + ) + + # 记录操作日志 + OperationLog.objects.create( + operator=request.user, + operation_type='SALE', + details=f'从销售单 #{sale.id} 中删除商品 {item.product.name}', + related_object_id=sale.id, + related_content_type=ContentType.objects.get_for_model(Sale) + ) + + # 删除商品并更新销售单总额 + item.delete() + sale.update_total_amount() + sale.save() messages.success(request, '商品已从销售单中删除') return redirect('sale_item_create', sale_id=sale.id) diff --git a/inventory/views/system/backup.py b/inventory/views/system/backup.py index 39a2423..79a2713 100644 --- a/inventory/views/system/backup.py +++ b/inventory/views/system/backup.py @@ -20,6 +20,7 @@ import logging import re import zipfile +import tempfile from datetime import datetime from inventory.permissions.decorators import permission_required @@ -64,6 +65,79 @@ def get_dir_size_display(dir_path): else: return f"{size_bytes / (1024 * 1024 * 1024):.2f} GB" + +def get_backup_template_context(backup_name, backup_dir, backup_info): + """Build the template context used by backup confirmation pages.""" + created_at = None + created_at_value = backup_info.get('created_at') + if created_at_value: + try: + created_at = datetime.fromisoformat(created_at_value) + except ValueError: + created_at = None + + backup = { + 'name': backup_name, + 'created_at': created_at, + 'created_by': backup_info.get('created_by', '未知'), + 'size': get_dir_size_display(backup_dir), + 'includes_media': backup_info.get('includes_media', False), + } + return { + 'backup': backup, + 'backup_name': backup_name, + 'backup_info': backup_info, + } + + +def remove_path(path): + """Remove a file or directory without following directory symlinks.""" + if os.path.isdir(path) and not os.path.islink(path): + shutil.rmtree(path) + else: + os.remove(path) + + +def stage_media_restore(media_dir): + """Copy backup media into a staging directory before destructive DB restore.""" + media_root = os.path.realpath(settings.MEDIA_ROOT) + media_parent = os.path.dirname(media_root) + os.makedirs(media_parent, exist_ok=True) + + staging_dir = tempfile.mkdtemp(prefix='.media-restore-', dir=media_parent) + staged_media_dir = os.path.join(staging_dir, 'media') + try: + shutil.copytree(media_dir, staged_media_dir) + except Exception: + shutil.rmtree(staging_dir, ignore_errors=True) + raise + return staging_dir, staged_media_dir + + +def replace_media_root(staged_media_dir): + """Replace MEDIA_ROOT with a staged copy, restoring old media if replacement fails.""" + media_root = os.path.realpath(settings.MEDIA_ROOT) + media_parent = os.path.dirname(media_root) + os.makedirs(media_parent, exist_ok=True) + + old_media_dir = None + try: + if os.path.exists(media_root): + old_media_dir = tempfile.mkdtemp(prefix='.media-before-restore-', dir=media_parent) + os.rmdir(old_media_dir) + shutil.move(media_root, old_media_dir) + + shutil.move(staged_media_dir, media_root) + except Exception: + if os.path.exists(media_root): + remove_path(media_root) + if old_media_dir and os.path.exists(old_media_dir): + shutil.move(old_media_dir, media_root) + raise + finally: + if old_media_dir and os.path.exists(old_media_dir): + shutil.rmtree(old_media_dir, ignore_errors=True) + @login_required @permission_required('inventory.can_manage_backup') def backup_list(request): @@ -209,55 +283,40 @@ def restore_backup(request, backup_name): if os.path.exists(backup_info_file): with open(backup_info_file, 'r', encoding='utf-8') as f: backup_info = json.load(f) + context = get_backup_template_context(backup_name, backup_dir, backup_info) if request.method == 'POST': # 确认恢复 - confirmed = request.POST.get('confirm') == 'on' + confirmed = request.POST.get('confirm_restore') == 'on' or request.POST.get('confirm') == 'on' if not confirmed: messages.error(request, "请确认您要恢复备份") - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) + restore_media = False + media_staging_dir = None + staged_media_dir = None try: # 恢复数据库 db_file = os.path.join(backup_dir, 'db.json') if not os.path.exists(db_file): messages.error(request, f"备份文件 {db_file} 不存在") return redirect('backup_list') + + # 恢复媒体文件前先完整复制到暂存目录，避免数据库已恢复后才发现媒体不可读。 + restore_media = request.POST.get('restore_media') == 'on' + if restore_media and backup_info.get('includes_media', False): + media_dir = os.path.join(backup_dir, 'media') + if not os.path.isdir(media_dir): + raise ValueError("备份媒体目录不存在") + media_staging_dir, staged_media_dir = stage_media_restore(media_dir) # 先清空数据库再加载快照；loaddata 只会 upsert，不能删除备份后新增的数据。 with transaction.atomic(): management.call_command('flush', '--noinput', verbosity=0) management.call_command('loaddata', db_file, verbosity=0) - # 恢复媒体文件 - restore_media = request.POST.get('restore_media') == 'on' - if restore_media and backup_info.get('includes_media', False): - media_dir = os.path.join(backup_dir, 'media') - if os.path.exists(media_dir): - # 清空现有媒体目录 - if os.path.exists(settings.MEDIA_ROOT): - for item in os.listdir(settings.MEDIA_ROOT): - item_path = os.path.join(settings.MEDIA_ROOT, item) - if os.path.isdir(item_path): - shutil.rmtree(item_path) - else: - os.remove(item_path) - - # 复制备份中的媒体文件 - for item in os.listdir(media_dir): - src_path = os.path.join(media_dir, item) - dst_path = os.path.join(settings.MEDIA_ROOT, item) - if os.path.isdir(src_path): - if os.path.exists(dst_path): - shutil.rmtree(dst_path) - shutil.copytree(src_path, dst_path) - else: - if os.path.exists(dst_path): - os.remove(dst_path) - shutil.copy2(src_path, dst_path) + if staged_media_dir: + replace_media_root(staged_media_dir) # 恢复快照后，执行恢复的用户可能已不存在于当前数据库。 restored_user = get_user_model().objects.filter(pk=request.user.pk).first() @@ -279,15 +338,12 @@ def restore_backup(request, backup_name): except Exception as e: messages.error(request, f"恢复备份失败: {str(e)}") logger.error(f"恢复备份失败: {str(e)}") - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) + finally: + if media_staging_dir and os.path.exists(media_staging_dir): + shutil.rmtree(media_staging_dir, ignore_errors=True) - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) @login_required @permission_required('inventory.can_manage_backup') diff --git a/inventory/views/system/log.py b/inventory/views/system/log.py index bfba22b..88aea0b 100644 --- a/inventory/views/system/log.py +++ b/inventory/views/system/log.py @@ -248,7 +248,7 @@ def download_log_file(request, file_name): LogEntry.objects.create( user=request.user, action_flag=1, - content_type_id=0, + content_type_id=None, object_id=file_name, object_repr=f'下载日志: {file_name}', change_message=f'下载了日志文件 {file_name}' @@ -294,7 +294,7 @@ def delete_log_file(request, file_name): LogEntry.objects.create( user=request.user, action_flag=3, - content_type_id=0, + content_type_id=None, object_id=file_name, object_repr=f'删除日志: {file_name}', change_message=f'删除了日志文件 {file_name}'