From a0b27555b7da846a3683b903d30ea8cc6778413b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 19 七月 2023 08:11:16 +0800
Subject: [PATCH] #小数舍弃尾数

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b65b8cf..9c165dc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -663,14 +663,14 @@
 //            }
             BigDecimal a1 = new BigDecimal(manPakOut.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN);
             BigDecimal b1 = new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_DOWN);
-            Double c1 = a1.subtract(b1).doubleValue();
+            Double c1 = a1.subtract(b1).setScale(2,BigDecimal.ROUND_DOWN).doubleValue();
             if (jsonOrderDetl.getAnfme() > c1) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷h揣鍗曞墿浣欏彲鍑虹殑鏁伴噺
                 return R.error("鍑哄簱鏁伴噺澶т簬鎷h揣鍗曞墿浣欏彲鍑烘暟閲�");
             }
 
             BigDecimal e1 = new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_DOWN);
             BigDecimal f1 = new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_DOWN);
-            Double g1 = e1.subtract(f1).doubleValue();
+            Double g1 = e1.subtract(f1).setScale(2,BigDecimal.ROUND_DOWN).doubleValue();
             if ( g1  <jsonOrderDetl.getAnfme() ){
                 return R.error("鍑哄簱鏁伴噺澶т簬鍗曟嵁鍓╀綑鍙嚭鏁伴噺");
             }
@@ -688,8 +688,8 @@
             if(jsonOrderDetl.getWeight() == null){
                 jsonOrderDetl.setWeight(0.0);
             }
-            Double finalQty =  new BigDecimal(checkManLocDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN).subtract(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue() ;
-            Double weight =  new BigDecimal(checkManLocDetl.getWeight()).setScale(2,BigDecimal.ROUND_DOWN).subtract(new BigDecimal(jsonOrderDetl.getWeight()).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue() ;
+            Double finalQty =  new BigDecimal(checkManLocDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN).subtract(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN).doubleValue() ;
+            Double weight =  new BigDecimal(checkManLocDetl.getWeight()).setScale(2,BigDecimal.ROUND_DOWN).subtract(new BigDecimal(jsonOrderDetl.getWeight()).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN).doubleValue() ;
             checkManLocDetl.setAnfme(finalQty);
             checkManLocDetl.setWeight(weight);
             if (weight < 0){
@@ -704,7 +704,7 @@
                     return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
                 }
             }
-            orderDetl.setQty( new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_DOWN).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue() );
+            orderDetl.setQty( new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_DOWN).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN).doubleValue() );
             orderDetl.setUpdateTime(date);
             orderDetlService.updateById(orderDetl);
             //鏇存柊璁㈠崟鐘舵��
@@ -727,7 +727,7 @@
                 manPakOut.setCount(0.0);
             }
 
-            manPakOut.setCount(new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_DOWN).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue());
+            manPakOut.setCount(new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_DOWN).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN).doubleValue());
             if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
                 return R.error("鏇存柊鎷h揣鍗曞畬鎴愭暟鐩け璐�");
             }

--
Gitblit v1.9.1