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-26 16:57:04 +08:00
parent 52ce49a9f3 9c27ffd7dd
commit e5cd203e04
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/mtm/services.py
View File

@ -124,7 +124,9 @@ def mgroup_run_change(mgroup: Mgroup, new_run: bool, last_timex: datetime):
last_stlog.save() last_stlog.save()
cal_exp_duration_sec(last_stlog.id) # 触发时间分配 cal_exp_duration_sec(last_stlog.id) # 触发时间分配
elif last_stlog.end_time and new_run is False and last_timex > last_stlog.end_time: # 从开到停 elif last_stlog.end_time and new_run is False and last_timex > last_stlog.end_time: # 从开到停
StLog.objects.create(title="停机", is_shutdown=True, mgroup=mgroup, end_time=None, start_time=last_timex, sflog=get_sflog(mgroup, last_timex)) last_stlog2 = StLog.objects.filter(mgroup=mgroup, is_shutdown=True).order_by("-start_time").first()
if not last_stlog2:
StLog.objects.create(title="停机", is_shutdown=True, mgroup=mgroup, end_time=None, start_time=last_timex, sflog=get_sflog(mgroup, last_timex))
elif new_run is False: elif new_run is False:
StLog.objects.create(title="停机", is_shutdown=True, mgroup=mgroup, end_time=None, start_time=last_timex, sflog=get_sflog(mgroup, last_timex)) StLog.objects.create(title="停机", is_shutdown=True, mgroup=mgroup, end_time=None, start_time=last_timex, sflog=get_sflog(mgroup, last_timex))
mgroup.is_running = False mgroup.is_running = False

3
apps/qm/views.py
View File

@ -30,13 +30,12 @@ class NotOkOptionView(APIView):
res2 = {i.value: i.label for i in NotOkOption} res2 = {i.value: i.label for i in NotOkOption}
return Response({"res_list": res1, "res_dict": res2}) return Response({"res_list": res1, "res_dict": res2})
class TestItemViewSet(ListModelMixin, CustomGenericViewSet): class TestItemViewSet(CustomModelViewSet):
""" """
list:质检项目 list:质检项目
质检项目 质检项目
""" """
perms_map = {'get': '*'}
queryset = TestItem.objects.all() queryset = TestItem.objects.all()
serializer_class = TestItemSerializer serializer_class = TestItemSerializer
filterset_class = TestItemFilter filterset_class = TestItemFilter