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

feat: mlog/mlogb 列表返回 wm_in 状态及缺陷标识 

MlogbDetailSerializer 增加 wm_in_state；MlogListSerializer 与 MlogSerializer 增加 wm_in_defect / wm_in_defect_name / wm_in_state；MlogViewSet 在 select_related 中追加 wm_in__defect。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
caoqianming 2026-04-30 14:03:53 +08:00
parent 40ebf720f7
commit 7e9b559723
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/wpm/serializers.py
View File

@ -301,6 +301,9 @@ class MlogListSerializer(CustomModelSerializer):
handle_users_ = UserSimpleSerializer( handle_users_ = UserSimpleSerializer(
source='handle_users', many=True, read_only=True) source='handle_users', many=True, read_only=True)
wm_in_defect = serializers.PrimaryKeyRelatedField(source='wm_in.defect', read_only=True)
wm_in_defect_name = serializers.CharField(source='wm_in.defect.name', read_only=True)
wm_in_state = serializers.IntegerField(source='wm_in.state', read_only=True)
class Meta: class Meta:
model = Mlog model = Mlog
@ -317,6 +320,7 @@ class MlogbDetailSerializer(CustomModelSerializer):
test_user_name = serializers.CharField(source='test_user.name', read_only=True) test_user_name = serializers.CharField(source='test_user.name', read_only=True)
wm_in_defect = serializers.PrimaryKeyRelatedField(source='wm_in.defect', read_only=True) wm_in_defect = serializers.PrimaryKeyRelatedField(source='wm_in.defect', read_only=True)
wm_in_defect_name = serializers.CharField(source='wm_in.defect.name', read_only=True) wm_in_defect_name = serializers.CharField(source='wm_in.defect.name', read_only=True)
wm_in_state = serializers.IntegerField(source='wm_in.state', read_only=True)
class Meta: class Meta:
model = Mlogb model = Mlogb
@ -370,6 +374,9 @@ class MlogSerializer(CustomModelSerializer):
mlogdefect = MlogbDefectSerializer(many=True, required=False) mlogdefect = MlogbDefectSerializer(many=True, required=False)
mlogindefect = MlogbDefectSerializer(many=True, label="前道不良", required=False) mlogindefect = MlogbDefectSerializer(many=True, label="前道不良", required=False)
wm_in_defect = serializers.PrimaryKeyRelatedField(source='wm_in.defect', read_only=True)
wm_in_defect_name = serializers.CharField(source='wm_in.defect.name', read_only=True)
wm_in_state = serializers.IntegerField(source='wm_in.state', read_only=True)
class Meta: class Meta:
model = Mlog model = Mlog
fields = '__all__' fields = '__all__'

1
apps/wpm/views.py
View File

@ -274,6 +274,7 @@ class MlogViewSet(CustomModelViewSet):
"material_out__process", "material_out__process",
"mgroup__process", "mgroup__process",
"submit_user", "submit_user",
"wm_in__defect",
] ]
# select_related_fields = ['create_by', 'update_by', 'mtask', 'mtaskb', 'mgroup', # select_related_fields = ['create_by', 'update_by', 'mtask', 'mtaskb', 'mgroup',
# 'handle_user', 'handle_user_2', 'equipment', 'mgroup__belong_dept', # 'handle_user', 'handle_user_2', 'equipment', 'mgroup__belong_dept',