From 939f5e7b56eb28d2630e2791860612819be73c45 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 十二月 2024 14:46:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
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 edd979c..d007728 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -54,7 +54,7 @@
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
- OrderInAndOutUtil.query(Boolean.TRUE,param.getOrderNo());
+ OrderInAndOutUtil.query(Boolean.TRUE? "Y":"N",param.getOrderNo());
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
@@ -164,7 +164,11 @@
}
} else {
// 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectBySettle(4L);
+// List<Order> orders = orderService.selectBySettle(4L);
+ List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
+ if (orders.isEmpty()){
+ orders = new ArrayList<>();
+ }
for (Order order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
--
Gitblit v1.9.1