From c98613785b28ef4553413840061b9e2069c9d84c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 25 Jan 2022 13:13:11 +0800 Subject: [PATCH] bug --- hb_server/apps/develop/urls.py | 5 +++-- hb_server/apps/develop/views.py | 6 ++++++ hb_server/apps/inm/serializers2.py | 15 +++++++++++++++ hb_server/apps/sam/serializers.py | 3 ++- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 hb_server/apps/inm/serializers2.py diff --git a/hb_server/apps/develop/urls.py b/hb_server/apps/develop/urls.py index 22621ac..0048316 100644 --- a/hb_server/apps/develop/urls.py +++ b/hb_server/apps/develop/urls.py @@ -2,7 +2,7 @@ from django.db.models import base from rest_framework import urlpatterns from django.urls import path, include from rest_framework.routers import DefaultRouter -from apps.develop.views import CleanDataView, UpdateCuttingView, UpdateEquipState, UpdateFIFOItem, UpdateLastTestResult, UpdateSpg +from apps.develop.views import CleanDataView, UpdateCuttingView, UpdateEquipState, UpdateFIFOItem, UpdateLastTestResult, UpdateNeedToOrder, UpdateSpg urlpatterns = [ path('cleandata/', CleanDataView.as_view()), @@ -11,6 +11,7 @@ urlpatterns = [ path('update_last_result/', UpdateLastTestResult.as_view()), path('update_fifoitem/', UpdateFIFOItem.as_view()), path('update_spg/', UpdateSpg.as_view()), - path('update_equip_state/', UpdateEquipState.as_view()) + path('update_equip_state/', UpdateEquipState.as_view()), + path('update_need_to_order/', UpdateNeedToOrder.as_view()) ] diff --git a/hb_server/apps/develop/views.py b/hb_server/apps/develop/views.py index c1b5b84..4d6c050 100644 --- a/hb_server/apps/develop/views.py +++ b/hb_server/apps/develop/views.py @@ -99,4 +99,10 @@ class UpdateEquipState(APIView): def post(self, request, format=None): update_equip_state_by_next_check_date() + return Response() + +class UpdateNeedToOrder(APIView): + permission_classes = [IsAdminUser] + def post(self, request): + WProduct.objects.exclude(to_order=None).update(need_to_order=True) return Response() \ No newline at end of file diff --git a/hb_server/apps/inm/serializers2.py b/hb_server/apps/inm/serializers2.py new file mode 100644 index 0000000..3149e89 --- /dev/null +++ b/hb_server/apps/inm/serializers2.py @@ -0,0 +1,15 @@ +from rest_framework import serializers +from apps.inm.models import IProduct +from apps.mtm.serializers import MaterialSimpleSerializer + + +class IProductListSerializer(serializers.ModelSerializer): + material_ = MaterialSimpleSerializer(source='material', read_only=True) + warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True) + need_to_order = serializers.BooleanField(source='wproduct.need_to_order', read_only=True) + is_mtestok = serializers.BooleanField(source='wproduct.is_mtestok', read_only=True) + remark_mtest = serializers.CharField(source='wproduct.remark_mtest', read_only=True) + + class Meta: + model = IProduct + fields = '__all__' \ No newline at end of file diff --git a/hb_server/apps/sam/serializers.py b/hb_server/apps/sam/serializers.py index 7c0525c..c00c178 100644 --- a/hb_server/apps/sam/serializers.py +++ b/hb_server/apps/sam/serializers.py @@ -66,7 +66,8 @@ class OrderSimpleSerializer(serializers.ModelSerializer): fields = ['id', 'number', 'contract_', 'customer_', 'need_mtest'] class SaleCreateSerializer(serializers.ModelSerializer): - iproducts = serializers.PrimaryKeyRelatedField(queryset=IProduct.objects.all(), many=True) + iproducts = serializers.PrimaryKeyRelatedField(queryset= + IProduct.objects.all(), many=True) class Meta: model = Sale fields = ['customer', 'order', 'product', 'iproducts']