feat: 获取煤粉热值

apps/qm/tasks.py

@@ -86,7 +86,7 @@ def cal_quastat_sflog(sflogId: str):
     # 班统计
     qs1_v = qs.filter(sflog=sflog).annotate(material_name=F('material__name'), testitem_name=F('testitem__name')).values('material',  'material_name', 'testitem', 'testitem_name', 'val_avg', 'num_test', 'num_ok', 'rate_pass')
     enstat, _ = EnStat.objects.get_or_create(type="sflog", sflog=sflog, 
-                                                defaults={'type': 'sflog', 'sflog': sflog, 'mgroup': mgroup, 'year_s': year_s, 'month_s': month_s, 'day_s': day_s, 'total_production': 0, 'elec_consume': 0})
+                                                defaults={'type': 'sflog', 'sflog': sflog, 'mgroup': mgroup, 'year_s': year_s, 'month_s': month_s, 'day_s': day_s})
     enstat.qua_data = list(qs1_v)
     enstat.save()
 
@@ -116,7 +116,7 @@ ORDER BY mgroup.sort, mtma.sort, qmt.sort
     """
     res2 = query_all_dict(sql_q2)
     enstat, _ = EnStat.objects.get_or_create(type="day_s", mgroup=mgroup, year_s=year_s, month_s=month_s, day_s=day_s,
-                                                defaults={'type': 'day_s', 'mgroup': mgroup, 'year_s': year_s, 'month_s': month_s, 'day_s': day_s, 'total_production': 0, 'elec_consume': 0})
+                                                defaults={'type': 'day_s', 'mgroup': mgroup, 'year_s': year_s, 'month_s': month_s, 'day_s': day_s})
     enstat.qua_data = res2
     enstat.save()
 
@@ -147,7 +147,7 @@ ORDER BY mgroup.sort, mtma.sort, qmt.sort
         """
         res3 = query_all_dict(sql_q3)
         enstat, _ = EnStat.objects.get_or_create(type="month_st", mgroup=mgroup, team=team, year_s=year_s, month_s=month_s,
-                            defaults={'type': 'month_st', 'mgroup': mgroup, 'year_s': year_s, 'month_s': month_s, 'team': team, 'total_production': 0, 'elec_consume': 0})
+                            defaults={'type': 'month_st', 'mgroup': mgroup, 'year_s': year_s, 'month_s': month_s, 'team': team})
         enstat.qua_data = res3
         enstat.save()
 
@@ -177,7 +177,7 @@ ORDER BY mgroup.sort, mtma.sort, qmt.sort
     """
     res4 = query_all_dict(sql_q4)
     enstat, _ = EnStat.objects.get_or_create(type="month_s", mgroup=mgroup, year_s=year_s, month_s=month_s,
-                                                defaults={'type': 'month_s', 'mgroup': mgroup, 'year_s': year_s, 'month_s': month_s, 'total_production': 0, 'elec_consume': 0})
+                                                defaults={'type': 'month_s', 'mgroup': mgroup, 'year_s': year_s, 'month_s': month_s})
     enstat.qua_data = res4
     enstat.save()
 
@@ -206,7 +206,7 @@ ORDER BY mgroup.sort, mtma.sort, qmt.sort
     """
     res5 = query_all_dict(sql_q5)
     enstat, _ = EnStat.objects.get_or_create(type="year_s", mgroup=mgroup, year_s=year_s,
-                                                defaults={'type': 'year_s', 'mgroup': mgroup, 'year_s': year_s, 'total_production': 0, 'elec_consume': 0})
+                                                defaults={'type': 'year_s', 'mgroup': mgroup, 'year_s': year_s})
     enstat.qua_data = res5
     enstat.save()
     

apps/wpm/services.py

@@ -1,6 +1,8 @@
-from apps.wpm.models import SfLog
+from apps.wpm.models import SfLog, StLog, StSfLog
 from apps.mtm.models import Shift, Mgroup
 import datetime
+from django.utils.timezone import localtime
+from django.db.models import Sum
 
 def make_sflogs(mgroup: Mgroup, start_date: datetime.date, end_date: datetime.date):
     for shift in Shift.objects.all():
@@ -17,13 +19,14 @@ def make_sflogs(mgroup: Mgroup, start_date: datetime.date, end_date: datetime.da
                 "shift": shift,
                 "start_time": start_time,
                 "end_time": end_time,
-                "work_hour": round((end_time-start_time).total_seconds/3600)
             })
             current_date = current_date + datetime.timedelta(days=1)
 
-
+def get_pcoal_val(year_s: int, month_s: int, day_s: int):
-def cal_shut_hour():
     """
-    计算班的停机时间
+    获取煤粉热值
     """
-    pass
+    sflog = SfLog.objects.filter(end_time__year=year_s, end_time__month=month_s, end_time__day=day_s).exclude(pcoal_val=None).first()
+    if sflog:
+        return sflog.coal_val
+    return None