From 67e69c6ef36fba3805516a022e5bf431981cd641 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 13 七月 2023 11:18:10 +0800
Subject: [PATCH] #平库库位查询bug修复
---
src/main/java/com/zy/asrs/controller/OutController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 689e721..1a824df 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -61,6 +62,11 @@
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
+ for (OrderDetl o: orderDetls) {
+ if (o.getAnfme().equals(o.getWorkQty())){
+ return R.error("鍑哄簱鐨勬槑缁嗕腑鏈夊凡鍑哄簱鐗╂枡");
+ }
+ }
Set<String> exist = new HashSet<>();
@@ -81,8 +87,10 @@
locDto.setManu(locDetl.getManu());
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
+ BigDecimal iss=new BigDecimal(Double.toString(issued));
+ BigDecimal an=new BigDecimal(Double.toString(locDetl.getAnfme()));
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
+ issued=iss.subtract(an).doubleValue();
} else {
break;
}
@@ -261,7 +269,7 @@
manPakOut.setMatnr(locDto.getMatnr());
manPakOut.setMaktx(locDto.getMaktx());
manPakOut.setDocNum(locDto.getOrderNo());
- manPakOut.setCount(0);
+ manPakOut.setCount(0.0);
manPakOut.setStatus(0);
manPakOut.setCreateTime(new Date());
manPakOut.setBatch(locDto.getBatch());
--
Gitblit v1.9.1