From f066939685f578336884b86bf001bf9fab19d488 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 30 十一月 2022 10:37:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 4b978d1..31ac504 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -59,7 +59,7 @@
@Override
public void checkComplete(String orderNo) {
Order order = this.selectByNo(orderNo);
- if (order.getSettle() >= 4L) {
+ if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
return;
}
List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -140,9 +140,13 @@
if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
}
} catch (Exception e) {
- log.error("", e);
+ log.error("saveHandlerOrder===>>", e);
return false;
}
return true;
@@ -162,8 +166,8 @@
}
@Override
- public void addToLogTable(Order order) {
- this.baseMapper.addToLogTable(order);
+ public boolean addToLogTable(Order order) {
+ return this.baseMapper.addToLogTable(order) > 0;
}
}
--
Gitblit v1.9.1