fix: 计算优化待完成

apps/enm/tasks.py

@@ -131,7 +131,7 @@ def cal_mpointstats(is_now=1, year=None,  month=None, day=None, hour=None):
         else:
             year, month, day, hour = pre.year, pre.month, pre.day, pre.hour
 
-    mgroups = Mgroup.objects.exclude(product=None)
+    mgroups = Mgroup.objects.exclude(product=None).order_by('sort')  # 必须要进行排序, 因为有的产量是经过计算而得的
     # 先统计自动采集的产量值
     caled_mpointids = []
     for mgroup in mgroups:
@@ -146,7 +146,7 @@ def cal_mpointstats(is_now=1, year=None,  month=None, day=None, hour=None):
             cal_mpointstat_hour(item.id, year, month, day, hour, next_cal)
 
     # 统计其他测点
-    mpoints = Mpoint.objects.filter(is_auto=True).exclude(id__in=caled_mpointids)
+    mpoints = Mpoint.objects.filter(is_auto=True).exclude(id__in=caled_mpointids).order_by('material')
     for i in mpoints:
         cal_mpointstat_hour(i.id, year, month, day, hour, 1)
 
@@ -251,6 +251,7 @@ def compute_enstat(type, sflogId, mgroupId, year_s, month_s, day_s, year, month,
             if material.code == 'elec':
                 enstat.elec_consume = amount_consume
                 enstat.save()
+            print(amount_consume)
             imaterial_data.append({'material': mid, 'material_name': material.name, 'material_type': material.type, 'price_unit': price_unit, 'amount_consume': amount_consume, 'cost': cost, 'cost_unit': cost_unit})
         enstat.imaterial_data = imaterial_data
         enstat.save()