From 298b0fc5c2e2e7725cdf0a2f0a0650cd5d66f873 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 13 七月 2023 11:24:06 +0800
Subject: [PATCH] #小数加减法bug修复

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    9 ++++++++-
 src/main/java/com/zy/asrs/controller/OutController.java       |    5 ++++-
 src/main/resources/application.yml                            |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 1a824df..978209e 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -71,7 +71,10 @@
         Set<String> exist = new HashSet<>();
 
         for (OrderDetl orderDetl : orderDetls) {
-            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+            BigDecimal a1 = new BigDecimal(orderDetl.getAnfme());
+            BigDecimal b1 = new BigDecimal(orderDetl.getQty());
+            Double c1 = a1.subtract(b1).doubleValue();
+            double issued = Optional.of( c1 ).orElse(0.0D);
             if (issued <= 0.0D) { continue; }
             List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
             for (LocDetl locDetl : locDetls) {
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 af82405..bbc9838 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -31,6 +31,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -177,7 +178,13 @@
                 }
                 Double anfme = orderDetl.getAnfme();
                 Double workQty = orderDetl.getWorkQty();
-                if ( anfme - (workQty+combMat.getAnfme()) < 0) {
+                BigDecimal a1 = new BigDecimal(orderDetl.getAnfme());
+                BigDecimal b1 = new BigDecimal(orderDetl.getWorkQty());
+                BigDecimal c1 = new BigDecimal(combMat.getAnfme());
+                double e1 = b1.add(c1).doubleValue();
+                BigDecimal f1 = new BigDecimal(e1);
+                Double d1 = a1.subtract(f1).doubleValue();
+                if ( d1 < 0.0) {
                     throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
                 }
             }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dfe5749..7a9690f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=stasrs
     #url: jdbc:sqlserver://127.0.0.1:1433;databasename=stasrs
     username: sa
     password: sa@123

--
Gitblit v1.9.1