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

feat: mlog返回routepack_name2

This commit is contained in:
caoqianming 2024-09-05 14:17:54 +08:00
parent 1243a50463
commit 51a649c864
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/wpm/serializers.py
View File

@ -215,6 +215,7 @@ class MlogbDetailSerializer(CustomModelSerializer):
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)
routepack_name = serializers.CharField(source='route.routepack.name', read_only=True)
belong_dept = serializers.CharField( belong_dept = serializers.CharField(
source='mgroup.belong_dept.id', read_only=True) source='mgroup.belong_dept.id', read_only=True)
belong_dept_name = serializers.CharField( belong_dept_name = serializers.CharField(
@ -458,8 +459,8 @@ class MlogbInSerializer(CustomModelSerializer):
def validate(self, attrs): def validate(self, attrs):
mlog: Mlog = attrs['mlog'] mlog: Mlog = attrs['mlog']
mtask: Mtask = attrs['mtask'] mtask: Mtask = attrs['mtask']
if mtask.submit_time is not None: if mtask.state != Mtask.MTASK_ASSGINED:
raise ValidationError('不可选择已提交的任务') raise ValidationError('该任务非下达中不可选择')
wm_in: WMaterial = attrs['wm_in'] wm_in: WMaterial = attrs['wm_in']
if wm_in.state != WMaterial.WM_OK: if wm_in.state != WMaterial.WM_OK:
raise ValidationError('非合格品不可使用') raise ValidationError('非合格品不可使用')
@ -711,6 +712,8 @@ class FmlogSerializer(CustomModelSerializer):
def validate(self, attrs): def validate(self, attrs):
route: Route = attrs['route'] route: Route = attrs['route']
mtask: Mtask = attrs['mtask'] mtask: Mtask = attrs['mtask']
if mtask.state != Mtask.MTASK_ASSGINED:
raise ParseError('该任务非下达中不可选择')
mgroup: Mgroup = attrs['mgroup'] mgroup: Mgroup = attrs['mgroup']
if route.process != mgroup.process: if route.process != mgroup.process:
raise ParseError('工序不匹配') raise ParseError('工序不匹配')