批量入库remark非必填

hb_server/.gitignore

@@ -1,5 +1,6 @@
 .vscode/
 .vs/
+.idea/
 venv/
 __pycache__/
 *.pyc

hb_server/apps/inm/models.py

@@ -17,6 +17,7 @@ class WareHouse(CommonAModel):
     number = models.CharField('仓库编号', max_length=20, unique=True)
     name = models.CharField('仓库名称', max_length=20, unique=True)
     place = models.CharField('具体地点', max_length=50)
+
     class Meta:
         verbose_name = '仓库信息'
         verbose_name_plural = verbose_name
@@ -24,32 +25,39 @@ class WareHouse(CommonAModel):
     def __str__(self):
         return self.name
 
+
 class Inventory(BaseModel):
     """
     库存物料
     """
-    material = models.ForeignKey(Material, on_delete=models.CASCADE, verbose_name='物料信息')
+    material = models.ForeignKey(
+        Material, on_delete=models.CASCADE, verbose_name='物料信息')
     count = models.PositiveIntegerField('仓库物料存量', default=0)
-    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
+    warehouse = models.ForeignKey(
+        WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
+
     class Meta:
         verbose_name = '库存表'
         verbose_name_plural = verbose_name
 
+
 class MaterialBatch(BaseModel):
     """
     物料批次
     """
-    material = models.ForeignKey(Material, on_delete=models.CASCADE, verbose_name='物料信息')
+    material = models.ForeignKey(
-    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
+        Material, on_delete=models.CASCADE, verbose_name='物料信息')
+    warehouse = models.ForeignKey(
+        WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
     count = models.PositiveIntegerField('存量', default=0)
     batch = models.CharField('批次号', max_length=100, default='')
     expiration_date = models.DateField('有效期', null=True, blank=True)
+
     class Meta:
         verbose_name = '库存表'
         verbose_name_plural = verbose_name
 
 
-
 class FIFO(CommonADModel):
     """
     出入库记录
@@ -66,7 +74,8 @@ class FIFO(CommonADModel):
     )
     type = models.IntegerField('出入库类型', default=1)
     is_audited = models.BooleanField('是否审核', default=False)
-    auditor = models.ForeignKey(User, verbose_name='审核人', on_delete=models.CASCADE, null=True, blank=True)
+    auditor = models.ForeignKey(
+        User, verbose_name='审核人', on_delete=models.CASCADE, null=True, blank=True)
     inout_date = models.DateField('出入库日期')
     remark = models.CharField('备注', max_length=1000, default='')
 
@@ -75,38 +84,46 @@ class FIFOItem(BaseModel):
     """
     出入库详细条目
     """
+    need_test = models.BooleanField('是否需要检验', default=False)
     is_tested = models.BooleanField('是否已检验', default=False)
     is_testok = models.BooleanField('是否检验合格', default=False)
-    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='仓库')
+    warehouse = models.ForeignKey(
-    material = models.ForeignKey(Material, verbose_name='物料类型', on_delete=models.CASCADE)
+        WareHouse, on_delete=models.CASCADE, verbose_name='仓库')
+    material = models.ForeignKey(
+        Material, verbose_name='物料类型', on_delete=models.CASCADE)
     count = models.PositiveIntegerField('数量', default=0)
     batch = models.CharField('批次号', max_length=100, default='')
-    fifo = models.ForeignKey(FIFO, verbose_name='关联出入库', on_delete=models.CASCADE)
+    fifo = models.ForeignKey(FIFO, verbose_name='关联出入库',
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE, null=True, blank=True)
+                             on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE, null=True, blank=True)
+
 
 class IProduct(BaseModel):
     """
     具体产品条目
     """
     number = models.CharField('物品编号', unique=True, max_length=50)
-    material = models.ForeignKey(Material, verbose_name='物料类型', on_delete=models.CASCADE)
+    material = models.ForeignKey(
-    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
+        Material, verbose_name='物料类型', on_delete=models.CASCADE)
+    warehouse = models.ForeignKey(
+        WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
     batch = models.CharField('所属批次号', max_length=100, default='')
     wproduct = models.ForeignKey('wpm.wproduct', on_delete=models.CASCADE, verbose_name='关联的动态产品', db_constraint=False,
                                  null=True, blank=True, related_name='iproduct_wproduct')
     is_saled = models.BooleanField('是否售出', default=False)
 
+
 class FIFOItemProduct(BaseModel):
     """
     出入库产品
     """
-    fifoitem = models.ForeignKey(FIFOItem, verbose_name='关联出入库具体产品', on_delete=models.CASCADE)
+    fifoitem = models.ForeignKey(
+        FIFOItem, verbose_name='关联出入库具体产品', on_delete=models.CASCADE)
     wproduct = models.ForeignKey('wpm.wproduct', on_delete=models.CASCADE, verbose_name='关联的动态产品', db_constraint=False, null=True, blank=True,
                                  related_name='fifoitem_wproduct')
     number = models.CharField('物品编号', max_length=50)
-    material = models.ForeignKey(Material, verbose_name='物料类型', on_delete=models.CASCADE)
+    material = models.ForeignKey(
-    iproduct = models.ForeignKey(IProduct, verbose_name='关联库存产品', null=True, blank=True, on_delete=models.SET_NULL)
+        Material, verbose_name='物料类型', on_delete=models.CASCADE)
-
+    iproduct = models.ForeignKey(
-
+        IProduct, verbose_name='关联库存产品', null=True, blank=True, on_delete=models.SET_NULL)
-
-    

hb_server/apps/inm/views.py

@@ -16,10 +16,13 @@ from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from django.db import transaction
+from django.utils import timezone
 
 from apps.wpm.services import WpmServies
 
 # Create your views here.
+
+
 class WarehouseViewSet(CreateUpdateModelAMixin, ModelViewSet):
     """
     仓库-增删改查
@@ -37,21 +40,25 @@ class WarehouseViewSet(CreateUpdateModelAMixin, ModelViewSet):
             return WareHouseCreateUpdateSerializer
         return WareHouseSerializer
 
+
 class InventoryViewSet(ListModelMixin, GenericViewSet):
     """
     仓库物料表
     """
     perms_map = {'*': '*'}
-    queryset = Inventory.objects.select_related('material', 'warehouse').filter(count__gt=0).all()
+    queryset = Inventory.objects.select_related(
+        'material', 'warehouse').filter(count__gt=0).all()
     serializer_class = InventorySerializer
     filterset_fields = ['material', 'warehouse']
     search_fields = []
     ordering_fields = ['create_time']
     ordering = ['-create_time']
 
+
 class MaterialBatchViewSet(ListModelMixin, GenericViewSet):
     perms_map = {'*': '*'}
-    queryset = MaterialBatch.objects.select_related('material', 'warehouse').filter(count__gt=0).all()
+    queryset = MaterialBatch.objects.select_related(
+        'material', 'warehouse').filter(count__gt=0).all()
     serializer_class = MaterialBatchSerializer
     # filterset_fields = ['material', 'warehouse']
     filterset_class = MbFilterSet
@@ -67,9 +74,11 @@ class MaterialBatchViewSet(ListModelMixin, GenericViewSet):
         data = request.data
         serializer = MaterialBatchQuerySerializer(data=data)
         serializer.is_valid(raise_exception=True)
-        queryset = self.queryset.filter(warehouse__id=data['warehouse'], material__id__in=data['materials'])
+        queryset = self.queryset.filter(
+            warehouse__id=data['warehouse'], material__id__in=data['materials'])
         return Response(MaterialBatchSerializer(instance=queryset, many=True).data)
 
+
 class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
     """
     出入库记录详情表
@@ -77,7 +86,8 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
     perms_map = {'*': '*'}
     queryset = FIFOItem.objects.select_related('material', 'fifo').all()
     serializer_class = FIFOItemSerializer
-    filterset_fields = ['material', 'fifo', 'fifo__type', 'is_tested', 'is_testok']
+    filterset_fields = ['material', 'fifo',
+                        'fifo__type', 'is_tested', 'is_testok']
     search_fields = []
     ordering_fields = ['create_time']
     ordering = ['-create_time']
@@ -115,6 +125,7 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
                 obj.fifo_item.save()
         return Response()
 
+
 class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
     """
     出入库记录
@@ -162,6 +173,7 @@ class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
         with transaction.atomic():
             obj.is_audited = True
             obj.auditor = request.user
+            obj.inout_date = timezone.now() # 也是审核日期
             obj.save()
             update_inm(obj)  # 更新库存
         return Response()
@@ -172,7 +184,8 @@ class IProductViewSet(ListModelMixin, GenericViewSet):
     半成品库存表
     """
     perms_map = {'*': '*'}
-    queryset = IProduct.objects.select_related('material', 'warehouse', 'wproduct__subproduction_plan__production_plan__order')
+    queryset = IProduct.objects.select_related(
+        'material', 'warehouse', 'wproduct__subproduction_plan__production_plan__order')
     serializer_class = IProductListSerializer
     filterset_class = IProductFilterSet
     search_fields = []

hb_server/apps/wpm/filters.py

@@ -4,39 +4,50 @@ from apps.mtm.models import Material, Step
 from apps.wpm.services import WpmServies
 from .models import Operation, OperationMaterial, OperationRecord, WMaterial, WProduct
 
+
 class WMaterialFilterSet(filters.FilterSet):
 
     operation = filters.NumberFilter(method='filter_operation')
+
     class Meta:
         model = WMaterial
-        fields = ['material', 'subproduction_plan', 'subproduction_plan__process', 'subproduction_plan__workshop', 'operation']
+        fields = ['material', 'subproduction_plan', 'subproduction_plan__process',
+                  'subproduction_plan__workshop', 'operation']
 
     def filter_operation(self, queryset, name, value):
         operation = Operation.objects.get(pk=value)
         wproducts = WProduct.objects.filter(ow_wproduct__operation=value)
         step = operation.step
         if wproducts.exists():
-            subplans = WpmServies.get_subplans_queryset_from_wproducts(wproducts)
+            subplans = WpmServies.get_subplans_queryset_from_wproducts(
+                wproducts)
         else:
             subplans = WpmServies.get_subplans_queyset_from_step(step)
-        queryset = queryset.filter(subproduction_plan__in=subplans).exclude(material__type=Material.MA_TYPE_HALFGOOD)
+        queryset = queryset.filter(subproduction_plan__in=subplans).exclude(
+            material__type=Material.MA_TYPE_HALFGOOD)
         return queryset
 
 
 class WProductFilterSet(filters.FilterSet):
     tag = filters.CharFilter(method='filter_tag')
-    production_plan = filters.NumberFilter(field_name='subproduction_plan__production_plan')
+    production_plan = filters.NumberFilter(
+        field_name='subproduction_plan__production_plan')
+
     class Meta:
         model = WProduct
-        fields = ['step', 'subproduction_plan', 'material', 'step__process', 'act_state', 'material__type']
+        fields = ['step', 'subproduction_plan', 'material',
+                  'step__process', 'act_state', 'material__type']
 
     def filter_tag(self, queryset, name, value):
         if value == 'no_scrap':
             queryset = queryset.exclude(act_state=WProduct.WPR_ACT_STATE_SCRAP)
         return queryset
 
+
 class CuttingFilterSet(filters.FilterSet):
-    production_plan = filters.NumberFilter(field_name='subproduction_plan__production_plan')
+    production_plan = filters.NumberFilter(
+        field_name='subproduction_plan__production_plan')
+
     class Meta:
         model = OperationMaterial
         fields = ['operation', 'subproduction_plan', 'material']
@@ -44,6 +55,7 @@ class CuttingFilterSet(filters.FilterSet):
 
 class OperationRecordFilterSet(filters.FilterSet):
     wproduct = filters.NumberFilter(method='filter_wproduct')
+
     class Meta:
         model = OperationRecord
         fields = ['operation', 'form']

hb_server/apps/wpm/models.py

@@ -13,15 +13,20 @@ from utils.model import SoftModel, BaseModel
 from simple_history.models import HistoricalRecords
 from apps.mtm.models import Material, Process, RecordFormField, Step, RecordForm, SubprodctionMaterial
 from apps.em.models import Equipment
+
+
 class WMaterial(BaseModel):
     """
     车间生产物料
     """
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联子计划', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
-    material = models.ForeignKey(Material, verbose_name='关联物料', on_delete=models.CASCADE)
+        SubProductionPlan, verbose_name='关联子计划', on_delete=models.CASCADE)
+    material = models.ForeignKey(
+        Material, verbose_name='关联物料', on_delete=models.CASCADE)
     batch = models.CharField('批次号', max_length=100, null=True, blank=True)
     count = models.PositiveIntegerField('当前数量', default=0)
 
+
 class WProduct(CommonAModel):
     """
     动态半成品/成品表
@@ -80,20 +85,30 @@ class WProduct(CommonAModel):
         (NG_BACK_FROM, '退回供方'),
         (NG_RECALL, '召回')
     )
-    number = models.CharField('物品编号', unique=True, null=True, blank=True, max_length=50)
+    number = models.CharField(
-    material = models.ForeignKey(Material, verbose_name='所属物料状态', on_delete=models.CASCADE)
+        '物品编号', unique=True, null=True, blank=True, max_length=50)
-    pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True, on_delete=models.CASCADE, related_name='w_pre_step')
+    material = models.ForeignKey(
-    step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True, related_name='w_step')
+        Material, verbose_name='所属物料状态', on_delete=models.CASCADE)
-    act_state = models.IntegerField('进行状态', default=0, choices=act_state_choices)
+    pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True,
+                                 on_delete=models.CASCADE, related_name='w_pre_step')
+    step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True,
+                             related_name='w_step')
+    act_state = models.IntegerField(
+        '进行状态', default=0, choices=act_state_choices)
     is_hidden = models.BooleanField('是否隐藏', default=False)
-    child = models.ForeignKey('self', blank=True, null=True, on_delete=models.CASCADE, related_name='wproduct_child')
+    child = models.ForeignKey('self', blank=True, null=True,
+                              on_delete=models.CASCADE, related_name='wproduct_child')
     remark = models.CharField('备注', max_length=200, null=True, blank=True)
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE, related_name='wproduct_subplan')
+    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE,
+                                           related_name='wproduct_subplan')
 
-    scrap_reason = models.IntegerField('报废原因', choices=scrap_reason_choices, null=True, blank=True)
+    scrap_reason = models.IntegerField(
-    ng_sign = models.PositiveSmallIntegerField('不合格标记', choices=ng_choices, null=True, blank=True)
+        '报废原因', choices=scrap_reason_choices, null=True, blank=True)
+    ng_sign = models.PositiveSmallIntegerField(
+        '不合格标记', choices=ng_choices, null=True, blank=True)
 
-    warehouse = models.ForeignKey(WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True)
+    warehouse = models.ForeignKey(
+        WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True)
 
     operation = models.ForeignKey('wpm.operation', verbose_name='当前操作',
                                   on_delete=models.SET_NULL, null=True, blank=True, related_name='wp_operation')
@@ -123,34 +138,52 @@ class WprouctTicket(CommonAModel):
     """
 
     number = models.CharField('物品编号', null=True, blank=True, max_length=50)
-    wproduct = models.ForeignKey(WProduct, verbose_name='关联产品', on_delete=models.CASCADE)
+    wproduct = models.ForeignKey(
-    material = models.ForeignKey(Material, verbose_name='所在物料状态', on_delete=models.CASCADE)
+        WProduct, verbose_name='关联产品', on_delete=models.CASCADE)
-    step = models.ForeignKey(Step, verbose_name='所在步骤/发现步骤', on_delete=models.CASCADE)
+    material = models.ForeignKey(
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='所在子生产计划', on_delete=models.CASCADE)
+        Material, verbose_name='所在物料状态', on_delete=models.CASCADE)
+    step = models.ForeignKey(
+        Step, verbose_name='所在步骤/发现步骤', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='所在子生产计划', on_delete=models.CASCADE)
+
+    resp_process = models.ForeignKey(
+        Process, verbose_name='责任工序', on_delete=models.CASCADE, null=True, blank=True)
+    ticket = models.ForeignKey(
+        'wf.ticket', verbose_name='关联工单', on_delete=models.CASCADE, related_name='wt_ticket')
+    decision = models.PositiveSmallIntegerField(
+        '最终决定', choices=WProduct.ng_choices, null=True, blank=True)
 
-    resp_process = models.ForeignKey(Process, verbose_name='责任工序', on_delete=models.CASCADE, null=True, blank=True)
-    ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.CASCADE, related_name='wt_ticket')
-    decision = models.PositiveSmallIntegerField('最终决定', choices=WProduct.ng_choices, null=True, blank=True)
 
 class WproductFlow(CommonAModel):
     """
     动态产品表日志
     """
-    wproduct = models.ForeignKey(WProduct, on_delete=models.CASCADE, verbose_name='关联产品', null=True, blank=True)
+    wproduct = models.ForeignKey(
+        WProduct, on_delete=models.CASCADE, verbose_name='关联产品', null=True, blank=True)
     number = models.CharField('物品编号', null=True, blank=True, max_length=50)
-    material = models.ForeignKey(Material, verbose_name='所属物料状态', on_delete=models.CASCADE)
+    material = models.ForeignKey(
-    pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True, on_delete=models.CASCADE, related_name='wl_pre_step')
+        Material, verbose_name='所属物料状态', on_delete=models.CASCADE)
-    step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True, related_name='wl_step')
+    pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True,
-    act_state = models.IntegerField('进行状态', default=0, choices=WProduct.act_state_choices)
+                                 on_delete=models.CASCADE, related_name='wl_pre_step')
+    step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True,
+                             related_name='wl_step')
+    act_state = models.IntegerField(
+        '进行状态', default=0, choices=WProduct.act_state_choices)
     is_hidden = models.BooleanField('是否隐藏', default=False)
-    child = models.ForeignKey('self', blank=True, null=True, on_delete=models.CASCADE, related_name='wproduct_child')
+    child = models.ForeignKey('self', blank=True, null=True,
+                              on_delete=models.CASCADE, related_name='wproduct_child')
     remark = models.CharField('备注', max_length=200, null=True, blank=True)
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE)
 
-    scrap_reason = models.IntegerField('报废原因', choices= WProduct.scrap_reason_choices, null=True, blank=True)
+    scrap_reason = models.IntegerField(
-    ng_sign = models.PositiveSmallIntegerField('不合格标记', choices= WProduct.ng_choices, null=True, blank=True)
+        '报废原因', choices=WProduct.scrap_reason_choices, null=True, blank=True)
+    ng_sign = models.PositiveSmallIntegerField(
+        '不合格标记', choices=WProduct.ng_choices, null=True, blank=True)
 
-    warehouse = models.ForeignKey(WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True)
+    warehouse = models.ForeignKey(
+        WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True)
     operation = models.ForeignKey('wpm.operation', verbose_name='当前操作',
                                   on_delete=models.SET_NULL, null=True, blank=True, related_name='wpf_operation')
     coperation = models.ForeignKey('wpm.operation', verbose_name='创建所关联操作',
@@ -179,59 +212,82 @@ class Pick(CommonADModel):
         (PICK_FROM_WAREHOUSE, '仓库领取'),
         (PICK_FROM_WPRODUCT, '半成品领取'),
     )
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
-    type = models.PositiveSmallIntegerField(choices=type_choice, default=PICK_FROM_WAREHOUSE)
+        SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE)
-    fifo = models.ForeignKey(FIFO, verbose_name='关联的出入库记录', on_delete=models.CASCADE, null=True, blank=True)
+    type = models.PositiveSmallIntegerField(
+        choices=type_choice, default=PICK_FROM_WAREHOUSE)
+    fifo = models.ForeignKey(
+        FIFO, verbose_name='关联的出入库记录', on_delete=models.CASCADE, null=True, blank=True)
+
 
 class PickWproduct(BaseModel):
     """
     领取半成品时详情
     """
-    pick = models.ForeignKey(Pick, verbose_name='关联领料', on_delete=models.CASCADE)
+    pick = models.ForeignKey(Pick, verbose_name='关联领料',
-    wproduct = models.ForeignKey(WProduct, verbose_name='关联半成品', on_delete=models.CASCADE, related_name='pw_wproduct')
+                             on_delete=models.CASCADE)
+    wproduct = models.ForeignKey(
+        WProduct, verbose_name='关联半成品', on_delete=models.CASCADE, related_name='pw_wproduct')
     number = models.CharField('物品编号', null=True, blank=True, max_length=50)
-    material = models.ForeignKey(Material, verbose_name='领取时的物料状态', on_delete=models.CASCADE)
+    material = models.ForeignKey(
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='领取时所属子生产计划', on_delete=models.CASCADE)
+        Material, verbose_name='领取时的物料状态', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='领取时所属子生产计划', on_delete=models.CASCADE)
+
 
 class Operation(CommonADModel):
     """
     生产操作
     """
-    step = models.ForeignKey(Step, verbose_name='操作步骤', on_delete=models.CASCADE, null=True, blank=True)
+    step = models.ForeignKey(Step, verbose_name='操作步骤',
+                             on_delete=models.CASCADE, null=True, blank=True)
     remark = models.CharField('操作备注', max_length=200, null=True, blank=True)
     is_submited = models.BooleanField('是否提交', default=False)
 
+
 class OperationWproduct(BaseModel):
     """
     生产操作半成品关联表
     """
-    operation = models.ForeignKey(Operation, verbose_name='关联操作', on_delete=models.CASCADE, related_name='ow_operation')
+    operation = models.ForeignKey(
-    wproduct = models.ForeignKey(WProduct, verbose_name='关联半成品', on_delete=models.CASCADE, related_name='ow_wproduct')
+        Operation, verbose_name='关联操作', on_delete=models.CASCADE, related_name='ow_operation')
+    wproduct = models.ForeignKey(
+        WProduct, verbose_name='关联半成品', on_delete=models.CASCADE, related_name='ow_wproduct')
     number = models.CharField('物品编号', null=True, blank=True, max_length=50)
-    material = models.ForeignKey(Material, verbose_name='操作时的物料状态', on_delete=models.CASCADE)
+    material = models.ForeignKey(
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE, related_name='ow_subplan')
+        Material, verbose_name='操作时的物料状态', on_delete=models.CASCADE)
-    ng_sign = models.PositiveSmallIntegerField('当时的不合格标记', choices= WProduct.ng_choices, null=True, blank=True)
+    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE,
+                                           related_name='ow_subplan')
+    ng_sign = models.PositiveSmallIntegerField(
+        '当时的不合格标记', choices=WProduct.ng_choices, null=True, blank=True)
     place = models.CharField('摆放位置', null=True, blank=True, max_length=200)
+
     class Meta:
         unique_together = (
             ('operation', 'wproduct')
         )
 
+
 class OperationMaterial(BaseModel):
     """
     生产操作物料消耗产出表
     """
-    type = models.IntegerField('类型', default=0, choices=SubprodctionMaterial.type_choices)
+    type = models.IntegerField(
-    operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE, related_name='om_operation')
+        '类型', default=0, choices=SubprodctionMaterial.type_choices)
+    operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE,
+                                  related_name='om_operation')
 
     material = models.ForeignKey(Material, verbose_name='可能产出的产品', on_delete=models.CASCADE,
                                  null=True, blank=True, related_name='om_material')
     count = models.PositiveSmallIntegerField('消耗或产出数量', null=True, blank=True)
 
-    wmaterial = models.ForeignKey(WMaterial, verbose_name='关联的车间物料', on_delete=models.CASCADE, null=True, blank=True)
+    wmaterial = models.ForeignKey(
-    subproduction_progress = models.ForeignKey(SubProductionProgress, verbose_name='关联的生产进度', on_delete=models.CASCADE, null=True, blank=True)
+        WMaterial, verbose_name='关联的车间物料', on_delete=models.CASCADE, null=True, blank=True)
+    subproduction_progress = models.ForeignKey(SubProductionProgress, verbose_name='关联的生产进度', on_delete=models.CASCADE,
+                                               null=True, blank=True)
 
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联的子计划', on_delete=models.CASCADE, null=True, blank=True)
+    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联的子计划', on_delete=models.CASCADE,
+                                           null=True, blank=True)
     batch = models.CharField('批次号', max_length=100, null=True, blank=True)
     use_scrap = models.BooleanField('是否使用的边角料', default=False)
 
@@ -252,23 +308,32 @@ class OperationMaterial(BaseModel):
             ('operation', 'material', 'batch')
         )
 
+
 class OperationRecord(BaseModel):
     """
     记录表格
     """
-    form = models.ForeignKey(RecordForm, verbose_name='所用的生产记录表格', on_delete=models.CASCADE, related_name='or_form')
+    form = models.ForeignKey(RecordForm, verbose_name='所用的生产记录表格',
-    operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE, related_name='or_operation')
+                             on_delete=models.CASCADE, related_name='or_form')
+    operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE,
+                                  related_name='or_operation')
     is_filled = models.BooleanField('是否填写', default=True)
 
+
 class OperationRecordItem(BaseModel):
     """
     记录表格字段值
     """
-    form_field = models.ForeignKey(RecordFormField, verbose_name='关联字段', on_delete=models.CASCADE, related_name='ori_form_field')
+    form_field = models.ForeignKey(RecordFormField, verbose_name='关联字段', on_delete=models.CASCADE,
+                                   related_name='ori_form_field')
     field_value = models.JSONField('录入值', null=True, blank=True)
-    operation_record = models.ForeignKey(OperationRecord, verbose_name='关联的生产记录', on_delete=models.CASCADE, related_name='item_operation_record')
+    operation_record = models.ForeignKey(OperationRecord, verbose_name='关联的生产记录', on_delete=models.CASCADE,
+                                         related_name='item_operation_record')
+
 
 class OperationEquip(BaseModel):
-    operation = models.ForeignKey(Operation, verbose_name='关联操作', on_delete=models.CASCADE, related_name='oe_operation')
+    operation = models.ForeignKey(
-    equip = models.ForeignKey(Equipment, verbose_name='生产设备', on_delete=models.CASCADE, related_name='oe_equip')
+        Operation, verbose_name='关联操作', on_delete=models.CASCADE, related_name='oe_operation')
+    equip = models.ForeignKey(Equipment, verbose_name='生产设备',
+                              on_delete=models.CASCADE, related_name='oe_equip')
     remark = models.TextField('备注', null=True, blank=True)

hb_server/apps/wpm/serializers.py

@@ -418,12 +418,12 @@ class WplanPutInSerializer(serializers.Serializer):
 
 class WproductPutInSerializer(serializers.Serializer):
     warehouse = serializers.PrimaryKeyRelatedField(queryset=WareHouse.objects.all(), label="仓库ID")
-    remark = serializers.CharField(label="入库备注", required =False)
+    remark = serializers.CharField(label="入库备注", required =False, default="")
 
 class WproductPutInsSerializer(serializers.Serializer):
     warehouse = serializers.PrimaryKeyRelatedField(queryset=WareHouse.objects.all(), label="仓库ID")
     wproducts = serializers.PrimaryKeyRelatedField(queryset=WProduct.objects.all(), label='半成品ID', many=True)
-    remark = serializers.CharField(label="入库备注", required =False, allow_null=True)
+    remark = serializers.CharField(label="入库备注", required =False, default="")
 
 
 class OperationEquipListSerializer(serializers.Serializer):

hb_server/apps/wpm/views.py

@@ -1,47 +1,57 @@
-from django.db.models.expressions import F
-from django.shortcuts import render
 from rest_framework.generics import CreateAPIView, GenericAPIView
-from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModelMixin, RetrieveModelMixin, UpdateModelMixin
+from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, \
-from rest_framework.utils import serializer_helpers
+    ListModelMixin, RetrieveModelMixin, UpdateModelMixin
-from rest_framework.utils.field_mapping import get_relation_kwargs
+from rest_framework.viewsets import GenericViewSet
-from rest_framework.views import APIView
+from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct
-from rest_framework.viewsets import GenericViewSet, ModelViewSet
-from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, WareHouse
 from apps.inm.signals import update_inm
 from apps.mtm.models import Material, RecordForm, RecordFormField, Step, SubprodctionMaterial, TechDoc
 from apps.mtm.serializers import RecordFormDetailSerializer, SubprodctionMaterialListSerializer, TechDocListSerializer
 from apps.pm.models import SubProductionPlan, SubProductionProgress
-from apps.pm.serializers import SubProductionPlanListSerializer, SubProductionPlanUpdateSerializer, SubProductionProgressSerializer
+from apps.pm.serializers import SubProductionPlanListSerializer, SubProductionProgressSerializer
 from apps.qm.models import TestRecord, TestRecordItem
 from apps.qm.serializers import TestRecordDetailSerializer
 
-from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
+from apps.system.mixins import CreateUpdateModelAMixin
 from rest_framework.decorators import action
 from apps.wf.models import Workflow
-from apps.wf.serializers import WorkflowSimpleSerializer
 from apps.wpm.filters import CuttingFilterSet, OperationRecordFilterSet, WMaterialFilterSet, WProductFilterSet
-from apps.wpm.models import OperationEquip, OperationWproduct, Pick, PickWproduct, WMaterial, WProduct, Operation, OperationMaterial, OperationRecord, OperationRecordItem, WprouctTicket
+from apps.wpm.models import OperationEquip, OperationWproduct, Pick, PickWproduct, WMaterial, WProduct, Operation, \
+    OperationMaterial, OperationRecord, OperationRecordItem, WprouctTicket
+
+from apps.wpm.serializers import CuttingListSerializer, OperationEquipListSerializer, OperationEquipUpdateSerializer, \
+    OperationMaterialCreate1ListSerailizer, OperationMaterialCreate1Serailizer, OperationMaterialCreate2ListSerailizer, \
+    OperationMaterialCreate2Serailizer, OperationMaterialCreate3Serializer, OperationMaterialListSerializer, \
+    OperationRecordDetailSerializer, OperationRecordListSerializer, OperationRecordSubmitSerializer, \
+    OperationUpdateSerializer, OperationWproductListSerializer, OperationCreateSerializer, OperationDetailSerializer, \
+    OperationListSerializer, OperationWproductUpdateSerializer, PickHalfsSerializer, \
+    PickSerializer, OperationInitSerializer, OperationSubmitSerializer, ScrapSerializer, WMaterialListSerializer, \
+    WProductCardSerializer, WProductDetailSerializer, WProductListSerializer, \
+    WpmTestFormInitSerializer, WproductMtestSerializer, WproductPutInSerializer, \
+    WproductPutInsSerializer, WproductTicketListSerializer
 
-from apps.wpm.serializers import CuttingListSerializer, OperationEquipListSerializer, OperationEquipUpdateSerializer, OperationMaterialCreate1ListSerailizer, OperationMaterialCreate1Serailizer, OperationMaterialCreate2ListSerailizer, OperationMaterialCreate2Serailizer, OperationMaterialCreate3Serializer, OperationMaterialListSerializer, OperationRecordDetailSerializer, OperationRecordListSerializer, OperationRecordSubmitSerializer, OperationUpdateSerializer, OperationWproductListSerializer, OperationCreateSerializer, OperationDetailSerializer, OperationListSerializer, OperationWproductUpdateSerializer, PickHalfSerializer, PickHalfsSerializer, PickSerializer, OperationInitSerializer, OperationSubmitSerializer, ScrapSerializer, WMaterialListSerializer, WProductCardSerializer, WProductDetailSerializer, WProductListSerializer, WplanPutInSerializer, WpmTestFormInitSerializer, WpmTestRecordCreateSerializer, WproductMtestSerializer, WproductPutInSerializer, WproductPutInsSerializer, WproductTicketListSerializer
 from rest_framework.response import Response
 from django.db import transaction
 from rest_framework import exceptions, serializers
-
 from apps.wpm.services import WpmServies
 from django.utils import timezone
-from utils.tools import ranstr
 from rest_framework import status
 from django.db.models import Count
+
+
 # Create your views here.
+
+
 class WPlanViewSet(ListModelMixin, GenericViewSet):
     """
     车间生产计划
     """
     perms_map = {'*': '*'}
-    queryset = SubProductionPlan.objects.select_related('process', 'workshop', 'subproduction', 'product').exclude(state=0)
+    queryset = SubProductionPlan.objects.select_related(
+        'process', 'workshop', 'subproduction', 'product').exclude(state=0)
     search_fields = []
     serializer_class = SubProductionPlanListSerializer
-    filterset_fields = ['production_plan', 'process', 'state', 'product', 'workshop']
+    filterset_fields = ['production_plan',
+                        'process', 'state', 'product', 'workshop']
     ordering_fields = []
     ordering = ['-update_time']
 
@@ -57,7 +67,8 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
             领半成品
             """
             spps = SubProductionProgress.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_IN,
-                material__type=Material.MA_TYPE_HALFGOOD, subproduction_plan=sp).select_related('material')
+                                                        material__type=Material.MA_TYPE_HALFGOOD,
+                                                        subproduction_plan=sp).select_related('material')
             return Response(SubProductionProgressSerializer(instance=spps, many=True).data)
         elif request.method == 'POST':
             serializer = PickHalfsSerializer(data=request.data)
@@ -77,7 +88,8 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
                     # if spp.count_pick > spp.count:
                     #     raise exceptions.APIException('超过计划数')
                     spp.save()
-                    wps = WProduct.objects.filter(pk__in=[x.id for x in i['wproducts']], act_state=WProduct.WPR_ACT_STATE_OK)
+                    wps = WProduct.objects.filter(
+                        pk__in=[x.id for x in i['wproducts']], act_state=WProduct.WPR_ACT_STATE_OK)
                     wps.update(step=first_step,
                                act_state=WProduct.WPR_ACT_STATE_TORETEST, is_hidden=False, warehouse=None,
                                subproduction_plan=sp, update_by=request.user, update_time=timezone.now())
@@ -91,7 +103,8 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
                         m.update_by = request.user
                         m.update_time = timezone.now()
                         m.save()
-                        WpmServies.add_wproduct_flow_log(instance=m, change_str='pick_half')
+                        WpmServies.add_wproduct_flow_log(
+                            instance=m, change_str='pick_half')
                         pw = PickWproduct()
                         pw.pick = pick
                         pw.wproduct = m
@@ -105,71 +118,13 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
             return Response()
 
 
-    # @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=WplanPutInSerializer)
-    # @transaction.atomic
-    # def putin(self, request, pk=None):
-    #     """
-    #     半成品入库
-    #     """
-    #     serializer= WplanPutInSerializer(data=request.data)
-    #     serializer.is_valid(raise_exception=True)
-    #     vdata = serializer.validated_data
-    #     subplan = self.get_object()
-    #     material = subplan.product
-    #     batch = subplan.number
-    #     warehouse = vdata['warehouse']
-    #     wproducts = WProduct.objects.filter(subproduction_plan=subplan, 
-    #         act_state=WProduct.WPR_ACT_STATE_OK, material=material, is_deleted=False)
-    #     if wproducts.exists():
-    #         # 创建入库记录
-    #         remark = vdata.get('remark', '')
-    #         fifo = FIFO.objects.create(type=FIFO.FIFO_TYPE_DO_IN,
-    #             is_audited=True, auditor=request.user, inout_date=timezone.now(), create_by=request.user, remark=remark)
-    #         # 创建入库明细
-    #         fifoitem = FIFOItem()
-    #         fifoitem.is_tested = True
-    #         fifoitem.is_testok = True
-    #         fifoitem.warehouse = warehouse 
-    #         fifoitem.material = material
-    #         fifoitem.count = wproducts.count()
-    #         fifoitem.batch = batch
-    #         fifoitem.fifo = fifo
-    #         fifoitem.subproduction_plan = subplan
-    #         fifoitem.save()
-    #         # 创建入库明细半成品
-    #         ips = []
-    #         for i in wproducts:
-    #             ip = {}
-    #             ip['fifoitem'] = fifoitem
-    #             ip['wproduct'] = i
-    #             ip['number'] = i.number
-    #             ip['material'] = material
-    #             ips.append(FIFOItemProduct(**ip))
-    #         FIFOItemProduct.objects.bulk_create(ips)
-    #         # 创建IProduct
-    #         ips2 = []
-    #         for i in wproducts:
-    #             ip = {}
-    #             ip['warehouse'] = warehouse
-    #             ip['batch'] = batch
-    #             ip['wproduct'] = i
-    #             ip['number'] = i.number
-    #             ip['material'] = material
-    #             ips2.append(IProduct(**ip))
-    #         IProduct.objects.bulk_create(ips2)
-    #         # 更新库存并修改半成品进行状态
-    #         update_inm(fifo)
-    #         wproducts.update(act_sate=WProduct.WPR_ACT_STATE_INM, warehouse=warehouse, update_by=request.user, update_time=timezone.now())
-            
-    #     return Response()
-
-
 class WMaterialViewSet(CreateUpdateModelAMixin, ListModelMixin, GenericViewSet):
     """
     车间物料表
     """
     perms_map = {'*': '*'}
-    queryset = WMaterial.objects.select_related('material', 'subproduction_plan').filter(count__gt=0)
+    queryset = WMaterial.objects.select_related(
+        'material', 'subproduction_plan').filter(count__gt=0)
     serializer_class = WMaterialListSerializer
     filterset_class = WMaterialFilterSet
     ordering_fields = ['material__number']
@@ -180,11 +135,13 @@ class WMaterialViewSet(CreateUpdateModelAMixin, ListModelMixin, GenericViewSet):
         """
         领料
         """
-        serializer= PickSerializer(data=request.data, context={'request': request})
+        serializer = PickSerializer(
+            data=request.data, context={'request': request})
         serializer.is_valid(raise_exception=True)
         serializer.save()
         return Response()
 
+
 class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
     """
     半成品
@@ -225,7 +182,8 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
 
         # 根据情况创建一条检验记录
         if wproduct.act_state not in [WProduct.WPR_ACT_STATE_TOTEST,
-                                    WProduct.WPR_ACT_STATE_TORETEST, WProduct.WPR_ACT_STATE_TOFINALTEST, WProduct.WPR_ACT_STATE_TOCOMBTEST]:
+                                      WProduct.WPR_ACT_STATE_TORETEST, WProduct.WPR_ACT_STATE_TOFINALTEST,
+                                      WProduct.WPR_ACT_STATE_TOCOMBTEST]:
             raise exceptions.APIException('该产品当前状态不可检验')
 
         savedict = dict(
@@ -272,17 +230,20 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         serializer = WproductPutInsSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         vdata = serializer.validated_data
-        wproducts = WProduct.objects.filter(pk__in=[x.id for x in vdata['wproducts']])
+        wproducts = WProduct.objects.filter(
+            pk__in=[x.id for x in vdata['wproducts']])
         warehouse = vdata['warehouse']
         for i in wproducts:
             if i.act_state is not WProduct.WPR_ACT_STATE_OK:
                 raise exceptions.APIException('存在不可入库半成品')
         # 聚合一下
-        wproducts_a = wproducts.values('subproduction_plan', 'material', 'subproduction_plan__number').annotate(total=Count('id'))
+        wproducts_a = wproducts.values(
+            'subproduction_plan', 'material', 'subproduction_plan__number').annotate(total=Count('id'))
         # 创建入库记录
         remark = vdata.get('remark', '')
         fifo = FIFO.objects.create(type=FIFO.FIFO_TYPE_DO_IN,
-            is_audited=True, auditor=request.user, inout_date=timezone.now(), create_by=request.user, remark=remark)
+                                   is_audited=True, auditor=request.user, inout_date=timezone.now(),
+                                   create_by=request.user, remark=remark)
         # 创建入库明细
         for i in wproducts_a:
             spi = SubProductionPlan.objects.get(pk=i['subproduction_plan'])
@@ -297,7 +258,8 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             fifoitem.subproduction_plan = spi
             fifoitem.save()
 
-            wproducts_items = wproducts.filter(subproduction_plan=i['subproduction_plan'], material=i['material'])
+            wproducts_items = wproducts.filter(
+                subproduction_plan=i['subproduction_plan'], material=i['material'])
             ips = []
             for i in wproducts_items:
                 # 创建入库明细半成品
@@ -337,7 +299,8 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         # 创建入库记录
         remark = vdata.get('remark', '')
         fifo = FIFO.objects.create(type=FIFO.FIFO_TYPE_DO_IN,
-            is_audited=True, auditor=request.user, inout_date=timezone.now(), create_by=request.user, remark=remark)
+                                   is_audited=True, auditor=request.user, inout_date=timezone.now(),
+                                   create_by=request.user, remark=remark)
         # 创建入库明细
         fifoitem = FIFOItem()
         fifoitem.is_tested = True
@@ -412,9 +375,11 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         if obj.act_state != WProduct.WPR_ACT_STATE_NOTOK or obj.ng_sign is not None \
                 or obj.ticket is not None:
             raise exceptions.APIException('该产品不可发起不合格审理')
-        workflow = Workflow.objects.filter(name='不合格品审理单', is_deleted=False).first()
+        workflow = Workflow.objects.filter(
+            name='不合格品审理单', is_deleted=False).first()
         if workflow:
-            test_record = TestRecord.objects.filter(wproduct=obj, is_deleted=False, is_testok=False).order_by('-id').first()
+            test_record = TestRecord.objects.filter(
+                wproduct=obj, is_deleted=False, is_testok=False).order_by('-id').first()
             exist_data = {
                 'wproduct': obj.id,
                 'wproduct_number': obj.number,
@@ -446,7 +411,8 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         is_mtestok = request.data.get('is_mtestok')
         obj.is_mtestok = is_mtestok
         if is_mtestok:
-            WpmServies.update_plan_state_by_mtestok(obj.subproduction_plan.production_plan)
+            WpmServies.update_plan_state_by_mtestok(
+                obj.subproduction_plan.production_plan)
         obj.save()
         change_str = 'mtest_notok'
         if is_mtestok:
@@ -479,25 +445,30 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             ret.append([str(index + 1), item['step_name'], item['actions']])
         return Response(ret)
 
+
 class WproductTicketViewSet(ListModelMixin, GenericViewSet):
     """
     玻璃审批工单
     """
     perms_map = {'*': '*'}
     queryset = WprouctTicket.objects.select_related('step', 'material', 'subproduction_plan',
-    'resp_process', 'subproduction_plan__production_plan__order', 'subproduction_plan__production_plan')
+                                                    'resp_process', 'subproduction_plan__production_plan__order',
+                                                    'subproduction_plan__production_plan')
     serializer_class = WproductTicketListSerializer
-    filterset_fields = ['step', 'material', 'subproduction_plan', 'resp_process']
+    filterset_fields = ['step', 'material',
+                        'subproduction_plan', 'resp_process']
     ordering_fields = ['id']
     ordering = ['-id']
 
 
-class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, UpdateModelMixin, DestroyModelMixin, GenericViewSet):
+class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, UpdateModelMixin, DestroyModelMixin,
+                       GenericViewSet):
     """
     生产操作记录
     """
     perms_map = {'*': '*'}
-    queryset = Operation.objects.select_related('step').prefetch_related('ow_operation', 'oe_operation', 'or_operation').all()
+    queryset = Operation.objects.select_related('step').prefetch_related(
+        'ow_operation', 'oe_operation', 'or_operation').all()
     serializer_class = OperationListSerializer
     filterset_fields = ['step', 'step__process', 'is_submited']
     ordering_fields = ['id']
@@ -537,7 +508,8 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
     @transaction.atomic
     def create(self, request, *args, **kwargs):
         data = request.data
-        serializer = OperationCreateSerializer(data=data, context={'request':self.request})
+        serializer = OperationCreateSerializer(
+            data=data, context={'request': self.request})
         serializer.is_valid(raise_exception=True)
         vdata = serializer.validated_data  # 校验之后的数据
         step = vdata['step']
@@ -550,7 +522,8 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
         # 创建操作所用半成品关联记录
         if 'wproducts' in vdata:
             owps = []
-            splans = WpmServies.get_subplans_queryset_from_wproducts(vdata['wproducts'])
+            splans = WpmServies.get_subplans_queryset_from_wproducts(
+                vdata['wproducts'])
             for wpd in vdata['wproducts']:
                 wpd.operation = op
                 wpd.act_state = WProduct.WPR_ACT_STATE_DOING
@@ -567,9 +540,11 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 owps.append(OperationWproduct(**owp))
             OperationWproduct.objects.bulk_create(owps)
         else:
-            splans = WpmServies.get_subplans_queryset_from_wproducts(vdata['wproducts'])
+            splans = WpmServies.get_subplans_queryset_from_wproducts(
+                vdata['wproducts'])
         # 查询需要填写的自定义表格
-        forms = RecordForm.objects.filter(step=step, type=RecordForm.RF_TYPE_DO, enabled=True)
+        forms = RecordForm.objects.filter(
+            step=step, type=RecordForm.RF_TYPE_DO, enabled=True)
         for i in forms:
             opr = OperationRecord()
             opr.operation = op
@@ -591,7 +566,8 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
             ope.save()
         # 查询所需的工具工装
         for i in SubprodctionMaterial.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL,
-                        subproduction__subplan_subprod__in = splans, is_deleted=False).distinct():
+                                                     subproduction__subplan_subprod__in=splans,
+                                                     is_deleted=False).distinct():
             opm = OperationMaterial()
             opm.operation = op
             opm.material = i.material
@@ -616,7 +592,8 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
         # 校验消耗产出是否正确填写
         if op.step.type == Step.STEP_TYPE_DIV:
             sps_omi_l = omis.values_list('subproduction_plan', flat=True)
-            sps_omo_l = omos.filter(use_scrap=False).values_list('subproduction_plan', flat=True)
+            sps_omo_l = omos.filter(use_scrap=False).values_list(
+                'subproduction_plan', flat=True)
             if set(list(sps_omi_l)) != set(list(sps_omo_l)):
                 raise exceptions.APIException('消耗与产出不一致')
 
@@ -640,7 +617,8 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
         for i in omos:
             if not i.subproduction_progress.is_main:
                 # 更新车间物料产出情况
-                ins, _ = WMaterial.objects.get_or_create(subproduction_plan=i.subproduction_plan, material=i.material)
+                ins, _ = WMaterial.objects.get_or_create(
+                    subproduction_plan=i.subproduction_plan, material=i.material)
                 ins.count = ins.count + i.count
                 ins.save()
                 # 更新子计划物料产出情况
@@ -678,7 +656,8 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 raise exceptions.APIException('请选择物料产出')
             for i in omos:
                 if i.subproduction_progress.is_main:
-                    newstep, _ = WpmServies.get_next_step(i.subproduction_plan, step)
+                    newstep, _ = WpmServies.get_next_step(
+                        i.subproduction_plan, step)
                     wpr = dict(material=i.material, step=newstep,
                                act_state=WProduct.WPR_ACT_STATE_DOWAIT, remark='',
                                subproduction_plan=i.subproduction_plan,
@@ -686,15 +665,18 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                     for x in range(i.count):
                         ins = WProduct.objects.create(**wpr)
                         # 添加日志
-                        WpmServies.add_wproduct_flow_log(ins, 'wproduct_create')
+                        WpmServies.add_wproduct_flow_log(
+                            ins, 'wproduct_create')
                     # 更新进度
-                    WpmServies.update_subproduction_progress_main(sp=i.subproduction_plan)              
+                    WpmServies.update_subproduction_progress_main(
+                        sp=i.subproduction_plan)
         elif step.type == Step.STEP_TYPE_COMB:
             oms_w = omos.filter(subproduction_progress__is_main=True)
             if len(oms_w) == 1:
                 oms_w = oms_w[0]
                 # 校验单片数量是否正确, 暂时未写
-                newstep, hasNext = WpmServies.get_next_step(oms_w.subproduction_plan, step)
+                newstep, hasNext = WpmServies.get_next_step(
+                    oms_w.subproduction_plan, step)
                 wproduct = WProduct()
                 wproduct.material = oms_w.material
                 wproduct.step = newstep
@@ -704,14 +686,16 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 else:
                     wproduct.act_state = WProduct.WPR_ACT_STATE_TOTEST
                     # 更新子计划进度
-                    WpmServies.update_subproduction_progress_main(sp=oms_w.subproduction_plan)
+                    WpmServies.update_subproduction_progress_main(
+                        sp=oms_w.subproduction_plan)
                 wproduct.create_by = request.user
                 wproduct.coperation = op
                 wproduct.save()
                 WpmServies.add_wproduct_flow_log(wproduct, 'wproduct_create')
                 # 隐藏原半成品
                 wps = WProduct.objects.filter(ow_wproduct__operation=op)
-                wps.update(is_hidden=True, child=wproduct, update_by=request.user, update_time=timezone.now())
+                wps.update(is_hidden=True, child=wproduct,
+                           update_by=request.user, update_time=timezone.now())
             else:
                 raise exceptions.APIException('产出物料未填写或填写错误')
         op.is_submited = True
@@ -723,13 +707,13 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
         return Response()
 
 
-
 class OperationWproductViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, GenericViewSet):
     """
     操作使用的半成品
     """
     perms_map = {'*': '*'}
-    queryset = OperationWproduct.objects.select_related('subproduction_plan', 'material').all()
+    queryset = OperationWproduct.objects.select_related(
+        'subproduction_plan', 'material').all()
     serializer_class = OperationWproductListSerializer
     filterset_fields = ['material', 'subproduction_plan', 'operation']
     ordering_fields = ['id']
@@ -751,12 +735,14 @@ class OperationWproductViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMix
         wp.save()
         return Response()
 
+
 class OperationEquipViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, GenericViewSet):
     """
     操作使用的设备
     """
     perms_map = {'*': '*'}
-    queryset = OperationEquip.objects.select_related('operation', 'equip').all()
+    queryset = OperationEquip.objects.select_related(
+        'operation', 'equip').all()
     serializer_class = OperationEquipListSerializer
     filterset_fields = ['operation', 'equip']
     ordering_fields = ['id']
@@ -781,12 +767,14 @@ class OperationEquipViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin,
         instance.delete()
         return Response()
 
+
 class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet):
     """
     操作使用的自定义表格
     """
     perms_map = {'*': '*'}
-    queryset = OperationRecord.objects.select_related('operation', 'form').all()
+    queryset = OperationRecord.objects.select_related(
+        'operation', 'form').all()
     serializer_class = OperationRecordListSerializer
     filterset_class = OperationRecordFilterSet
     ordering_fields = ['id']
@@ -798,6 +786,7 @@ class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin
         elif self.action == 'retrieve':
             return OperationRecordDetailSerializer
         return super().get_serializer_class()
+
     @transaction.atomic()
     def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
@@ -806,7 +795,6 @@ class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin
         instance.delete()
         return Response()
 
-
     def update(self, request, *args, **kwargs):
         serializer = OperationRecordSubmitSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -829,7 +817,8 @@ class OperationMaterialInputViewSet(ListModelMixin, CreateModelMixin, DestroyMod
     消耗物料
     """
     perms_map = {'*': '*'}
-    queryset = OperationMaterial.objects.select_related('operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_IN)
+    queryset = OperationMaterial.objects.select_related(
+        'operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_IN)
     serializer_class = OperationMaterialListSerializer
     filterset_fields = ['operation', 'subproduction_plan']
     ordering_fields = ['id']
@@ -840,7 +829,8 @@ class OperationMaterialInputViewSet(ListModelMixin, CreateModelMixin, DestroyMod
             return OperationMaterialCreate1Serailizer
         return super().get_serializer_class()
 
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=OperationMaterialCreate1ListSerailizer)
+    @action(methods=['post'], detail=False, perms_map={'post': '*'},
+            serializer_class=OperationMaterialCreate1ListSerailizer)
     def creates(self, request, pk=None):
         """
         批量创建消耗物料
@@ -850,7 +840,6 @@ class OperationMaterialInputViewSet(ListModelMixin, CreateModelMixin, DestroyMod
         serializer.save()
         return Response()
 
-
     @transaction.atomic()
     def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
@@ -859,13 +848,16 @@ class OperationMaterialInputViewSet(ListModelMixin, CreateModelMixin, DestroyMod
         instance.delete()
         return Response()
 
+
 class CuttingListViewSet(ListModelMixin, GenericViewSet):
     """
     下料清单
     """
     perms_map = {'*': '*'}
     queryset = OperationMaterial.objects.select_related('operation',
-            'subproduction_plan', 'material', 'operation__create_by').filter(operation__step__id=1, type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
+                                                        'subproduction_plan', 'material',
+                                                        'operation__create_by').filter(operation__step__id=1,
+                                                                                       type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
     serializer_class = CuttingListSerializer
     filterset_class = CuttingFilterSet
     ordering_fields = ['id']
@@ -877,7 +869,8 @@ class OperationMaterialOutputViewSet(ListModelMixin, CreateModelMixin, DestroyMo
     产出物料
     """
     perms_map = {'*': '*'}
-    queryset = OperationMaterial.objects.select_related('operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
+    queryset = OperationMaterial.objects.select_related(
+        'operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
     serializer_class = OperationMaterialListSerializer
     filterset_fields = ['operation', 'subproduction_plan']
     ordering_fields = ['id']
@@ -888,7 +881,8 @@ class OperationMaterialOutputViewSet(ListModelMixin, CreateModelMixin, DestroyMo
             return OperationMaterialCreate2Serailizer
         return super().get_serializer_class()
 
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=OperationMaterialCreate2ListSerailizer)
+    @action(methods=['post'], detail=False, perms_map={'post': '*'},
+            serializer_class=OperationMaterialCreate2ListSerailizer)
     def creates(self, request, pk=None):
         """
         批量创建产出物料
@@ -906,12 +900,14 @@ class OperationMaterialOutputViewSet(ListModelMixin, CreateModelMixin, DestroyMo
         instance.delete()
         return Response()
 
+
 class OperationMaterialToolViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, GenericViewSet):
     """
     工具工装
     """
     perms_map = {'*': '*'}
-    queryset = OperationMaterial.objects.select_related('operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL)
+    queryset = OperationMaterial.objects.select_related(
+        'operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL)
     serializer_class = OperationMaterialListSerializer
     filterset_fields = ['operation', 'subproduction_plan']
     ordering_fields = ['id']
@@ -930,9 +926,11 @@ class OperationMaterialToolViewSet(ListModelMixin, CreateModelMixin, DestroyMode
         instance.delete()
         return Response()
 
+
 class DoFormInit(CreateAPIView, GenericAPIView):
     perms_map = {'*': '*'}
     serializer_class = OperationInitSerializer
+
     def post(self, request, format=None):
         """
         调用操作表单
@@ -949,18 +947,22 @@ class DoFormInit(CreateAPIView, GenericAPIView):
         # ret_0['subproduction_plan'] = data['subproduction_plan']
         if 'wproducts' in data and data['wproducts']:
             ret_0['wproducts'] = data['wproducts']
-            splans = WProduct.objects.filter(id__in=data['wproducts']).values_list('subproduction_plan', flat=True)
+            splans = WProduct.objects.filter(id__in=data['wproducts']).values_list(
+                'subproduction_plan', flat=True)
             # 调出所属子计划现有物料
-            ret_0['input'] = WMaterialListSerializer(instance=WMaterial.objects.filter(subproduction_plan__in=splans), many=True).data
+            ret_0['input'] = WMaterialListSerializer(instance=WMaterial.objects.filter(
+                subproduction_plan__in=splans), many=True).data
         else:
             if 'subproduction_plan' in vdata:
                 splans = [vdata['subproduction_plan']]
             else:
                 splans = SubProductionPlan.objects.filter(is_deleted=False,
-                subproduction__usedstep_subproduction__step=vdata['step'], state=3)
+                                                          subproduction__usedstep_subproduction__step=vdata[
+                                                              'step'],
+                                                          state=3)
             ret_0['wproducts'] = []
-            ret_0['input'] = WMaterialListSerializer(instance=WMaterial.objects.filter(subproduction_plan__in=splans), many=True).data
+            ret_0['input'] = WMaterialListSerializer(instance=WMaterial.objects.filter(
-
+                subproduction_plan__in=splans), many=True).data
 
         for i in ret_0['input']:
             i['count_input'] = 0
@@ -974,25 +976,29 @@ class DoFormInit(CreateAPIView, GenericAPIView):
             # 此时显示所有子计划需要输出的物料
             o_objs = SubProductionProgress.objects.filter(
                 subproduction_plan__in=splans, type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
-        ret_0['output'] = list(o_objs.values('subproduction_plan', 'material', 'material__name', 'material__number'))
+        ret_0['output'] = list(o_objs.values(
+            'subproduction_plan', 'material', 'material__name', 'material__number'))
         for i in ret_0['output']:
             i['count_output'] = 0
         ret['forms'] = []
         ret_0['id'] = 0
         ret_0['name'] = '基本信息'
         # 查询工具工装
-        ret_0['tools'] = SubprodctionMaterialListSerializer(instance=
+        ret_0['tools'] = SubprodctionMaterialListSerializer(
-                        SubprodctionMaterial.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL,
+            instance=SubprodctionMaterial.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL,
                                                          subproduction__subplan_subprod__in=splans), many=True).data
         # 查询技术文档
-        ret_0['techdocs'] = TechDocListSerializer(instance = 
+        ret_0['techdocs'] = TechDocListSerializer(
-                TechDoc.objects.filter(subproduction__subplan_subprod__in = splans, enabled=True)\
+            instance=TechDoc.objects.filter(
+                subproduction__subplan_subprod__in=splans, enabled=True)
             .distinct(), many=True).data
 
         ret['forms'].append(ret_0)
-        forms = RecordForm.objects.filter(step=vdata['step'], type=RecordForm.RF_TYPE_DO)
+        forms = RecordForm.objects.filter(
+            step=vdata['step'], type=RecordForm.RF_TYPE_DO)
         if forms.exists():
-            ret['forms'].extend(RecordFormDetailSerializer(instance=forms, many=True).data) 
+            ret['forms'].extend(RecordFormDetailSerializer(
+                instance=forms, many=True).data)
         return Response(ret)
 
 
@@ -1006,7 +1012,8 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
         提交操作表单
         """
         data = request.data
-        serializer = OperationSubmitSerializer(data=data, context={'request':self.request})
+        serializer = OperationSubmitSerializer(
+            data=data, context={'request': self.request})
         serializer.is_valid(raise_exception=True)
         vdata = serializer.validated_data  # 校验之后的数据
 
@@ -1055,7 +1062,8 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
                     # 如果是切割
                     # 获取下一步子工序
                     if vdata['step'].type == Step.STEP_TYPE_DIV:
-                        newstep, _ = WpmServies.get_next_step(i['subproduction_plan'], vdata['step'])
+                        newstep, _ = WpmServies.get_next_step(
+                            i['subproduction_plan'], vdata['step'])
                         wpr = dict(material=ma, step=newstep,
                                    act_state=WProduct.WPR_ACT_STATE_DOWAIT, remark='',
                                    subproduction_plan=i['subproduction_plan'])
@@ -1082,7 +1090,8 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
                 wproducts = vdata['wproducts']
                 if 'suproduction_plan' in vdata:
                     wproducts.update(is_hidden=True)  # 隐藏
-                    newstep, hasNext = WpmServies.get_next_step(i['subproduction_plan'], vdata['step'])
+                    newstep, hasNext = WpmServies.get_next_step(
+                        i['subproduction_plan'], vdata['step'])
                     wproduct = WProduct()
                     wproduct.material = vdata['subproduction_plan'].product
                     wproduct.step = newstep
@@ -1098,7 +1107,8 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
             else:
                 for wproduct in vdata['wproducts']:
                     # 获取下一步子工序
-                    newstep, hasNext = WpmServies.get_next_step(wproduct.subproduction_plan, vdata['step'])
+                    newstep, hasNext = WpmServies.get_next_step(
+                        wproduct.subproduction_plan, vdata['step'])
                     wproduct.step = newstep
                     wproduct.pre_step = vdata['step']
                     if hasNext:
@@ -1127,5 +1137,3 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
                 wrds.append(OperationRecordItem(**m))
             OperationRecordItem.objects.bulk_create(wrds)
         return Response()
-
-