From 72149078ff14f391cdd3c312b74455e441630343 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 13:51:52 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java | 79 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java b/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java
index f6447b9..095a16e 100644
--- a/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java
+++ b/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java
@@ -1,11 +1,9 @@
package com.zy.asrs.task;
-import com.core.common.Cools;
import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.service.OrderPakoutService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.GroupOrderFormHandler;
-import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -15,7 +13,7 @@
/**
* Created by Monkey D. Luffy on 2025.11.10
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈瀹屾垚淇℃伅澶勭悊
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............缁勮揣鍗曠浉鍏�
*/
@Slf4j
@Component
@@ -28,38 +26,61 @@
@Scheduled(cron = "0/5 * * * * ? ")
public void abandonedGroupOrderForm(){
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<OrderPakout> orders = orderPakoutService.selectSettle(99L);
- for (OrderPakout order : orders) {
- try{
- ReturnT<String> result = groupOrderFormHandler.abandoned(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
- }catch (Exception e){
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ List<OrderPakout> orders = orderPakoutService.selectSettle(99L);//搴熷純
+ if (orders.isEmpty()){
+ return;
+ }
+ for (OrderPakout order : orders) {
+ try{
+ ReturnT<String> result = groupOrderFormHandler.abandoned(order);
+ if (!result.isSuccess()) {
+ log.error("璁″垝缁勮揣鍗昜orderNo={}]搴熷純娓呴櫎澶辫触", order.getOrderNo());
}
+ }catch (Exception e){
+ log.error("璁″垝缁勮揣鍗昜orderNo={}]搴熷純娓呴櫎澶辫触", order.getOrderNo());
+ log.error("璁″垝缁勮揣鍗�"+order+"搴熷純娓呴櫎澶辫触锛屽紓甯镐俊鎭細"+e);
}
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
- public void outGroupOrderForm(){
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<OrderPakout> orders = orderPakoutService.selectSettle(11L);
- for (OrderPakout order : orders) {
- try{
- ReturnT<String> result = groupOrderFormHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
- }catch (Exception e){
- log.error("璁″垝缁勮揣鍗昜orderNo={}]鍑哄簱澶辫触", order.getOrderNo());
- log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ @Scheduled(cron = "0/30 * * * * ? ")
+ public void inspectionGroupOrderForm(){
+ List<OrderPakout> orders = orderPakoutService.selectSettle(11L);//妫�楠�
+ if (orders.isEmpty()){
+ return;
+ }
+ for (OrderPakout order : orders) {
+ try{
+ ReturnT<String> result = groupOrderFormHandler.inspection(order);
+ if (!result.isSuccess()) {
+ log.error("璁″垝缁勮揣鍗昜orderNo={}]鏌ヨ鍗峰彿瀛樺湪涓嶅悎鏍�", order.getOrderNo());
+ } else {
+ orderPakoutService.updateSettle(order.getId(),12L,0L);//妫�楠屽悎鏍�
}
+ }catch (Exception e){
+ log.error("璁″垝缁勮揣鍗昜orderNo={}]鏌ヨ鍗峰彿澶辫触", order.getOrderNo());
+ log.error("璁″垝缁勮揣鍗�"+order+"鏌ヨ鍗峰彿澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/10 * * * * ? ")
+ public void outGroupOrderForm(){
+ List<OrderPakout> orders = orderPakoutService.selectSettle(12L);//鍑哄簱
+ if (orders.isEmpty()){
+ return;
+ }
+ for (OrderPakout order : orders) {
+ try{
+ ReturnT<String> result = groupOrderFormHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("璁″垝缁勮揣鍗昜orderNo={}]妫�楠屽嚭搴撳け璐�", order.getOrderNo());
+ } else {
+ orderPakoutService.updateSettle(order.getId(),15L,0L);//妫�楠屽悎鏍�
+ }
+ }catch (Exception e){
+ log.error("璁″垝缁勮揣鍗昜orderNo={}]妫�楠屽嚭搴撳け璐�", order.getOrderNo());
+ log.error("璁″垝缁勮揣鍗�"+order+"妫�楠屽嚭搴撳け璐ワ紝寮傚父淇℃伅锛�"+e);
}
}
}
--
Gitblit v1.9.1