From 1d0b43d75fc8f38ae319e2df1195b851fb40a741 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 28 Jul 2023 17:18:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20sflog=E5=A2=9E=E5=8A=A0total=5Fhour=5Fn?=
 =?UTF-8?q?ow=E4=BB=A5=E5=8F=8Apcoal=5Fval?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wpm/migrations/0007_auto_20230728_1705.py | 32 +++++++++++++++++++
 apps/wpm/models.py                            |  5 +--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 apps/wpm/migrations/0007_auto_20230728_1705.py

diff --git a/apps/wpm/migrations/0007_auto_20230728_1705.py b/apps/wpm/migrations/0007_auto_20230728_1705.py
new file mode 100644
index 00000000..1749f10d
--- /dev/null
+++ b/apps/wpm/migrations/0007_auto_20230728_1705.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.12 on 2023-07-28 09:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wpm', '0006_stsflog_duration'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sflog',
+            name='work_hour',
+        ),
+        migrations.AddField(
+            model_name='sflog',
+            name='pcoal_val',
+            field=models.FloatField(blank=True, null=True, verbose_name='煤粉热值'),
+        ),
+        migrations.AddField(
+            model_name='sflog',
+            name='total_hour_now',
+            field=models.FloatField(default=0, verbose_name='总时长动'),
+        ),
+        migrations.AlterField(
+            model_name='sflog',
+            name='shut_hour',
+            field=models.FloatField(default=0, verbose_name='停机时长'),
+        ),
+    ]
diff --git a/apps/wpm/models.py b/apps/wpm/models.py
index 868ae2ad..067908bc 100644
--- a/apps/wpm/models.py
+++ b/apps/wpm/models.py
@@ -27,8 +27,9 @@ class SfLog(CommonADModel):
     note = models.TextField('其他备注', null=True, blank=True)
     stlogs = models.ManyToManyField('wpm.stlog', verbose_name='关联停机记录', through='wpm.stsflog')
     last_test_time = models.DateTimeField('最后质检时间', null=True, blank=True)
-    work_hour = models.FloatField('运转时间', default=12)
-    shut_hour = models.FloatField('停机时间', default=0)
+    total_hour_now = models.FloatField('总时长动', default=0)
+    shut_hour = models.FloatField('停机时长', default=0)
+    pcoal_val = models.FloatField('煤粉热值', null=True, blank=True)
 
     @property
     def get_ymd(self):