From d0fa6b5d514110de8bcc672a08813151efa94fb6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 05 九月 2023 15:28:37 +0800
Subject: [PATCH] #拣货单
---
src/main/java/com/zy/asrs/controller/OutController.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index a97a1ee..c71a1f9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -71,12 +71,12 @@
Set<String> exist = new HashSet<>();
for (OrderDetl orderDetl : orderDetls) {
- 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);
+ BigDecimal a1 = new BigDecimal(orderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal b1 = new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
+ List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
boolean sign = false;
@@ -84,7 +84,7 @@
sign=true;
}
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- sign ? locDetl.getAnfme() : issued,locDetl.getOwner(),locDetl.getPayment());
+ sign ? locDetl.getAnfme() : issued);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), sign? 101 : 103);
// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
// locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
@@ -94,16 +94,16 @@
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()));
+ BigDecimal iss=new BigDecimal(Double.toString(issued)).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal an=new BigDecimal(Double.toString(locDetl.getAnfme())).setScale(2,BigDecimal.ROUND_HALF_UP);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued=iss.subtract(an).doubleValue();
+ issued=iss.subtract(an).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
} else {
break;
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getOwner(),1);
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
@@ -281,8 +281,6 @@
manPakOut.setCreateTime(new Date());
manPakOut.setBatch(locDto.getBatch());
manPakOut.setUpdateTime(new Date());
- manPakOut.setPayment(locDto.getPayment());
- manPakOut.setOwner(locDto.getOwner());
manPakOut.setUuid(uuid);
if (Cools.isEmpty(manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num",locDto.getOrderNo())))){
manPakOut.setName(locDto.getMaktx());
--
Gitblit v1.9.1