夹层接口bug修改

hb_server/apps/pm/signals.py

@@ -13,6 +13,7 @@ def update_subplan_main(sender, instance, created, **kwargs):
             subplan.main_product = instance.material
             subplan.main_count = instance.count
         subplan.main_count_real = instance.count_real
+        subplan.main_count_ok = instance.count_ok
         if instance.count_ok >= instance.count and instance.count_ok > 0:
             subplan.state = SubProductionPlan.SUBPLAN_STATE_DONE
         elif instance.count_ok < instance.count and instance.count_ok > 0:

hb_server/apps/wpm/views.py

@@ -38,7 +38,7 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
     serializer_class = SubProductionPlanListSerializer
     filterset_fields = ['production_plan', 'process', 'state', 'main_product', 'workshop']
     ordering_fields = []
-    ordering = ['-id']
+    ordering = ['-update_time']
 
     @action(methods=['post', 'get'], detail=True, perms_map={'post':'*', 'get':'*'}, serializer_class=PickHalfSerializer)
     @transaction.atomic
@@ -418,8 +418,6 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                     for x in range(i.count):
                         WProduct.objects.create(**wpr)              
         elif step.type == Step.STEP_TYPE_COMB:
-            # 隐藏原半成品
-            ows = OperationWproduct.objects.filter(operation=op)
             if i.subproduction_progress.is_main:
                 newstep, hasNext = WpmServies.get_next_step(i.subproduction_plan, step)
                 wproduct = WProduct()
@@ -438,7 +436,9 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                     instance.count_real = instance.count_real + 1 # 这个地方可能会有问题,不够严谨
                     instance.save()
                 wproduct.save()
-                ows.update(is_hidden=True, child=wproduct)
+                # 隐藏原半成品
+                wps = WProduct.objects.filter(ow_wproduct__operation = op)
+                wps.update(is_hidden=True, child=wproduct)
         op.is_submited = True
         op.save()
         return Response()