From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
index 85dbb26..240c693 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
@@ -6,6 +6,7 @@
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
+import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;
import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;
import com.zy.asrs.wms.asrs.mapper.OrderMapper;
@@ -19,10 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
@@ -39,6 +37,8 @@
private OrderNoRuleService orderNoRuleService;
@Autowired
private OrderUtils orderUtils;
+ @Autowired
+ private WaitPakinService waitPakinService;
@Override
@Transactional
@@ -67,6 +67,9 @@
Order order = new Order();
order.setOrderNo(orderNo);
order.setOrderType(param.getOrderType());
+ order.setCustomer(param.getCustomer());
+ order.setPhone(param.getPhone());
+ order.setAddress(param.getAddress());
order.setOrderSettle(OrderSettleType.INIT.val());
order.setIoPri(orderUtils.getIoPri());
order.setOrderTime(format.format(new Date()));
@@ -132,7 +135,7 @@
throw new CoolException("鏇存柊鏄庣粏绱㈠紩澶辫触");
}
- mat.setUtiliz(mat.getUtiliz() + 1);
+ mat.setUtiliz(Objects.isNull(mat.getUtiliz()) ? 0 : mat.getUtiliz() + 1);
if (!matService.updateById(mat)) {
throw new CoolException("鐗╂枡浣跨敤鐜囦慨鏀瑰け璐ワ紒锛�");
@@ -257,6 +260,10 @@
throw new CoolException("璁㈠崟宸茬粡鐢熸垚娉㈡锛屽垹闄ゅけ璐�");
}
+ List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getOrderId, orderId));
+ if (!waitPakins.isEmpty()) {
+ throw new CoolException("鍗曟嵁宸茬敓鎴愮粍鎵橈紝涓嶅彲鎵ц鍒犻櫎鎿嶄綔锛侊紒");
+ }
//鍒犻櫎璁㈠崟
this.removeById(orderId);
//鍒犻櫎鏄庣粏
--
Gitblit v1.9.1