From fe2ac1e9580172bc3341553032fb2679e70fd42a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 十二月 2024 10:46:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/OrderPakinService.java | 2 +
src/main/java/com/zy/asrs/service/OrderService.java | 2 +
src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 9 ++++
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 9 ++++
src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 10 +++++
src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java | 9 ++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 39 +++++++------------
src/main/java/com/zy/asrs/service/OrderPakoutService.java | 2 +
8 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderPakinService.java b/src/main/java/com/zy/asrs/service/OrderPakinService.java
index 0d21930..34fd21b 100644
--- a/src/main/java/com/zy/asrs/service/OrderPakinService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakinService.java
@@ -12,6 +12,8 @@
OrderPakin selectByNo(String orderNo);
+ List<OrderPakin> selectBySettle(Long settle);
+
List<OrderDetlPakin> selectWorkingDetls(Long orderId);
boolean updateSettle(Long orderId, Long settle, Long userId);
diff --git a/src/main/java/com/zy/asrs/service/OrderPakoutService.java b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
index 09643a1..60a6c8e 100644
--- a/src/main/java/com/zy/asrs/service/OrderPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
@@ -12,6 +12,8 @@
OrderPakout selectByNo(String orderNo);
+ List<OrderPakout> selectBySettle(Long settle);
+
List<OrderDetlPakout> selectWorkingDetls(Long orderId);
boolean updateSettle(Long orderId, Long settle, Long userId);
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 1711cc9..08619c8 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -12,6 +12,8 @@
Order selectByNo(String orderNo);
+ List<Order> selectBySettle(Long settle);
+
List<OrderDetl> selectWorkingDetls(Long orderId);
boolean updateSettle(Long orderId, Long settle, Long userId);
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 e95f470..edd979c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -14,16 +14,12 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
-import com.zy.common.model.enumUtils.OrderEnumVo;
-import com.zy.common.model.enumUtils.OrderInAndOutType;
-import com.zy.common.model.enumUtils.OrderMethodVo;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -58,11 +54,7 @@
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
- try{
- OrderInAndOutUtil.query(Boolean.TRUE,param.getOrderNo());
- } catch (Exception e) {
- throw new CoolException(e.getMessage());
- }
+ OrderInAndOutUtil.query(Boolean.TRUE,param.getOrderNo());
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
@@ -103,11 +95,9 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- try{
- OrderInAndOutUtil.insertOrder(Boolean.TRUE,order);
- } catch (Exception e) {
- throw new CoolException(e.getMessage());
- }
+
+ OrderInAndOutUtil.insertOrder(Boolean.TRUE,order);
+
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
@@ -138,11 +128,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- try{
- OrderInAndOutUtil.insertOrderDetl(Boolean.TRUE,order,orderDetl);
- } catch (Exception e) {
- throw new CoolException(e.getMessage());
- }
+ OrderInAndOutUtil.insertOrderDetl(Boolean.TRUE,order,orderDetl);
}
}
@@ -178,21 +164,24 @@
}
} else {
// 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+ List<Order> orders = orderService.selectBySettle(4L);
for (Order order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.TRUE, order.getId());
+
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+ OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 6L, null);
}
}
return results;
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
index 2b4bc02..abd21f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
@@ -47,6 +47,15 @@
}
@Override
+ public List<OrderPakin> selectBySettle(Long settle) {
+ List<OrderPakin> orderList = this.selectList(new EntityWrapper<OrderPakin>().eq("settle", settle));
+ if (Cools.isEmpty(orderList)) {
+ return null;
+ }
+ return orderList;
+ }
+
+ @Override
public List<OrderDetlPakin> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index 9870088..691a9f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
@@ -47,6 +47,15 @@
}
@Override
+ public List<OrderPakout> selectBySettle(Long settle) {
+ List<OrderPakout> orderList = this.selectList(new EntityWrapper<OrderPakout>().eq("settle", settle));
+ if (Cools.isEmpty(orderList)) {
+ return null;
+ }
+ return orderList;
+ }
+
+ @Override
public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index ce2a799..04f49cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -47,6 +47,15 @@
}
@Override
+ public List<Order> selectBySettle(Long settle) {
+ List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("settle", settle));
+ if (Cools.isEmpty(orderList)) {
+ return null;
+ }
+ return orderList;
+ }
+
+ @Override
public List<OrderDetl> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
index 6073848..9730d66 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
@@ -38,6 +38,11 @@
return transformationOrder(orderPakin);
}
@Transactional
+ public List<Order> selectBySettle(Long settle) {
+ List<OrderPakin> orderPakinList = orderPakinService.selectBySettle(settle);
+ return transformationOrderList(orderPakinList);
+ }
+ @Transactional
public List<OrderDetl> selectByOrderId(Long orderId) {
List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId);
return transformationOrderDetlList(orderDetlPakinList);
@@ -258,6 +263,11 @@
return transformationOrder(orderPakout);
}
@Transactional
+ public List<Order> selectBySettle(Long settle) {
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectBySettle(settle);
+ return transformationOrderList(orderPakoutList);
+ }
+ @Transactional
public List<OrderDetl> selectByOrderId(Long orderId) {
List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId);
return transformationOrderDetlList(orderDetlPakoutList);
--
Gitblit v1.9.1