From a299fc89729094c6f0610be6439000347a160703 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 27 四月 2025 08:51:17 +0800
Subject: [PATCH] #盘点上报页面功能按钮
---
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
index 15a3bc3..2cb6df9 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -20,21 +20,29 @@
public class OrderMoveHistoryHandler extends AbstractHandler<String> {
@Autowired
private OrderService orderService;
-
@Autowired
private OrderDetlService orderDetlService;
- public ReturnT<String> move(){
+ public ReturnT<String> start(){
List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
.eq("settle", 6));
+ boolean result = true;
for (Order order : settleEqual6) {
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
.eq("order_no", order.getOrderNo()));
- moveBoth(order,orderDetls);
+ for (OrderDetl orderDetl : orderDetls) {
+ if(orderDetl.getMemo().isEmpty()){//鑻ヨ鍗曢噷浠嶆湁鏈笂鎶ョ殑鍋滄杞巻鍙叉。
+ result = false;
+ }
+ }
+ if(result){
+ moveBoth(order,orderDetls);
+ }
log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
}
return SUCCESS;
}
+
private void moveBoth(Order order, List<OrderDetl> orderDetls){
Date now = new Date();
if (!Cools.isEmpty(orderDetls)) {
--
Gitblit v1.9.1