From 33590e66e814b1c2e025e038410ef0006f4f38f7 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 21 十月 2024 16:37:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
index ccbd2b3..e44cfac 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
@@ -166,8 +166,33 @@
}
@Override
+ public List<OrderNameListDto> selectAllCombOrderNo(Long hostId) {
+ List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId).orderByDesc(Order::getCreateTime));
+ if (Cools.isEmpty(list)){
+ return null;
+ }
+ ArrayList<OrderNameListDto> orderNameListDtos = new ArrayList<>();
+ for (Order order :list){
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));
+
+ if (order.getSettle() >= 4) {
+ continue;
+ }
+
+ if (docType.getPakin() == 1){
+ OrderNameListDto orderNameListDto = new OrderNameListDto();
+ orderNameListDto.setOrder_no(order.getOrderNo());
+ orderNameListDtos.add(orderNameListDto);
+ }
+ }
+
+ return orderNameListDtos;
+
+ }
+
+ @Override
public List<OrderNameListDto> selectAllorderNo(Long hostId) {
- List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId));
+ List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId).orderByDesc(Order::getCreateTime));
if (Cools.isEmpty(list)){
return null;
}
@@ -191,10 +216,12 @@
List<Order> list = list(new LambdaQueryWrapper<Order>()
.eq(Order::getHostId, hostId)
.like(Order::getOrderNo, orderNo)
+ .orderByDesc(Order::getCreateTime)
);
if (Cools.isEmpty(orderNo) || orderNo.isEmpty()){
list = list(new LambdaQueryWrapper<Order>()
.eq(Order::getHostId, hostId)
+ .orderByDesc(Order::getCreateTime)
);
}
if (Cools.isEmpty(list)){
@@ -204,6 +231,10 @@
for (Order order :list){
DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));
+ if (order.getSettle() >= 4) {
+ continue;
+ }
+
if (docType.getPakout() == 1){
orderNameListDtos.add(order.getOrderNo());
}
--
Gitblit v1.9.1