diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py index b15896b..f3bc619 100644 --- a/hb_server/apps/inm/views.py +++ b/hb_server/apps/inm/views.py @@ -7,6 +7,7 @@ from apps.inm.models import WareHouse,Inventory from apps.inm.serializers import FIFOInPurSerializer, WareHouseSerializer, WareHouseCreateUpdateSerializer,InventorySerializer from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin from rest_framework.decorators import action +from rest_framework.response import Response # Create your views here. class WarehouseViewSet(CreateUpdateModelAMixin, ModelViewSet): @@ -51,4 +52,5 @@ class FIFOViewSet(GenericViewSet): serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) serializer.save(create_by=request.user) + return Response() \ No newline at end of file diff --git a/hb_server/apps/pm/migrations/0008_subproductionprogress_count_current.py b/hb_server/apps/pm/migrations/0008_subproductionprogress_count_current.py new file mode 100644 index 0000000..03dbd87 --- /dev/null +++ b/hb_server/apps/pm/migrations/0008_subproductionprogress_count_current.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.6 on 2021-10-28 06:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pm', '0007_auto_20211025_1533'), + ] + + operations = [ + migrations.AddField( + model_name='subproductionprogress', + name='count_current', + field=models.IntegerField(default=0, verbose_name='当前数量'), + ), + ] diff --git a/hb_server/apps/pm/models.py b/hb_server/apps/pm/models.py index 55a53c5..d2025f5 100644 --- a/hb_server/apps/pm/models.py +++ b/hb_server/apps/pm/models.py @@ -1,3 +1,4 @@ +from io import open_code from apps.system.models import CommonAModel, Organization from django.db import models from django.contrib.auth.models import AbstractUser diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py index 054b113..4515c00 100644 --- a/hb_server/apps/pm/views.py +++ b/hb_server/apps/pm/views.py @@ -137,7 +137,7 @@ class SubProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, UpdateMo return Response() raise APIException('计划状态有误') - @action(methods=['get'], detail=True, perms_map={'get':'*'}, serializer_class=serializers.Serializer) + @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=serializers.Serializer) def pick_need(self, request, pk=None): """ 领料需求清单 @@ -147,6 +147,7 @@ class SubProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, UpdateMo serializer = SubProductionProgressSerializer(instance=instance, many=True) return Response(serializer.data) + class ResourceViewSet(GenericViewSet): perms_map = {'*': '*'} diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py index d4d0ab3..c3e2c6e 100644 --- a/hb_server/apps/wpm/models.py +++ b/hb_server/apps/wpm/models.py @@ -8,10 +8,6 @@ from utils.model import SoftModel, BaseModel from simple_history.models import HistoricalRecords from apps.mtm.models import Material, Step, RecordForm -class WorkshopInm(): - """ - 车间库存 - """ class Product(CommonAModel): """ 产品(所有生产过程中出现过的) diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py index 4636454..204c1eb 100644 --- a/hb_server/apps/wpm/serializers.py +++ b/hb_server/apps/wpm/serializers.py @@ -2,3 +2,5 @@ from rest_framework import serializers from rest_framework.serializers import ModelSerializer +class PickSerializer(serializers.Serializer): + pass \ No newline at end of file diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index bb114b1..b9c6679 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -1,6 +1,12 @@ from django.shortcuts import render -from rest_framework.viewsets import ModelViewSet +from rest_framework.generics import CreateAPIView, GenericAPIView +from rest_framework.viewsets import GenericViewSet, ModelViewSet from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin -# Create your views here. \ No newline at end of file +# Create your views here. +class WpmPickView(CreateUpdateModelAMixin, CreateAPIView): + """ + 领料 + """ + pass \ No newline at end of file