检测记录保存bug

This commit is contained in:
caoqianming 2021-12-13 10:19:24 +08:00
parent ac135b1386
commit 30dbc5a6cd
11 changed files with 30 additions and 5 deletions

View File

@ -238,5 +238,3 @@ class ResourceViewSet(GenericViewSet):
equips = Equipment.objects.filter(step_equips__in=steps, is_deleted=False).distinct() equips = Equipment.objects.filter(step_equips__in=steps, is_deleted=False).distinct()
serializer = EquipmentSerializer(instance=equips, many=True) serializer = EquipmentSerializer(instance=equips, many=True)
return Response(serializer.data) return Response(serializer.data)

View File

@ -7,6 +7,7 @@ from apps.inm.serializers import IProductListSerializer
from .models import Contract, Customer, Order, Sale, SaleProduct from .models import Contract, Customer, Order, Sale, SaleProduct
from apps.mtm.serializers import MaterialSimpleSerializer from apps.mtm.serializers import MaterialSimpleSerializer
from utils.tools import ranstr
class CustomerSerializer(serializers.ModelSerializer): class CustomerSerializer(serializers.ModelSerializer):
class Meta: class Meta:
@ -45,6 +46,10 @@ class OrderCreateUpdateSerializer(serializers.ModelSerializer):
model = Order model = Order
fields = ['number', 'customer', 'contract', 'product', 'count', 'delivery_date'] fields = ['number', 'customer', 'contract', 'product', 'count', 'delivery_date']
def create(self, validated_data):
validated_data['number'] = 'DD' + ranstr(7)
return super().create(validated_data)
class OrderSerializer(serializers.ModelSerializer): class OrderSerializer(serializers.ModelSerializer):
contract_ = ContractSimpleSerializer(source='contract', read_only=True) contract_ = ContractSimpleSerializer(source='contract', read_only=True)
customer_ = CustomerSimpleSerializer(source='customer', read_only=True) customer_ = CustomerSimpleSerializer(source='customer', read_only=True)

View File

View File

@ -0,0 +1,3 @@
from django.contrib import admin
# Register your models here.

View File

@ -0,0 +1,6 @@
from django.apps import AppConfig
class SrmConfig(AppConfig):
name = 'apps.srm'
verbose_name = '统计报表'

View File

@ -0,0 +1,3 @@
from django.db import models
# Create your models here.

View File

@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.

View File

@ -0,0 +1,8 @@
from django.shortcuts import render
from rest_framework.generics import ListAPIView
# Create your views here.
class GanttOrder(ListAPIView):
"""
订单-计划-子计划甘特图
"""

View File

@ -249,7 +249,6 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
m['field_name'] = form_field.field_name m['field_name'] = form_field.field_name
m['field_key'] = form_field.field_key m['field_key'] = form_field.field_key
m['field_type'] = form_field.field_type m['field_type'] = form_field.field_type
m['field_value'] = m['field_value']
m['sort'] = form_field.sort m['sort'] = form_field.sort
m['need_judge'] = form_field.need_judge m['need_judge'] = form_field.need_judge
m['is_testok'] = m['is_testok'] if 'is_testok' in m else None m['is_testok'] = m['is_testok'] if 'is_testok' in m else None
@ -662,7 +661,6 @@ class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
m['field_name'] = form_field.field_name m['field_name'] = form_field.field_name
m['field_key'] = form_field.field_key m['field_key'] = form_field.field_key
m['field_type'] = form_field.field_type m['field_type'] = form_field.field_type
m['field_value'] = m['field_value']
m['sort'] = form_field.sort m['sort'] = form_field.sort
m['operation_record'] = opr m['operation_record'] = opr
wrds.append(OperationRecordItem(**m)) wrds.append(OperationRecordItem(**m))

View File

@ -57,7 +57,8 @@ INSTALLED_APPS = [
'apps.sam', 'apps.sam',
'apps.qm', 'apps.qm',
'apps.pm', 'apps.pm',
'apps.wpm' 'apps.wpm',
'apps.srm'
] ]
MIDDLEWARE = [ MIDDLEWARE = [