From a589fec67eee8ef2abb089535f4944eb3d19d713 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 31 Jul 2024 16:53:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20enstat2=E6=B7=BB=E5=8A=A0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enm/migrations/0039_auto_20240731_1652.py | 48 +++++++++++++++++++
 apps/enm/models.py                            | 11 +++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 apps/enm/migrations/0039_auto_20240731_1652.py

diff --git a/apps/enm/migrations/0039_auto_20240731_1652.py b/apps/enm/migrations/0039_auto_20240731_1652.py
new file mode 100644
index 00000000..3ae5eb74
--- /dev/null
+++ b/apps/enm/migrations/0039_auto_20240731_1652.py
@@ -0,0 +1,48 @@
+# Generated by Django 3.2.12 on 2024-07-31 08:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enm', '0038_auto_20240521_1532'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enstat2',
+            name='bulk_clinker_price',
+            field=models.FloatField(default=0, verbose_name='散装熟料价格'),
+        ),
+        migrations.AddField(
+            model_name='enstat2',
+            name='bulk_clinker_val',
+            field=models.FloatField(default=0, verbose_name='散装熟料出厂量'),
+        ),
+        migrations.AddField(
+            model_name='enstat2',
+            name='out_cement_val',
+            field=models.FloatField(default=0, verbose_name='出厂水泥产量'),
+        ),
+        migrations.AlterField(
+            model_name='enstat2',
+            name='cement_cost_unit',
+            field=models.FloatField(default=0, verbose_name='出磨水泥单位成本'),
+        ),
+        migrations.AlterField(
+            model_name='enstat2',
+            name='cement_val',
+            field=models.FloatField(default=0, verbose_name='出磨水泥产量'),
+        ),
+        migrations.AlterField(
+            model_name='enstat2',
+            name='clinker_price',
+            field=models.FloatField(default=0, verbose_name='出窑熟料价格'),
+        ),
+        migrations.AlterField(
+            model_name='enstat2',
+            name='clinker_val',
+            field=models.FloatField(default=0, verbose_name='出窑熟料产量'),
+        ),
+    ]
diff --git a/apps/enm/models.py b/apps/enm/models.py
index dcad6c46..883b8e9c 100644
--- a/apps/enm/models.py
+++ b/apps/enm/models.py
@@ -165,10 +165,13 @@ class EnStat2(BaseModel):
     bulk_cement_price = models.FloatField("散装水泥价格", default=0)
     bag_cement_val = models.FloatField("袋装水泥发运量", default=0)
     bag_cement_price = models.FloatField("袋装水泥价格", default=0)
-    clinker_val = models.FloatField("散装熟料发运量", default=0)
-    clinker_price = models.FloatField("散装熟料价格", default=0)
-    cement_val = models.FloatField("水泥产量", default=0)
-    cement_cost_unit = models.FloatField("水泥单位成本", default=0)
+    clinker_val = models.FloatField("出窑熟料产量", default=0)
+    clinker_price = models.FloatField("出窑熟料价格", default=0)
+    bulk_clinker_val = models.FloatField("散装熟料出厂量", default=0)
+    bulk_clinker_price = models.FloatField("散装熟料价格", default=0)
+    cement_val = models.FloatField("出磨水泥产量", default=0)
+    cement_cost_unit = models.FloatField("出磨水泥单位成本", default=0)
+    out_cement_val = models.FloatField("出厂水泥产量", default=0)
     en_consume = models.FloatField("能源消耗", default=0, help_text="tce")
     en_consume_unit = models.FloatField("单位工业总产值能耗", default=0)
     en_add_consume_unit = models.FloatField("单位工业增加值能耗", default=0)