From 3f57eae3b5c4a8e26aba9011718f207ae64b9120 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 13 七月 2023 11:24:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 6a18aa7..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("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
}
}
@@ -801,7 +808,7 @@
waitPakinLog.setZpallet(waitPakin.getZpallet());
waitPakinLog.setAnfme(waitPakin.getAnfme());
waitPakinLog.setMatnr(waitPakin.getMatnr());
- waitPakinLog.setLocNo(waitPakin.getLocNo());
+ waitPakinLog.setLocNo(jsonLocNo);
waitPakinLog.setMaktx(waitPakin.getMaktx());
waitPakinLog.setOrderNo(waitPakin.getOrderNo());
waitPakinLog.setWeight(waitPakin.getWeight());
--
Gitblit v1.9.1