From bb3513b191c966dc0f63076a63e837a3c00da3da Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 八月 2023 12:54:44 +0800
Subject: [PATCH] #平库库位初始化
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 230163d..842e968 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -175,11 +175,11 @@
}
Double anfme = orderDetl.getAnfme();
Double workQty = orderDetl.getWorkQty();
- BigDecimal a1 = new BigDecimal(orderDetl.getAnfme());
- BigDecimal b1 = new BigDecimal(orderDetl.getWorkQty());
- BigDecimal c1 = new BigDecimal(combMat.getAnfme());
+ BigDecimal a1 = new BigDecimal(orderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal b1 = new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal c1 = new BigDecimal(combMat.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
double e1 = b1.add(c1).doubleValue();
- BigDecimal f1 = new BigDecimal(e1);
+ BigDecimal f1 = new BigDecimal(e1).setScale(2,BigDecimal.ROUND_HALF_UP);
Double d1 = a1.subtract(f1).doubleValue();
if ( d1 < 0.0) {
throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
@@ -661,16 +661,16 @@
// if (jsonOrderDetl.getAnfme() > manPakOut.getAnfme()) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曠殑鏁伴噺
// return R.error("鍑哄簱鏁伴噺澶т簬鎷ｈ揣鍗曟�绘暟閲�");
// }
- BigDecimal a1 = new BigDecimal(manPakOut.getAnfme());
- BigDecimal b1 = new BigDecimal(manPakOut.getCount());
- Double c1 = a1.subtract(b1).doubleValue();
+ BigDecimal a1 = new BigDecimal(manPakOut.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal b1 = new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ Double c1 = a1.subtract(b1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
if (jsonOrderDetl.getAnfme() > c1) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曞墿浣欏彲鍑虹殑鏁伴噺
return R.error("鍑哄簱鏁伴噺澶т簬鎷ｈ揣鍗曞墿浣欏彲鍑烘暟閲�");
}
- BigDecimal e1 = new BigDecimal(orderDetl.getWorkQty());
- BigDecimal f1 = new BigDecimal(orderDetl.getQty());
- Double g1 = e1.subtract(f1).doubleValue();
+ BigDecimal e1 = new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal f1 = new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ Double g1 = e1.subtract(f1).setScale(2,BigDecimal.ROUND_HALF_UP).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()).subtract(new BigDecimal(jsonOrderDetl.getAnfme())).doubleValue() ;
- Double weight = new BigDecimal(checkManLocDetl.getWeight()).subtract(new BigDecimal(jsonOrderDetl.getWeight())).doubleValue() ;
+ Double finalQty = new BigDecimal(checkManLocDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() ;
+ Double weight = new BigDecimal(checkManLocDetl.getWeight()).setScale(2,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(jsonOrderDetl.getWeight()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() ;
checkManLocDetl.setAnfme(finalQty);
checkManLocDetl.setWeight(weight);
if (weight < 0){
@@ -704,7 +704,7 @@
return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
}
}
- orderDetl.setQty( new BigDecimal(orderDetl.getQty()).add(new BigDecimal(jsonOrderDetl.getAnfme())).doubleValue() );
+ orderDetl.setQty( new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() );
orderDetl.setUpdateTime(date);
orderDetlService.updateById(orderDetl);
//鏇存柊璁㈠崟鐘舵��
@@ -727,7 +727,7 @@
manPakOut.setCount(0.0);
}
- manPakOut.setCount(new BigDecimal(manPakOut.getCount()).add(new BigDecimal(jsonOrderDetl.getAnfme())).doubleValue());
+ manPakOut.setCount(new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
return R.error("鏇存柊鎷ｈ揣鍗曞畬鎴愭暟鐩け璐�");
}
--
Gitblit v1.9.1