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

fix: 一些调整

This commit is contained in:
caoqianming 2024-05-10 13:52:34 +08:00
parent 295a971000
commit 0e273a35c6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/enm/tasks.py
View File

@ -209,10 +209,11 @@ def cal_mpointstats(is_now=1, year=None, month=None, day=None, hour=None, m_code
year, month, day, hour = pre.year, pre.month, pre.day, pre.hour
if m_code_list:
mpoints1 = Mpoint.objects.filter(code__in=m_code_list)
mpoints_related = Mpoint.objects.none()
for item in mpoints1:
cal_mpointstat_hour(item.id, year, month, day, hour)
mpoints_related = mpoints_related | Mpoint.objects.filter(type=Mpoint.MT_COMPUTE, enabled=True, material__isnull=False, formula__contains='{' + item.code + '}')
mpoints_related = Mpoint.objects.none()
for code in m_code_list:
mpoints_related = mpoints_related | Mpoint.objects.filter(type=Mpoint.MT_COMPUTE, enabled=True, material__isnull=False, formula__contains='{' + code + '}')
mpoints_related = mpoints_related.order_by('report_sortstr', 'create_time')
for item in mpoints_related:
cal_mpointstat_hour(item.id, year, month, day, hour)