From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 e050386..1db9f8b 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
@@ -4,12 +4,14 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
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;
import com.zy.asrs.wms.asrs.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wms.utils.OrderUtils;
+import com.zy.asrs.wms.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -62,7 +64,7 @@
Order order = new Order();
order.setOrderNo(orderNo);
order.setOrderType(param.getOrderType());
- order.setOrderSettle(param.getOrderSettle());
+ order.setOrderSettle(OrderSettleType.INIT.val());
order.setIoPri(orderUtils.getIoPri());
order.setOrderTime(format.format(new Date()));
order.setCreateTime(new Date());
@@ -122,6 +124,11 @@
}
}
+ orderDetl.setStockIndex(Utils.getMatUniqueKey(matnr, batch, orderDetl.getUniqueField()));
+ if (!orderDetlService.updateById(orderDetl)) {
+ throw new CoolException("鏇存柊鏄庣粏绱㈠紩澶辫触");
+ }
+
}
return true;
@@ -130,6 +137,14 @@
@Override
public boolean updateOrder(UpdateOrderParam param) {
Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getId, param.getOrderId()));
+ if (order == null) {
+ throw new CoolException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ if (order.getHasWave() == 1) {
+ throw new CoolException("璁㈠崟宸茬粡鐢熸垚娉㈡锛屾棤娉曚慨鏀�");
+ }
+
order.setOrderType(param.getOrderType());
order.setOrderSettle(param.getOrderSettle());
order.setUpdateTime(new Date());
@@ -207,6 +222,11 @@
}
}
+ orderDetl.setStockIndex(Utils.getMatUniqueKey(matnr, batch, orderDetl.getUniqueField()));
+ if (!orderDetlService.updateById(orderDetl)) {
+ throw new CoolException("鏇存柊鏄庣粏绱㈠紩澶辫触");
+ }
+
}
List<Long> deleteDetlId = param.getDeleteDetlId();
@@ -224,6 +244,11 @@
@Override
public boolean deleteOrder(Long orderId) {
+ Order order = this.getById(orderId);
+ if (order.getHasWave() == 1) {
+ throw new CoolException("璁㈠崟宸茬粡鐢熸垚娉㈡锛屽垹闄ゅけ璐�");
+ }
+
//鍒犻櫎璁㈠崟
this.removeById(orderId);
//鍒犻櫎鏄庣粏
--
Gitblit v1.9.1