From a633719822addac8aad45a4712eaf428fc52a3b0 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 22 十一月 2022 14:18:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/controller/OutController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 10f209d..6a64db6 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -140,12 +140,16 @@
}
for (OrderDto orderDto : orderDtos) {
Order order = orderService.selectByNo(orderDto.getOrderNo());
- if (order.getSettle() > 2) {
- return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ if (!Cools.isEmpty(order)){
+ if (order.getSettle() > 2) {
+ return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
}
OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), orderDto.getMatnr(), null);
- if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
- return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ if (!Cools.isEmpty(orderDetl)){
+ if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
+ return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
}
}
--
Gitblit v1.9.1