From 8ac3795a9e96689edb1fc8dc87313c9c0a07f48a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 13:21:57 +0800
Subject: [PATCH] Double类型计算优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java    |    2 +-
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java        |    4 ++--
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java |    3 ++-
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java    |   15 ++++++++++-----
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java   |   15 ++++++++++-----
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java              |    3 ++-
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java          |   10 ++++++----
 7 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index e40184c..9e39313 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -237,7 +237,7 @@
             throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
         }
         //TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
-        Double rcptedQty = asnOrder.getQty() + receiptQty;
+        Double rcptedQty = Math.round((asnOrder.getQty() + receiptQty) * 10000) / 10000.0;
 
         asnOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
         if (!asnOrderMapper.updateById(asnOrder)) {
@@ -288,7 +288,7 @@
                 throw new CoolException("璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛侊紒");
             }
 
-            Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
+            Double itemRcptQty = Math.round((dto.getReceiptQty() + orderItem.getQty()) * 10000) / 10000.0;
             Boolean allowOver = false;
             if (!Objects.isNull(config)) {
                 if (Boolean.parseBoolean(config.getVal())) {
@@ -401,7 +401,8 @@
 
         if (!Objects.isNull(serviceOne)) {
             item.setId(serviceOne.getId());
-            item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+            Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 10000) / 10000.0;
+            item.setAnfme(anfme);
         }
 
         //鏈川妫�
@@ -1094,7 +1095,8 @@
             if (Objects.isNull(stockItem)) {
                 detlsDto.setStockQty(0.0);
             } else {
-                detlsDto.setStockQty(stockItem.getAnfme() + stockItem.getWorkQty());
+                Double anfme = Math.round((stockItem.getAnfme() + stockItem.getWorkQty()) * 10000) / 10000.0;
+                detlsDto.setStockQty(anfme);
             }
 
             if (!Objects.isNull(asnOrderItem.getPoDetlId())) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index 3d68cc5..281a3ac 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -190,7 +190,8 @@
         WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);
         if (!Objects.isNull(serviceOne)) {
             item.setId(serviceOne.getId());
-            item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+            Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 10000) / 10000.0;
+            item.setAnfme(anfme);
         }
         //鏈川妫�
         if (!warehouseAreasItemService.saveOrUpdate(item)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 10e29b7..576f97b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -290,7 +290,7 @@
             }
 
             PurchaseItem service = purchaseItemService.getById(item.getId());
-            Double qty = service.getQty() + item.getAnfme();
+            Double qty = Math.round((service.getQty() + item.getAnfme()) * 10000) / 10000.0;
             if (qty.compareTo(service.getAnfme()) > 0) {
                 throw new CoolException("鏂板缓鍗曟嵁鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
             }
@@ -316,7 +316,9 @@
             if (Objects.isNull(purchaseItem)) {
                 throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
             }
-            purchaseItem.setQty(purchaseItem.getQty() +  item.getAnfme());
+
+            Double toQty = Math.round((purchaseItem.getQty() + item.getAnfme()) * 10000) / 10000.0;
+            purchaseItem.setQty(toQty);
             if (!purchaseItemService.updateById(purchaseItem)) {
                 throw new CoolException("PO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
             }
@@ -328,7 +330,8 @@
             throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
         }
         //浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
-        purchase.setQty(sum + purchase.getQty())
+        Double qty = Math.round((sum + purchase.getQty()) * 10000) / 10000.0;
+        purchase.setQty(qty)
                 .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
 
         if (!purchaseService.saveOrUpdate(purchase)) {
@@ -361,7 +364,8 @@
             list.forEach(item -> {
                 PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
                 if (!Objects.isNull(purchaseItem)) {
-                    purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme());
+                    Double minusQty = Math.round((purchaseItem.getQty() - item.getAnfme()) * 10000) / 10000.0;
+                    purchaseItem.setQty(minusQty);
                     if (!purchaseItemService.updateById(purchaseItem)) {
                         throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
                     }
@@ -373,7 +377,8 @@
             Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
                     .eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
             if (!Objects.isNull(purchase)) {
-                purchase.setQty(purchase.getQty() - sum)
+                Double qty = Math.round((purchase.getQty() - sum) * 10000) / 10000.0;
+                purchase.setQty(qty)
                         .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
 
                 if (!purchaseService.updateById(purchase)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 657ab2d..0b6967a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -366,7 +366,7 @@
                         p1.getUnit(),
                         p1.getTrackCode(),
                         p1.getFieldsIndex(),
-                        p1.getAnfme() + p2.getAnfme(),
+                        Math.round((p1.getAnfme() + p2.getAnfme()) * 10000) / 10000.0,
                         p1.getWorkQty(),
                         p1.getTenantId(),
                         p1.getStatus(),
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index 8970a59..8eca471 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -190,7 +190,8 @@
                 }
             }
         } else {
-            orderItem.setAnfme(orderItem.getAnfme() - sum);
+            Double anfme = Math.round((orderItem.getAnfme() - sum) * 10000) / 10000.0;
+            orderItem.setAnfme(anfme);
             if (!warehouseAreasItemService.updateById(orderItem)) {
                 throw new CoolException("鏀惰揣鍖哄簱瀛樻槑缁嗘洿鏂板け璐ワ紒锛�");
             }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 9c2cab2..c670bbc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -966,8 +966,8 @@
         if (Objects.isNull(itemServiceOne)) {
             throw new CoolException("鏁版嵁閿欒锛氳鏌ョ湅璇疯揣鍖哄簱瀛樻槸鍚﹀瓨鍦紒锛�");
         }
-        Double workQty = itemServiceOne.getWorkQty() - pakinItem.getAnfme();
-        Double qty = itemServiceOne.getQty() + pakinItem.getAnfme();
+        Double workQty = Math.round((itemServiceOne.getWorkQty() - pakinItem.getAnfme()) * 10000) / 10000.0;
+        Double qty = Math.round((itemServiceOne.getQty() + pakinItem.getAnfme()) * 10000) / 10000.0;
         itemServiceOne.setWorkQty(workQty).setQty(qty);
 
         if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
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 e854ebf..faa792f 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
@@ -220,10 +220,13 @@
                             if (item.getReceiptQty().compareTo(0.00) == 0) {
                                 throw new CoolException("瑙g粦鏁伴噺涓嶈兘涓洪浂锛侊紒");
                             }
-                            if (item.getReceiptQty().compareTo(pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) > 0) {
+                            Double reslt = Math.round((pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) * 10000) / 10000.0;
+                            if (item.getReceiptQty().compareTo(reslt) > 0) {
                                 throw new CoolException("瑙g粦鏁伴噺涓嶈兘澶т簬鍓╀綑鍙墽琛屾暟锛侊紒");
                             }
-                           pakinItems.get(i1).setAnfme(pakinItems.get(i1).getAnfme() - item.getReceiptQty());
+
+                            Double anfme = Math.round((pakinItems.get(i1).getAnfme() - item.getReceiptQty()) * 10000) / 10000.0;
+                           pakinItems.get(i1).setAnfme(anfme);
                            if (!waitPakinItemService.updateById(pakinItems.get(i1))) {
                                throw new CoolException("缁勬墭鏄庣粏鏁伴噺淇敼澶辫触锛侊紒");
                            }
@@ -234,7 +237,7 @@
                         }
                         for (int i = 0; i < warehouseAreasItems.size(); i++) {
                             if (warehouseAreasItems.get(i).getId().equals(pakinItems.get(i1).getSource())) {
-                                double v = warehouseAreasItems.get(i).getWorkQty() - item.getReceiptQty();
+                                double v = Math.round((warehouseAreasItems.get(i).getWorkQty() - item.getReceiptQty()) * 10000) / 10000.0;
                                 warehouseAreasItems.get(i).setWorkQty(v);
                                 if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
                                     throw new CoolException("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -252,7 +255,8 @@
                     throw new CoolException("缁勬墭鍒犻櫎澶辫触锛侊紒");
                 }
             } else {
-                waitPakins.setAnfme(waitPakins.getAnfme() - anfmes);
+                Double anfme = Math.round((waitPakins.getAnfme() - anfmes) * 10000) / 10000.0;
+                waitPakins.setAnfme(anfme);
                 if (!waitPakinService.updateById(waitPakins)) {
                     throw new CoolException("缁勬墭鏁版嵁淇敼澶辫触锛侊紒");
                 }
@@ -296,7 +300,8 @@
                     continue;
                 }
                 double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
-                item.setWorkQty(item.getWorkQty() - sum);
+                Double workQty = Math.round((item.getWorkQty() - sum) * 10000) / 10000.0;
+                item.setWorkQty(workQty);
                 if (!warehouseAreasItemService.updateById(item)) {
                     throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�");
                 }

--
Gitblit v1.9.1