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

feat: mlogbdetail 增加返回mlogbdefect

This commit is contained in:
caoqianming 2025-02-28 17:06:50 +08:00
parent 7c7dcee194
commit 6ad6670a90
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/wpm/serializers.py
View File

@ -216,15 +216,6 @@ class MlogbSerializer(CustomModelSerializer):
extra_kwargs = { extra_kwargs = {
'material_out': {'required': True, 'allow_null': False}} 'material_out': {'required': True, 'allow_null': False}}
class MlogbDetailSerializer(CustomModelSerializer):
material_out_name = serializers.StringRelatedField(
source='material_out', read_only=True)
material_in_name = serializers.StringRelatedField(source='material_in', read_only=True)
material_out_tracking = serializers.IntegerField(source="material_out.tracking", read_only=True)
class Meta:
model = Mlogb
fields = '__all__'
class MlogListSerializer(CustomModelSerializer): class MlogListSerializer(CustomModelSerializer):
mstate_json = serializers.JSONField(source='mgroup.process.mstate_json', read_only=True) mstate_json = serializers.JSONField(source='mgroup.process.mstate_json', read_only=True)
@ -270,6 +261,24 @@ class MlogListSerializer(CustomModelSerializer):
model = Mlog model = Mlog
fields = '__all__' fields = '__all__'
class MlogbDefectSerializer(CustomModelSerializer):
defect_name = serializers.CharField(source="defect.name", read_only=True)
class Meta:
model = MlogbDefect
fields = ["id", "defect_name", "count", "mlogb", "defect"]
class MlogbDetailSerializer(CustomModelSerializer):
material_out_name = serializers.StringRelatedField(
source='material_out', read_only=True)
material_in_name = serializers.StringRelatedField(source='material_in', read_only=True)
material_out_tracking = serializers.IntegerField(source="material_out.tracking", read_only=True)
mlogbdefect = MlogbDefectSerializer(many=True, read_only=True)
class Meta:
model = Mlogb
fields = '__all__'
class MlogSerializer(CustomModelSerializer): class MlogSerializer(CustomModelSerializer):
mstate_json = serializers.JSONField(source='mgroup.process.mstate_json', read_only=True) mstate_json = serializers.JSONField(source='mgroup.process.mstate_json', read_only=True)
supplier_name = serializers.CharField(source='supplier.name', read_only=True) supplier_name = serializers.CharField(source='supplier.name', read_only=True)
@ -688,12 +697,6 @@ class MlogbwCreateUpdateSerializer(CustomModelSerializer):
mlogbw = self.save_ftest(mlogbw, ftest_data) mlogbw = self.save_ftest(mlogbw, ftest_data)
return mlogbw return mlogbw
class MlogbDefectSerializer(CustomModelSerializer):
defect_name = serializers.CharField(source="defect.name", read_only=True)
class Meta:
model = MlogbDefect
fields = ["id", "defect_name", "count", "mlogb", "defect"]
class MlogbOutUpdateSerializer(CustomModelSerializer): class MlogbOutUpdateSerializer(CustomModelSerializer):
mlogbdefect = MlogbDefectSerializer(many=True, required=False) mlogbdefect = MlogbDefectSerializer(many=True, required=False)