From 2938aa734a2cf0baf93fdced92ea21e37f187365 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:05:39 +0800
Subject: [PATCH] 出库单下发执行生成任务明细

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 e854ebf..988d27a 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
@@ -63,7 +63,7 @@
         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));
+//        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()));
         if (!Objects.isNull(pakin)) {
@@ -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