From 37cb1bd2fd1966f2887e8e34e5cdd1c2f8a67f9a Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 06 五月 2025 17:07:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java |   61 ++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
index 15a84a7..db5df22 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
@@ -35,13 +35,21 @@
      */
 	private String clock;
     /**
-     * 蒸汽发生
+     * 蒸汽发生/总产生
      */
 	private BigDecimal steamP;
     /**
-     * 蒸汽消耗
+     * 吨焦产蒸汽
+     */
+	private BigDecimal djSteamP;
+    /**
+     * 蒸汽消耗/总耗
      */
 	private BigDecimal steamC;
+    /**
+     * 蒸汽单耗
+     */
+	private BigDecimal steamOnlyC;
     /**
      * 蒸汽量
      */
@@ -55,15 +63,23 @@
      */
 	private BigDecimal gasC;
     /**
-     * 电力消耗
+     * 电力消耗/总耗
      */
 	private BigDecimal powerC;
+    /**
+     * 电力单耗
+     */
+	private BigDecimal powerOnlyC;
+    /**
+     * 电耗基准
+     */
+    private BigDecimal powerCStandard;
     /**
      * 空转时间
      */
 	private BigDecimal idleTime;
     /**
-     * BFG消耗
+     * BFG消耗/总耗
      */
     private BigDecimal bfgC;
     /**
@@ -71,7 +87,7 @@
      */
     private BigDecimal cogP;
     /**
-     * COG消耗
+     * COG消耗/总耗
      */
     private BigDecimal cogC;
 
@@ -84,4 +100,39 @@
      * cog单耗
      */
     private BigDecimal cogOnlyC;
+
+    /**
+     * 干熄炉数
+     */
+    private BigDecimal gxls;
+
+    /**
+     * 峰时占比
+     */
+    private BigDecimal fsRatio;
+
+    /**
+     * 谷时占比
+     */
+    private BigDecimal gsRatio;
+
+    /**
+     * 平时占比
+     */
+    private BigDecimal psRatio;
+
+    /**
+     * 峰时占比-月累计
+     */
+    private BigDecimal fsRatioMonth;
+
+    /**
+     * 谷时占比-月累计
+     */
+    private BigDecimal gsRatioMonth;
+
+    /**
+     * 平时占比-月累计
+     */
+    private BigDecimal psRatioMonth;
 }
\ No newline at end of file

--
Gitblit v1.9.3