From 729d4ae967577e2e31b1ef55ce6de80368e3988a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 24 五月 2024 13:27:06 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 70f9092..92226a3 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
@@ -95,6 +95,10 @@
if (!Cools.isEmpty(param.get("doc_type"))) {
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")));
+ wrapper.eq(Order::getDocType, docType.getDocId());
+ }
if (!Cools.isEmpty(param.get("settle"))) {
wrapper.eq(Order::getSettle, param.get("settle"));
}
@@ -186,7 +190,7 @@
wrkQty = wrkQty + orderDetl.getQty();
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
issued = issued - locDetl.getAnfme();
--
Gitblit v1.9.1