单耗通过液位更新

platform-service/src/main/java/com/platform/service/produce/impl/ProduceReportServiceImpl.java

@@ -125,7 +125,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
                 weekendCriteria2.andEqualTo(ProduceReport::getDataId, produceData.getId())
                         .andEqualTo(ProduceReport::getYear, date.getYear())
                         .andEqualTo(ProduceReport::getMonth, date.getMonthValue()).andEqualTo(ProduceReport::getDay, i);
-                ProduceReport monthReport = mapper.selectOneByExample(weekendCriteria2);
+                ProduceReport monthReport = mapper.selectOneByExample(weekend2);
                 if (monthReport == null) {
                     monthReport = BeanConverterUtil.copyObjectProperties(model, ProduceReport.class);
                     monthReport.setDay(i);
@@ -561,14 +561,14 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
 
         // 计算耗用
         generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_903_HY.name());// 903
-        generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_905_HY.name());// 905
-        generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_907_HY.name());// 907
-        generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_F160C_HY.name());// F160C
-        generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_CM47B_HY.name());// CM47B
-        generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_QFS_HY.name());// 氢氟酸
-        generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_LXL_HY.name());// 硫酰氯
-        generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_YJ_HY.name());// 液碱
-        generateYeweiReport(date, "ck_", "0100087_hy", SysConfigEnum.PRODUCE_YEWEI_YS_HY.name());// 盐酸
+        generateYeweiReport(date, "ck_", "0100083_hy", SysConfigEnum.PRODUCE_YEWEI_905_HY.name());// 905
+        generateYeweiReport(date, "ck_", "0100003_hy", SysConfigEnum.PRODUCE_YEWEI_907_HY.name());// 907
+        generateYeweiReport(date, "ck_", "0100026_hy", SysConfigEnum.PRODUCE_YEWEI_F160C_HY.name());// F160C
+        generateYeweiReport(date, "ck_", "0100010_hy", SysConfigEnum.PRODUCE_YEWEI_CM47B_HY.name());// CM47B
+        generateYeweiReport(date, "ck_", "0100065_hy", SysConfigEnum.PRODUCE_YEWEI_QFS_HY.name());// 氢氟酸
+        generateYeweiReport(date, "ck_", "0100120_hy", SysConfigEnum.PRODUCE_YEWEI_LXL_HY.name());// 硫酰氯
+        generateYeweiReport(date, "ck_", "0100160_hy", SysConfigEnum.PRODUCE_YEWEI_YJ_HY.name());// 液碱
+        generateYeweiReport(date, "ck_", "0100086_hy", SysConfigEnum.PRODUCE_YEWEI_YS_HY.name());// 盐酸
     }
 
     /**
@@ -588,6 +588,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         // 找到对应填报数据
         ProduceData produceData = produceDataService.selectByNo(prefix + no);
         String value = ConfigCache.getLabelByValueAllowNull(configName);
+        log.info(configName);
         List<String> list = Arrays.asList(value.split(";"));
 
         BigDecimal total = new BigDecimal(0);
@@ -649,7 +650,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         weekendCriteria2.andEqualTo(ProduceReport::getDataId, produceData.getId())
                 .andEqualTo(ProduceReport::getYear, date.getYear())
                 .andEqualTo(ProduceReport::getMonth, date.getMonthValue()).andEqualTo(ProduceReport::getDate, date);
-        ProduceReport report = mapper.selectOneByExample(weekendCriteria2);
+        ProduceReport report = mapper.selectOneByExample(weekend2);
         if (report != null) {
             ProduceReportDTO dto = BeanConverterUtil.copyObjectProperties(report, ProduceReportDTO.class);
             // 数据除以1000，换算成吨