Эх сурвалжийг харах

修改电量计算BUG,修改周重量为长度

wukai 6 сар өмнө
parent
commit
2d858719ae

+ 5 - 5
ruoyi-admin/src/main/java/com/ruoyi/biz/domain/TwinCalcDay.java

@@ -320,13 +320,13 @@ public class TwinCalcDay extends BaseEntity {
      */
     public void calcDays(List<TwinCalcDay> days) {
         days.forEach(day -> {
-            this.weight = weight.add(day.getWeight());
-            this.weightA = weightA.add(day.getWeightA());
-            this.weightB = weightB.add(day.getWeightB());
+            this.weight = weight.add(day.getLength());
+            this.weightA = weightA.add(day.getLengthA());
+            this.weightB = weightB.add(day.getLengthB());
 
             this.kwh = kwh.add(day.getKwh());
-            this.kwhA = kwhA.add(day.getKwh());
-            this.kwhB = kwhB.add(day.getKwh());
+            this.kwhA = kwhA.add(day.getKwhA());
+            this.kwhB = kwhB.add(day.getKwhB());
 
             this.stop1A += day.getStop1A();
             this.stop1B += day.getStop1B();

+ 2 - 1
ruoyi-admin/src/main/resources/my-application.yml

@@ -12,7 +12,8 @@ excel:
   formula: D:\twin\service\formula.xlsx
   gram: D:\twin\service\gram.xlsx
   stops: D:\twin\service\stops.xlsx
-  stopsType: D:\twin\service\stopsType.xlsx
+  stopsType: D:\twin\service\stopsType.
+  stopDetail: D:\twin\service\stopDetail.xlsx
   alarms: D:\twin\service\alarms.xlsx
   yarn: D:\twin\service\yarn.xlsx
   brokenYarn: D:\twin\service\brokenYarn.xlsx