From 3f959c6e2d9463ad5c430fc35a5da319c8d55b5a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 13 Oct 2021 09:23:03 +0800
Subject: [PATCH] =?UTF-8?q?mtm=20usedstep=20remark=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/mtm/models.py      |  4 ++--
 hb_server/apps/mtm/serializers.py | 10 +++++++++-
 hb_server/apps/mtm/views.py       |  6 ++++--
 hb_server/apps/pm/views.py        |  6 +++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py
index 0a0c582..82b39c7 100644
--- a/hb_server/apps/mtm/models.py
+++ b/hb_server/apps/mtm/models.py
@@ -16,9 +16,9 @@ class Material(CommonAModel):
         (1, '成品'),
         (2, '半成品'),
         (3, '主要原料'),
-        (4,'辅助原料')        ,
+        (4, '辅助原料')        ,
         (5, '加工工具'),
-        (6,'辅助工具')
+        (6, '辅助工具')
     )
     unit_choices =(
         ('块', '块'),
diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py
index 04f3e3d..7cd8fe5 100644
--- a/hb_server/apps/mtm/serializers.py
+++ b/hb_server/apps/mtm/serializers.py
@@ -114,7 +114,15 @@ class UsedStepCreateSerializer(serializers.ModelSerializer):
     """
     class Meta:
         model = UsedStep
-        fields =  ['step', 'subproduction']
+        fields =  ['step', 'subproduction', 'remark']
+
+class UsedStepUpdateSerializer(serializers.ModelSerializer):
+    """
+    产品生产子工序编辑
+    """
+    class Meta:
+        model = UsedStep
+        fields =  ['remark']
 
 class UsedStepListSerializer(serializers.ModelSerializer):
     """
diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py
index c18d60f..0e1c44f 100644
--- a/hb_server/apps/mtm/views.py
+++ b/hb_server/apps/mtm/views.py
@@ -3,7 +3,7 @@ from rest_framework.viewsets import ModelViewSet, GenericViewSet
 from rest_framework.mixins import CreateModelMixin, ListModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin
 
 from apps.mtm.models import InputMaterial, Material, OutputMaterial, Process, RecordForm, RecordFormField, Step, TechDoc, UsedStep, SubProduction
-from apps.mtm.serializers import InputMaterialListSerializer, InputMaterialSerializer, InputMaterialUpdateSerializer, MaterialDetailSerializer, MaterialSerializer, MaterialSimpleSerializer, OutputMaterialListSerializer, OutputMaterialSerializer, OutputMaterialUpdateSerializer, ProcessSerializer, RecordFormCreateSerializer, RecordFormFieldCreateSerializer, RecordFormFieldSerializer, RecordFormFieldUpdateSerializer, RecordFormSerializer, RecordFormUpdateSerializer, StepDetailSerializer, StepSerializer, SubProductionSerializer, TechDocCreateSerializer, TechDocListSerializer, TechDocUpdateSerializer, UsedStepCreateSerializer, UsedStepListSerializer
+from apps.mtm.serializers import InputMaterialListSerializer, InputMaterialSerializer, InputMaterialUpdateSerializer, MaterialDetailSerializer, MaterialSerializer, MaterialSimpleSerializer, OutputMaterialListSerializer, OutputMaterialSerializer, OutputMaterialUpdateSerializer, ProcessSerializer, RecordFormCreateSerializer, RecordFormFieldCreateSerializer, RecordFormFieldSerializer, RecordFormFieldUpdateSerializer, RecordFormSerializer, RecordFormUpdateSerializer, StepDetailSerializer, StepSerializer, SubProductionSerializer, TechDocCreateSerializer, TechDocListSerializer, TechDocUpdateSerializer, UsedStepCreateSerializer, UsedStepListSerializer, UsedStepUpdateSerializer
 from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
 from rest_framework.decorators import action
 from rest_framework.response import Response
@@ -114,7 +114,7 @@ class OutputMaterialViewSet(CreateUpdateModelAMixin, ModelViewSet):
             return OutputMaterialUpdateSerializer
         return OutputMaterialSerializer
 
-class UsedStepViewSet(OptimizationMixin, CreateModelMixin, DestroyModelMixin, ListModelMixin, GenericViewSet):
+class UsedStepViewSet(OptimizationMixin, CreateModelMixin, DestroyModelMixin, ListModelMixin, UpdateModelMixin, GenericViewSet):
     """
     产品生产子工序表
     """
@@ -126,6 +126,8 @@ class UsedStepViewSet(OptimizationMixin, CreateModelMixin, DestroyModelMixin, Li
     def get_serializer_class(self):
         if self.action =='create':
             return UsedStepCreateSerializer
+        elif self.action == 'update':
+            return UsedStepUpdateSerializer
         return UsedStepListSerializer
 
 class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet):
diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py
index 25509dc..a0d28fa 100644
--- a/hb_server/apps/pm/views.py
+++ b/hb_server/apps/pm/views.py
@@ -1,3 +1,4 @@
+from rest_framework.views import APIView
 from apps.system.mixins import CreateUpdateModelAMixin
 from apps.pm.serializers import ProductionPlanCreateFromOrderSerializer, ProductionPlanSerializer
 from rest_framework.mixins import CreateModelMixin, ListModelMixin
@@ -49,4 +50,7 @@ class ProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, CreateModel
                 raise APIException('排产数量错误')
             instance = serializer.save(create_by=request.user, product=order.product)
             updateOrderPlanedCount(instance.order)
-        return Response()
\ No newline at end of file
+        return Response()
+
+class ResourceCalculate(APIView):
+    pass
\ No newline at end of file