From 924bc6bf86386856b7946e98a88af1a95821be98 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 17 七月 2023 08:14:39 +0800
Subject: [PATCH] #还原uuid 问题出在数据库 已维护
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 af82405..8414097 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("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
}
}
@@ -755,6 +762,13 @@
} else if (waitPakins.get(0).getIoStatus() == "Y") {
return R.error("缁勬墭宸茬粡鐢熸垚宸ヤ綔妗�");
}
+
+ for (WaitPakin waitPakin: waitPakins) {
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("zpallet", waitPakin.getZpallet()));
+ if (!Cools.isEmpty(manLocDetls) || manLocDetls.size()>0){
+ return R.error("鎵�鍦ㄥ簱浣嶅凡瀛樺湪鏄庣粏");
+ }
+ }
//鍒ゆ柇璁㈠崟鏄惁瀹屾垚
boolean log =true;
--
Gitblit v1.9.1