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

库存量改成液位的库存量

hfxc226 2 өдөр өмнө
parent
commit
ac66031378

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

@@ -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)) {
         if ((StringUtils.isBlank(report1.getValue())) || (new BigDecimal(report1.getValue()).compareTo(new BigDecimal(0.0)) == 0)) {
             report3.setValue("0");
             report3.setValue("0");
         } else {
         } else {
-            report3.setValue(new BigDecimal(report2.getValue()).divide(new BigDecimal(report1.getValue()), RoundingMode.HALF_UP).multiply(new BigDecimal(0.3)).setScale(2, RoundingMode.HALF_UP).toString());
+            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());
         }
         }
         this.modModelByPrimaryKey(report3);
         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) {
         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");
             danhao.setValue("0");
         } else {
         } else {
-            danhao.setValue(new BigDecimal(report.getValue()).divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).multiply(rate).setScale(2, RoundingMode.HALF_UP).toString());
+            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());
         }
         }
         this.modModelByPrimaryKey(danhao);
         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) {
         if (StringUtils.isBlank(cs077Month.getValue()) || new BigDecimal(cs077Month.getValue()).compareTo(new BigDecimal(0)) == 0) {
             danhaoMonth.setValue("0");
             danhaoMonth.setValue("0");
         } else {
         } else {
-            danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue()), RoundingMode.HALF_UP).multiply(rate).setScale(2, RoundingMode.HALF_UP).toString());
+            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());
         }
         }
         this.modModelByPrimaryKey(danhaoMonth);
         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) {
             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");
                 danhao.setValue("0");
             } else {
             } else {
-                danhao.setValue(yeweiStock.divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).multiply(rate).setScale(2, RoundingMode.HALF_UP).toString());
+                danhao.setValue(yeweiStock.divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).divide(rate, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP).toString());
             }
             }
             this.modModelByPrimaryKey(danhao);
             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) {
             if (StringUtils.isBlank(cs077Month.getValue()) || new BigDecimal(cs077Month.getValue()).compareTo(new BigDecimal(0)) == 0) {
                 danhaoMonth.setValue("0");
                 danhaoMonth.setValue("0");
             } else {
             } else {
-                danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue()), RoundingMode.HALF_UP).multiply(rate).setScale(2, RoundingMode.HALF_UP).toString());
+                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());
             }
             }
             this.modModelByPrimaryKey(danhaoMonth);
             this.modModelByPrimaryKey(danhaoMonth);
         } else {
         } else {