From de14adf3250bfecdf41600aa0ea8789111523ad1 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 09:43:36 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 25d00d2..03b6140 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -520,6 +520,15 @@
if (Cools.isEmpty(orderDetl)) {
throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
}
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ if (Cools.isEmpty(order)) {
+ throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
+ }
+ if (order.getSettle() == 4L) {
+ if (!orderService.updateSettle(order.getId(),2L,userId)) {
+ throw new CoolException("璋冩嫧鍗曞洖婊氬紓甯�!");
+ }
+ }
orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
--
Gitblit v1.9.1