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

feat: mlog submit revert支持放置到车间

This commit is contained in:
caoqianming 2025-08-19 11:22:21 +08:00
parent d9326bc264
commit d019e708cd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/wpm/services.py
View File

@ -269,8 +269,8 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
mlogb_out_qs = Mlogb.objects.filter(mlog=mlog, material_out__isnull=False)
stored_mgroup = into_wm_mgroup
stored_notok = need_store_notok
stored_mgroup = need_store_notok
if mlogb_out_qs.exists():
mlogb_out_qs = mlogb_out_qs.filter(need_inout=True)
m_outs_list = [(mo.material_out, mo.batch if mo.batch else mlog.batch, mo.count_ok_full if mo.count_ok_full is not None else mo.count_ok, mlog.count_real_eweight, None, mo) for mo in mlogb_out_qs.all()]
@ -334,7 +334,6 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
lookup['notok_sign'] = notok_sign_or_defect
if into_wm_mgroup:
lookup['mgroup'] = mgroup
stored_mgroup = True
else:
lookup['belong_dept'] = belong_dept
@ -568,7 +567,11 @@ def mlog_revert(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
material, batch, count, defect, mi_ = item
if count <= 0:
raise ParseError('存在非正数!')
lookup = {'batch': batch, 'material': material, 'mgroup': mgroup, 'defect': defect, 'state': WMaterial.WM_NOTOK}
lookup = {'batch': batch, 'material': material, 'mgroup': None, 'defect': defect, 'state': WMaterial.WM_NOTOK}
if stored_mgroup:
lookup['mgroup'] = mgroup
else:
lookup['belong_dept'] = belong_dept
wm, is_create = WMaterial.objects.get_or_create(**lookup, defaults={**lookup, "belong_dept": belong_dept})
wm.count = wm.count - count
if wm.count < 0:

2
apps/wpm/views.py
View File

@ -396,7 +396,7 @@ class MlogViewSet(CustomModelViewSet):
"work_start_time": vdata["work_start_time"],
"handle_date": vdata["handle_date"],
"handle_user": vdata["handle_user"],
"is_fix": vdata["is_fix"]}
"is_fix": vdata["is_fix"], "create_by": request.user}
if "work_end_time" in vdata:
mloginit_data["work_end_time"] = vdata["work_end_time"]
if "route" in vdata: