液碱变了

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

@@ -249,42 +249,42 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             this.modModelByDTOWithNotLogin(model);
         } else if (model.getNo().equals("dl_天然气") || model.getNo().equals("dl_蒸汽")) {
             throw new BusinessException("无需填写");
-        } else if (model.getNo().equals("xiaoshou_0300083") || model.getNo().equals("xiaoshou_lhn")) {
+        } else if (model.getNo().equals("ck_0100010_hy")// 每日耗用修改后，需要同步更新
+                || model.getNo().equals("ck_0100026_hy")
+                || model.getNo().equals("ck_0600032_hy")
+                || model.getNo().equals("ck_0100087_hy")
+                || model.getNo().equals("ck_0100074_hy")
+                || model.getNo().equals("ck_0100083_hy")
+                || model.getNo().equals("ck_0100003_hy")
+                || model.getNo().equals("ck_0100065_hy")
+                || model.getNo().equals("ck_0100075_hy")
+                || model.getNo().equals("ck_0100261_hy")
+                || model.getNo().equals("ck_0100086_hy")
+                || model.getNo().equals("ck_0100120_hy")
+                || model.getNo().equals("ck_0100010")// 每日耗用修改后，需要同步更新
+                || model.getNo().equals("ck_0100026")
+                || model.getNo().equals("ck_0600032")
+                || model.getNo().equals("ck_0100087")
+                || model.getNo().equals("ck_0100074")
+                || model.getNo().equals("ck_0100083")
+                || model.getNo().equals("ck_0100003")
+                || model.getNo().equals("ck_0100065")
+                || model.getNo().equals("ck_0100075")
+                || model.getNo().equals("ck_0100261")
+                || model.getNo().equals("ck_0100086")
+                || model.getNo().equals("ck_0100120")
+        ) {
             LocalDate date = model.getDate();
             model.setYear(date.getYear());
             model.setMonth(date.getMonthValue());
             model.setDay(date.getDayOfMonth());
             this.modModelByDTOWithNotLogin(model);
-
-            // 月累积销售
-            ProduceReport monthReport = new ProduceReport();
-            monthReport.setNo(model.getNo() + "_month");
-            monthReport.setDate(model.getDate());
-            monthReport.setYear(model.getYear());
-            monthReport.setMonth(model.getMonth());
-            monthReport = super.getModelListByModel(monthReport).get(0);
-            ProduceReportDTO month = new ProduceReportDTO();
-            month.setDataId(model.getDataId());
-            month.setYear(date.getYear());
-            month.setMonth(date.getMonthValue());
-            month.setDateStart(DateUtils.getFirstDayOfMonth(model.getMonth()).toLocalDate());
-            month.setDateEnd(model.getDate());
-            ProduceReportVO monthVO = this.sumMonthYear(month);
-            monthReport.setValue(monthVO.getTotalValue());
-            this.modModelByDTOWithNotLogin(BeanConverterUtil.copyObjectProperties(monthReport, ProduceReportDTO.class));
-            // 年累积销售
-            ProduceReport yearReport = new ProduceReport();
-            yearReport.setNo(model.getNo() + "_year");
-            yearReport.setDate(model.getDate());
-            yearReport.setYear(model.getYear());
-            yearReport.setMonth(model.getMonth());
-            yearReport = super.getModelListByModel(yearReport).get(0);
-            month.setMonth(null);
-            month.setDateStart(DateUtils.getFirstDayOfThisYear(model.getYear()).toLocalDate());
-            month.setDateEnd(model.getDate());
-            ProduceReportVO yearVO = this.sumMonthYear(month);
-            yearReport.setValue(yearVO.getTotalValue());
-            this.modModelByDTOWithNotLogin(BeanConverterUtil.copyObjectProperties(yearReport, ProduceReportDTO.class));
+            String no = model.getNo();
+            if (!no.endsWith("_hy")) {
+                generateHyAgain(date, "ck_", model.getNo().replace("ck_", "") + "_hy");
+            } else {
+                generateHyAgain(date, "ck_", model.getNo().replace("ck_", ""));
+            }
         } else {
             LocalDate date = model.getDate();
             model.setYear(date.getYear());
@@ -779,7 +779,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
 
         // 更新
         log.info("no: " + no + ", 液位库存: " + reportStock.getValue() + ", 当日入库: " + inStock.getValue() + ", 昨天液位: " + reportStockPre.getValue());
-        report.setValue(new BigDecimal(reportStockPre.getValue()).subtract(new BigDecimal(reportStock.getValue()).add(new BigDecimal(inStock.getValue()))).toString());
+        report.setValue(new BigDecimal(reportStockPre.getValue()).add(new BigDecimal(inStock.getValue())).subtract(new BigDecimal(reportStock.getValue())).toString());
         this.modModelByPrimaryKey(report);
 
         // 重新计算当日单耗和月均单耗
@@ -1270,7 +1270,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         ProduceRecordDTO month = new ProduceRecordDTO();
         month.setProductNo(no);
         month.setDateStart(DateUtils.getFirstDayOfThisYear(date.getYear()));
-        month.setDateEnd(date.atTime(23,59,59));
+        month.setDateEnd(date.atTime(23, 59, 59));
         month.setType(type);
         ProduceRecordVO yearVO = produceRecordService.sumMonthYear(month);
         ProduceData yearData = produceDataService.selectByNo(prefix + no + "_year");
@@ -1286,7 +1286,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
 
         // 月累计
         month.setDateStart(DateUtils.getFirstDayOfMonth(date));
-        month.setDateEnd(date.atTime(23,59,59));
+        month.setDateEnd(date.atTime(23, 59, 59));
         ProduceRecordVO monthVO = produceRecordService.sumMonthYear(month);
         ProduceData monthData = produceDataService.selectByNo(prefix + no + "_month");
         ProduceReport monthReport = BeanConverterUtil.copyObjectProperties(monthData, ProduceReport.class);
@@ -1464,7 +1464,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         ProduceRecordDTO month = new ProduceRecordDTO();
         month.setProductNo(no);
         month.setDateStart(DateUtils.getFirstDayOfThisYear(date.getYear()));
-        month.setDateEnd(date.atTime(23,59,59));
+        month.setDateEnd(date.atTime(23, 59, 59));
         month.setType(ProduceRecordTypeEnum.CL_CK.getValue());
         ProduceRecordVO yearVO = produceRecordService.sumMonthYear(month);
         ProduceData yearData = produceDataService.selectByNo(prefix + no + "_hy" + "_year");
@@ -1484,7 +1484,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
 
         // 月累计
         month.setDateStart(DateUtils.getFirstDayOfMonth(date));
-        month.setDateEnd(date.atTime(23,59,59));
+        month.setDateEnd(date.atTime(23, 59, 59));
         ProduceRecordVO monthVO = produceRecordService.sumMonthYear(month);
         ProduceData monthData = produceDataService.selectByNo(prefix + no + "_hy" + "_month");
         ProduceReport monthReport = BeanConverterUtil.copyObjectProperties(monthData, ProduceReport.class);