From ad388e75b34a2145f12cf12215566eef900b4892 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 15 六月 2024 13:00:31 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index d2dbdac..c6e0a66 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -23,7 +23,9 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
+import java.net.URLDecoder;
import java.util.*;
@RestController
@@ -105,7 +107,7 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ @RequestParam Map<String, Object> param) throws UnsupportedEncodingException {
LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
excludeTrash(param);
wrapper.eq(Order::getStatus, 1);
@@ -122,7 +124,8 @@
wrapper.eq(Order::getDocType, param.get("doc_type"));
}
if (!Cools.isEmpty(param.get("docName"))) {
- DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, param.get("docName")));
+ String docName = URLDecoder.decode(param.get("docName").toString(), "UTF-8");
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, docName));
wrapper.eq(Order::getDocType, docType.getDocId());
}
if (!Cools.isEmpty(param.get("settle"))) {
@@ -211,10 +214,12 @@
double totalQty = 0;
double wrkQty = 0;
double lackQty = 0;
+ double endQty = 0;
for (OrderDetl orderDetl : orderDetls) {
totalQty = totalQty + orderDetl.getAnfme();
- wrkQty = wrkQty + orderDetl.getQty();
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+ wrkQty = wrkQty + orderDetl.getWorkQty();
+ endQty = endQty + orderDetl.getQty();
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued > 0.0) {
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
for (LocDetl locDetl : locDetls) {
@@ -236,6 +241,9 @@
WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, wrkDetl.getWrkNo()).eq(WrkMast::getIoTime, wrkDetl.getIoTime()));
if (wrkMast == null) {
WrkMastLog wrkMastLog = wrkMastLogService.getOne(new LambdaQueryWrapper<WrkMastLog>().eq(WrkMastLog::getWrkNo, wrkDetl.getWrkNo()).eq(WrkMastLog::getIoTime, wrkDetl.getIoTime()));
+ if (wrkMastLog.getIoType()==103){
+ wrkMastLog = wrkMastLogService.getOne(new LambdaQueryWrapper<WrkMastLog>().eq(WrkMastLog::getWrkNo, wrkDetl.getWrkNo()).eq(WrkMastLog::getIoTime, wrkDetl.getIoTime()).eq(WrkMastLog::getIoType,53));
+ }
if (wrkMastLog != null) {
wrkMast = new WrkMast();
BeanUtils.copyProperties(wrkMastLog, wrkMast);
@@ -264,6 +272,7 @@
.add("totalQty", totalQty)
.add("wrkQty", wrkQty)
.add("lackQty", lackQty)
+ .add("endQty",endQty)
);
}
--
Gitblit v1.9.1