From f56457b75944ef2def631ad5ed07f302123d3f75 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 28 十一月 2025 21:05:41 +0800
Subject: [PATCH] 小数精确到6位
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 2fb0faf..766ec93 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -60,7 +60,6 @@
if (StringUtils.isBlank(waitPakin.getBarcode())) {
throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
}
-// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
@@ -68,18 +67,20 @@
if (!tasks.isEmpty()) {
throw new CoolException("褰撳墠鎵樼洏宸叉湁浠诲姟妗ｅ湪鎵ц锛屼笉鑳藉啀娆＄粍鎵橈紒锛�");
}
- List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakin.getId()));
- waitPakinItems.forEach(item -> {
- for (PakinItem pakinItem : waitPakin.getItems()) {
- WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem.getId());
- if (Objects.isNull(warehouseAreasItems)) {
- throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖烘垨宸茬粍鎵樺畬鎴愮Щ鍑烘敹璐у尯锛侊紒");
+ if (!Objects.isNull(pakin)) {
+ List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(!Objects.isNull(pakin.getId()) ,WaitPakinItem::getPakinId, pakin.getId()));
+ waitPakinItems.forEach(item -> {
+ for (PakinItem pakinItem : waitPakin.getItems()) {
+ WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem.getId());
+ if (Objects.isNull(warehouseAreasItems)) {
+ throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖烘垨宸茬粍鎵樺畬鎴愮Щ鍑烘敹璐у尯锛侊紒");
+ }
+ if (item.getFieldsIndex().equals(warehouseAreasItems.getFieldsIndex())) {
+ throw new CoolException("绁ㄥ彿锛�" + item.getExtendFields().get("crushNo") + "宸茬粍鎵橈紝涓嶅彲閲嶅缁勬墭锛侊紒");
+ }
}
- if (item.getFieldsIndex().equals(warehouseAreasItems.getFieldsIndex())) {
- throw new CoolException("绁ㄥ彿锛�" + item.getExtendFields().get("crushNo") + "宸茬粍鎵橈紝涓嶅彲閲嶅缁勬墭锛侊紒");
- }
- }
- });
+ });
+ }
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
if (!locs.isEmpty()) {
@@ -88,11 +89,6 @@
throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶搴撲綅锛�" + join + "浣跨敤锛侊紒");
}
double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();
- Double waitSum = 0.0;
- if (!waitPakinItems.isEmpty()) {
- waitSum = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
- }
- Double total = Math.round((sum + waitSum) * 100) / 100.0;
WaitPakin waitPakin1 = new WaitPakin();
if (Objects.isNull(pakin)) {
@@ -162,7 +158,13 @@
if (!waitPakinItemService.saveBatch(items)) {
throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
}
-// Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin1.getId()));
+ Double waitSum = 0.0;
+ if (!pakinItems.isEmpty()) {
+ waitSum = pakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+ }
+// Double total = Math.round((sum + waitSum) * 100) / 100.0;
for (WaitPakinItem pakinItem : items) {
WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
@@ -170,8 +172,8 @@
if (Objects.isNull(one)) {
throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
}
- Double workQty = Math.round((one.getWorkQty() + pakinItem.getAnfme()) * 100) / 100.0;
- Double qty = Math.round((workQty + one.getQty()) * 100) / 100.0;
+ Double workQty = Math.round((one.getWorkQty() + pakinItem.getAnfme()) * 1000000) / 1000000.0;
+ Double qty = Math.round((workQty + one.getQty()) * 1000000) / 1000000.0;
one.setWorkQty(workQty);
if (qty.compareTo(one.getAnfme()) > 0) {
throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
@@ -181,7 +183,7 @@
}
}
- waitPakin1.setAnfme(total);
+ waitPakin1.setAnfme(waitSum);
if (!this.updateById(waitPakin1)) {
throw new CoolException("缁勬墭鏁伴噺淇敼澶辫触锛侊紒");
}
@@ -229,12 +231,12 @@
if (item.getReceiptQty().compareTo(0.00) == 0) {
throw new CoolException("瑙ｇ粦鏁伴噺涓嶈兘涓洪浂锛侊紒");
}
- Double reslt = Math.round((pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) * 10000) / 10000.0;
+ Double reslt = Math.round((pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) * 1000000) / 1000000.0;
if (item.getReceiptQty().compareTo(reslt) > 0) {
throw new CoolException("瑙ｇ粦鏁伴噺涓嶈兘澶т簬鍓╀綑鍙墽琛屾暟锛侊紒");
}
- Double anfme = Math.round((pakinItems.get(i1).getAnfme() - item.getReceiptQty()) * 100) / 100.0;
+ Double anfme = Math.round((pakinItems.get(i1).getAnfme() - item.getReceiptQty()) * 1000000) / 1000000.0;
pakinItems.get(i1).setAnfme(anfme);
if (!waitPakinItemService.updateById(pakinItems.get(i1))) {
throw new CoolException("缁勬墭鏄庣粏鏁伴噺淇敼澶辫触锛侊紒");
@@ -246,7 +248,7 @@
}
for (int i = 0; i < warehouseAreasItems.size(); i++) {
if (warehouseAreasItems.get(i).getId().equals(pakinItems.get(i1).getSource())) {
- double v = Math.round((warehouseAreasItems.get(i).getWorkQty() - item.getReceiptQty()) * 100) / 100.0;
+ double v = Math.round((warehouseAreasItems.get(i).getWorkQty() - item.getReceiptQty()) * 1000000) / 1000000.0;
warehouseAreasItems.get(i).setWorkQty(v);
if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
throw new CoolException("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -264,7 +266,7 @@
throw new CoolException("缁勬墭鍒犻櫎澶辫触锛侊紒");
}
} else {
- Double anfme = Math.round((waitPakins.getAnfme() - anfmes) * 100) / 100.0;
+ Double anfme = Math.round((waitPakins.getAnfme() - anfmes) * 1000000) / 1000000.0;
waitPakins.setAnfme(anfme);
if (!waitPakinService.updateById(waitPakins)) {
throw new CoolException("缁勬墭鏁版嵁淇敼澶辫触锛侊紒");
@@ -309,7 +311,7 @@
continue;
}
double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
- Double workQty = Math.round((item.getWorkQty() - sum) * 100) / 100.0;
+ Double workQty = Math.round((item.getWorkQty() - sum) * 1000000) / 1000000.0;
item.setWorkQty(workQty);
if (!warehouseAreasItemService.updateById(item)) {
throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�");
--
Gitblit v1.9.1