Merge branch 'erp1'

apps/qm/serializers.py

@@ -61,8 +61,7 @@ class QuaStatUpdateSerializer(CustomModelSerializer):
 class FtestWorkCreateUpdateSerializer(CustomModelSerializer):
     class Meta:
         model = FtestWork
-        fields = ['id', 'test_date', 'material', 'batch', 'count']
-
+        fields = ['id', 'test_date', 'material', 'batch', 'count', 'count_sampling', 'count_ok'] 
 
 class FtestWorkSerializer(CustomModelSerializer):
     material_name = serializers.StringRelatedField(

apps/sam/views.py

@@ -66,8 +66,7 @@ class OrderViewSet(CustomModelViewSet):
 
     @transaction.atomic
     def perform_destroy(self, instance):
-        order = instance.order
-        if order.state != Order.ORDER_CREATE:
+        if instance.state != Order.ORDER_CREATE:
             raise ParseError('订单非创建中不可删除')
         instance.delete()