Compare commits

..

No commits in common. "d21c1dc55d4902291acaf6a3dbe5486fe275acb7" and "bd763be83aa2450fee24dbe74f96c55b019ba47e" have entirely different histories.

2 changed files with 1 additions and 10 deletions

View File

@ -3,7 +3,6 @@ from apps.utils.models import CommonADModel, BaseModel, CommonBDModel
from apps.system.models import User from apps.system.models import User
from django.core.validators import RegexValidator from django.core.validators import RegexValidator
from datetime import datetime from datetime import datetime
from rest_framework.exceptions import ParseError
# Create your models here. # Create your models here.
@ -89,10 +88,7 @@ class Vehicle(CommonBDModel):
on_delete=models.SET_NULL, related_name='vehicle_ticket', null=True, blank=True, db_constraint=False) on_delete=models.SET_NULL, related_name='vehicle_ticket', null=True, blank=True, db_constraint=False)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if self.end_km: if self.end_km:
if self.start_km <= self.end_km: self.actual_km = self.end_km - self.start_km
self.actual_km = self.end_km - self.start_km
else:
raise ParseError('归还公里数不能小于出发公里数')
else: else:
self.actual_km = 0 self.actual_km = 0
return super().save(*args, **kwargs) return super().save(*args, **kwargs)

View File

@ -58,11 +58,6 @@ def bind_vehicle(ticket: Ticket, transition, new_ticket_data: dict):
ins.save() ins.save()
# def update_vehicle_endkm(ticket: Ticket, transition, new_ticket_data: dict):
# ins = Vehicle.objects.get(id=new_ticket_data['t_id'])
# ins.end_km = new_ticket_data['end_km']
# ins.save()
def bind_file(ticket: Ticket, transition, new_ticket_data: dict): def bind_file(ticket: Ticket, transition, new_ticket_data: dict):
ins = BorrowRecord.objects.get(id=new_ticket_data['t_id']) ins = BorrowRecord.objects.get(id=new_ticket_data['t_id'])
ticket_data = ticket.ticket_data ticket_data = ticket.ticket_data