From cca40ca8d275faa8b5cc9501ce4f09b81cfbd7fc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:04:38 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8f53e9d..58fba3f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -229,12 +229,14 @@
Order order = orderService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
- if (order.getSettle() > 1L) {
- throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
+ if (!Cools.isEmpty(orderPakout)) {
+ if (orderPakout.getSettle() > 1L) {
+ throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ }
+ orderPakoutService.remove(orderPakout.getId());
}
orderService.remove(order.getId());
- OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
- orderPakoutService.remove(orderPakout.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
--
Gitblit v1.9.1