zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'erp1'

This commit is contained in:
caoqianming 2024-07-24 13:50:22 +08:00
parent e3f32932d8 b98227b032
commit da2e880d66
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/qm/serializers.py
View File

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

3
apps/sam/views.py
View File

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