From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java
index 98a6b46..badd6f8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java
@@ -1,5 +1,6 @@
package com.zy.asrs.wms.utils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.Order;
import com.zy.asrs.wms.asrs.entity.OrderDetl;
@@ -11,6 +12,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.List;
@Component
public class OrderUtils {
@@ -22,13 +24,18 @@
@Transactional
public void updateWorkQty(Long orderDetlId, Double qty) {
+ updateWorkQty(orderDetlId, qty, true);
+ }
+
+ @Transactional
+ public void updateWorkQty(Long orderDetlId, Double qty, boolean increase) {
OrderDetl orderDetl = orderDetlService.getById(orderDetlId);
- if(orderDetl == null) {
+ if (orderDetl == null) {
throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
}
Order order = orderService.getById(orderDetl.getOrderId());
- if(order == null) {
+ if (order == null) {
throw new CoolException("璁㈠崟涓嶅瓨鍦�");
}
@@ -40,18 +47,38 @@
}
Double workQty = orderDetl.getWorkQty();
- orderDetl.setWorkQty(workQty + qty);
+ if (increase) {
+ orderDetl.setWorkQty(workQty + qty);
+ }else {
+ orderDetl.setWorkQty(workQty - qty);
+ }
orderDetl.setUpdateTime(new Date());
if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("璁㈠崟鏄庣粏鏇存柊澶辫触");
}
+ List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
+ boolean flag = false;
+ for (OrderDetl detl : orderDetls) {
+ if ((detl.getQty() + detl.getWorkQty()) > 0) {
+ flag = true;
+ break;
+ }
+ }
- order.setOrderSettle(OrderSettleType.WORKING.val());
+ if (flag) {
+ order.setOrderSettle(OrderSettleType.WORKING.val());
+ } else {
+ order.setOrderSettle(OrderSettleType.WAIT.val());
+ }
order.setUpdateTime(new Date());
- if(!orderService.updateById(order)) {
+ if (!orderService.updateById(order)) {
throw new CoolException("璁㈠崟鏇存柊澶辫触");
}
}
+ public Integer getIoPri() {
+ return 11;
+ }
+
}
--
Gitblit v1.9.1