wukai пре 1 месец
родитељ
комит
959f596fc7

+ 2 - 2
jjt-biz/src/main/java/com/jjt/biz/controller/ApiYrController.java

@@ -46,8 +46,8 @@ public class ApiYrController extends BaseController {
         List<YrProdEfficiencyVO> effList = service.eff();
         for (YrProdEfficiencyVO eff : effList) {
             if (eff.getLine() == 0) {
-                status.setWeight(eff.getWeight());
-                status.setLength(eff.getLength());
+                status.setWeight(eff.getWeight().setScale(0, RoundingMode.HALF_UP));
+                status.setLength(eff.getLength().setScale(0, RoundingMode.HALF_UP));
                 Random random = new Random();
                 BigDecimal baiPi = eff.getLength().multiply(BigDecimal.valueOf(0.5 + random.nextDouble())).setScale(0, RoundingMode.HALF_UP);
                 status.setBaiPei(baiPi);

+ 1 - 1
jjt-biz/src/main/java/com/jjt/biz/vo/YrProdEfficiencyVO.java

@@ -88,7 +88,7 @@ public class YrProdEfficiencyVO {
             this.effA = timeA.divide(BigDecimal.valueOf(12), 4, RoundingMode.HALF_UP);
             this.lengthB = BigDecimal.valueOf(3000 + 3000 * random.nextDouble()).multiply(BigDecimal.valueOf((ldt.getHour() - 12) / 12f)).setScale(2, RoundingMode.HALF_UP);
             this.weightB = lengthB.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2,RoundingMode.HALF_UP);;
-            this.timeB = BigDecimal.valueOf(ldt.getHour() - 12).subtract(BigDecimal.valueOf(ldt.getHour() * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
+            this.timeB = BigDecimal.valueOf(ldt.getHour() - 12).subtract(BigDecimal.valueOf((ldt.getHour()-12) * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
             this.effB = timeB.divide(BigDecimal.valueOf(ldt.getHour() - 12), 4, RoundingMode.HALF_UP);
         } else {
             this.timeA = BigDecimal.valueOf(ldt.getHour()).subtract(BigDecimal.valueOf(ldt.getHour() * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);