From 2f63acadcd111fe47b2feedf13adb9cffcd64b2c Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期五, 25 十月 2024 13:28:50 +0800 Subject: [PATCH] mes调用立即出库修改 --- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index cf74bfc..d96ea94 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -1,10 +1,19 @@ package com.zy.asrs.task; +import com.core.common.Cools; +import com.zy.asrs.entity.Order; +import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.OrderService; +import com.zy.asrs.task.core.ReturnT; +import com.zy.asrs.task.handler.OrderSyncHandler; +import com.zy.common.entity.Parameter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; + +import java.util.List; /** * Created by vincent on 2020/7/7 @@ -14,24 +23,32 @@ public class OrderSyncScheduler { @Autowired + private OrderSyncHandler orderSyncHandler; + @Autowired private OrderService orderService; + @Autowired + private ApiLogService apiLogService; - @Scheduled(cron = "0/3 * * * * ? ") - private void queryAndSave(){ -// for (WrkMast wrkMast : wrkMasts) { -// ReturnT<String> result = workLogHandler.start(wrkMast); -// if (!result.isSuccess()) { -// log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo()); -// } -// } + @Scheduled(cron = "0 0 1 * * ? ") + public void clearApiLog(){ + try { + apiLogService.clearWeekBefore(); + } catch (Exception e) { + log.error("绗笁鏂规帴鍙f棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e); + } } - @Scheduled(cron = "0/3 * * * * ? ") - private void completeAndReport(){ -// for (WrkMast wrkMast : wrkMasts) { -// ReturnT<String> result = workLogHandler.start(wrkMast); -// if (!result.isSuccess()) { -// log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo()); + //@Scheduled(cron = "0/5 * * * * ? ") + @Async("orderThreadPool") + public void completeAndReport(){ +// String erpReport = Parameter.get().getErpReport(); +// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { +// List<Order> orders = orderService.selectComplete(); +// for (Order order : orders) { +// ReturnT<String> result = orderSyncHandler.start(order); +// if (!result.isSuccess()) { +// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); +// } // } // } } -- Gitblit v1.9.1