diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py index 4ad9519..3ed71f8 100644 --- a/hb_server/apps/pm/views.py +++ b/hb_server/apps/pm/views.py @@ -238,5 +238,3 @@ class ResourceViewSet(GenericViewSet): equips = Equipment.objects.filter(step_equips__in=steps, is_deleted=False).distinct() serializer = EquipmentSerializer(instance=equips, many=True) return Response(serializer.data) - - diff --git a/hb_server/apps/sam/serializers.py b/hb_server/apps/sam/serializers.py index 058db28..5c7afac 100644 --- a/hb_server/apps/sam/serializers.py +++ b/hb_server/apps/sam/serializers.py @@ -7,6 +7,7 @@ from apps.inm.serializers import IProductListSerializer from .models import Contract, Customer, Order, Sale, SaleProduct from apps.mtm.serializers import MaterialSimpleSerializer +from utils.tools import ranstr class CustomerSerializer(serializers.ModelSerializer): class Meta: @@ -44,6 +45,10 @@ class OrderCreateUpdateSerializer(serializers.ModelSerializer): class Meta: model = Order 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): contract_ = ContractSimpleSerializer(source='contract', read_only=True) diff --git a/hb_server/apps/srm/__init__.py b/hb_server/apps/srm/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hb_server/apps/srm/admin.py b/hb_server/apps/srm/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/hb_server/apps/srm/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/hb_server/apps/srm/apps.py b/hb_server/apps/srm/apps.py new file mode 100644 index 0000000..99faf62 --- /dev/null +++ b/hb_server/apps/srm/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class SrmConfig(AppConfig): + name = 'apps.srm' + verbose_name = '统计报表' diff --git a/hb_server/apps/srm/migrations/__init__.py b/hb_server/apps/srm/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hb_server/apps/srm/models.py b/hb_server/apps/srm/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/hb_server/apps/srm/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/hb_server/apps/srm/tests.py b/hb_server/apps/srm/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/hb_server/apps/srm/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/hb_server/apps/srm/views.py b/hb_server/apps/srm/views.py new file mode 100644 index 0000000..59607d6 --- /dev/null +++ b/hb_server/apps/srm/views.py @@ -0,0 +1,8 @@ +from django.shortcuts import render +from rest_framework.generics import ListAPIView +# Create your views here. + +class GanttOrder(ListAPIView): + """ + 订单-计划-子计划甘特图 + """ \ No newline at end of file diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 89d6698..4317deb 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -249,7 +249,6 @@ class WProductViewSet(ListModelMixin, GenericViewSet): m['field_name'] = form_field.field_name m['field_key'] = form_field.field_key m['field_type'] = form_field.field_type - m['field_value'] = m['field_value'] m['sort'] = form_field.sort m['need_judge'] = form_field.need_judge 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_key'] = form_field.field_key m['field_type'] = form_field.field_type - m['field_value'] = m['field_value'] m['sort'] = form_field.sort m['operation_record'] = opr wrds.append(OperationRecordItem(**m)) diff --git a/hb_server/server/settings.py b/hb_server/server/settings.py index f2e54e5..7338007 100644 --- a/hb_server/server/settings.py +++ b/hb_server/server/settings.py @@ -57,7 +57,8 @@ INSTALLED_APPS = [ 'apps.sam', 'apps.qm', 'apps.pm', - 'apps.wpm' + 'apps.wpm', + 'apps.srm' ] MIDDLEWARE = [