From 1044d25ccaa5350b68fa259788246812139267b1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 05 三月 2025 12:06:27 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 49eac78..fcd225c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -157,9 +157,6 @@
@Transactional
public void checkComplete2(String orderNo) {
Order order = this.selectByNo(orderNo);
- if (order.getDocType() == 38) {
- return;
- }
if (Cools.isEmpty(order)) {
return;
}
@@ -169,10 +166,21 @@
List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
// 浣滀笟鏁伴噺鏄惁绛変簬鏁伴噺
boolean complete = true;
- for (OrderDetl orderDetl : orderDetls) {
- if (orderDetl.getAnfme() > orderDetl.getQty()) {
- complete = false;
- break;
+ if (order.getDocType() == 38) {
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getAnfme() > orderDetl.getQty()) {
+ if (orderDetl.getReportQty() < orderDetl.getQty()) {
+ complete = false;
+ break;
+ }
+ }
+ }
+ } else {
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getAnfme() > orderDetl.getQty()) {
+ complete = false;
+ break;
+ }
}
}
--
Gitblit v1.9.1