库存量改成液位的库存量

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

@@ -489,7 +489,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             if (new BigDecimal(dayScl.getValue()).compareTo(new BigDecimal("0")) == 0) {
                 report.setValue(produceRecord.getNum().setScale(2, RoundingMode.HALF_UP).toString());
             } else {
-                BigDecimal hyDayValue = new BigDecimal(produceRecord.getNum().toString()).divide(new BigDecimal(dayScl.getValue()), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3 * 1000)).setScale(2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal hyDayValue = new BigDecimal(produceRecord.getNum().toString()).divide(new BigDecimal(dayScl.getValue()).multiply(new BigDecimal(0.3)), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_UP);
                 report.setValue(hyDayValue.toString());
             }
         }
@@ -512,7 +512,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             if (new BigDecimal(monthScl.getValue()).compareTo(new BigDecimal("0")) == 0) {
                 report.setValue(monthVO.getTotalValue());
             } else {
-                BigDecimal hyDayValue = new BigDecimal(monthVO.getTotalValue()).divide(new BigDecimal(monthScl.getValue()), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3 * 1000)).setScale(2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal hyDayValue = new BigDecimal(monthVO.getTotalValue()).divide(new BigDecimal(monthScl.getValue()).multiply(new BigDecimal(0.3)), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_UP);
                 report.setValue(hyDayValue.toString());
             }
         }
@@ -637,7 +637,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         if ((StringUtils.isBlank(report1.getValue())) || (new BigDecimal(report1.getValue()).compareTo(new BigDecimal(0.0)) == 0)) {
             report3.setValue("0");
         } else {
-            report3.setValue(new BigDecimal(report2.getValue()).divide(new BigDecimal(report1.getValue()), RoundingMode.HALF_UP).divide(new BigDecimal(0.3), RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
+            report3.setValue(new BigDecimal(report2.getValue()).divide(new BigDecimal(report1.getValue()).multiply(new BigDecimal(0.3)), RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
         }
         this.modModelByPrimaryKey(report3);
     }
@@ -727,7 +727,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         if (StringUtils.isBlank(cs077.getValue()) || new BigDecimal(cs077.getValue()).compareTo(new BigDecimal(0)) == 0 || new BigDecimal(cs077.getValue()).compareTo(new BigDecimal(0)) == 0) {
             danhao.setValue("0");
         } else {
-            danhao.setValue(new BigDecimal(report.getValue()).divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).divide(rate, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
+            danhao.setValue(new BigDecimal(report.getValue()).divide(new BigDecimal(cs077.getValue()).multiply(rate), RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
         }
         this.modModelByPrimaryKey(danhao);
 
@@ -764,7 +764,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         if (StringUtils.isBlank(cs077Month.getValue()) || new BigDecimal(cs077Month.getValue()).compareTo(new BigDecimal(0)) == 0) {
             danhaoMonth.setValue("0");
         } else {
-            danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue()), RoundingMode.HALF_UP).divide(rate, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
+            danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue()).multiply(rate), RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
         }
         this.modModelByPrimaryKey(danhaoMonth);
 
@@ -902,7 +902,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             if (StringUtils.isBlank(cs077.getValue()) || new BigDecimal(cs077.getValue()).compareTo(new BigDecimal(0)) == 0 || new BigDecimal(cs077.getValue()).compareTo(new BigDecimal(0)) == 0) {
                 danhao.setValue("0");
             } else {
-                danhao.setValue(yeweiStock.divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).divide(rate, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
+                danhao.setValue(yeweiStock.divide(new BigDecimal(cs077.getValue()).multiply(rate), RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
             }
             this.modModelByPrimaryKey(danhao);
 
@@ -939,7 +939,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             if (StringUtils.isBlank(cs077Month.getValue()) || new BigDecimal(cs077Month.getValue()).compareTo(new BigDecimal(0)) == 0) {
                 danhaoMonth.setValue("0");
             } else {
-                danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue()), RoundingMode.HALF_UP).divide(rate, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
+                danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue()).multiply(rate), RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
             }
             this.modModelByPrimaryKey(danhaoMonth);
         } else {
@@ -1386,7 +1386,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         if (new BigDecimal("0").compareTo(new BigDecimal(dayScl.getValue())) == 0) {
             dayHy.setValue("0");
         } else {
-            BigDecimal hyDayValue = total.divide(new BigDecimal(dayScl.getValue()), 2).multiply(new BigDecimal(0.3)).setScale(2, RoundingMode.HALF_UP);
+            BigDecimal hyDayValue = total.divide(new BigDecimal(dayScl.getValue()).multiply(new BigDecimal(0.3)), 2).setScale(2, RoundingMode.HALF_UP);
             dayHy.setValue(hyDayValue.toString());
         }
         dayHy.setYear(date.getYear());
@@ -1404,7 +1404,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         if (new BigDecimal("0").compareTo(monthVO.getTotalValue()) == 0 || new BigDecimal(monthScl.getValue()).compareTo(new BigDecimal(0)) <= 0) {
             monthHy.setValue("0");
         } else {
-            BigDecimal hyMonthValue = (monthVO.getTotalValue().divide(new BigDecimal(monthScl.getValue()), RoundingMode.HALF_UP).multiply(new BigDecimal(0.3))).setScale(2, RoundingMode.HALF_UP);
+            BigDecimal hyMonthValue = (monthVO.getTotalValue().divide(new BigDecimal(monthScl.getValue()).multiply(new BigDecimal(0.3)), RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP);
             monthHy.setValue(hyMonthValue.toString());
         }
         monthHy.setYear(date.getYear());