From 114657d034c80ca40f08d767a71d169c34bde0b5 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 16 四月 2024 23:50:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java index 3c85552..35a343b 100644 --- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java +++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java @@ -8,12 +8,12 @@ import com.zy.asrs.entity.Order; import com.zy.asrs.service.*; import com.zy.asrs.task.handler.AutoReplenishmentHandler; +import com.zy.common.entity.Parameter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.Date; import java.util.List; import java.util.Set; @@ -35,11 +35,15 @@ private LocDetlService locDetlService; /* - 瀹氭椂渚垮埄搴撳瓨锛岀敓鎴愯嚜鍔ㄨˉ璐у崟鎹� + 瀹氭椂閬嶅巻搴撳瓨锛岀敓鎴愯嚜鍔ㄨˉ璐у崟鎹� */ @Scheduled(cron = "0 */1 * * * ? ") public void createOrder(){ - System.out.println(new Date()); + + if(!"Y".equals(Parameter.get().getAutoReplenishment())){ + return; + } + //妫�娴嬫槸鍚︽湁鏈畬鎴愮殑琛ヨ揣鍗曟嵁 DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "鑷姩琛ヨ揣鍗�")); int count = orderService.selectCount(new EntityWrapper<Order>() @@ -72,7 +76,7 @@ //鏄惁鍚湁鍙ˉ璐у嚭搴撶殑搴撲綅 boolean flag = false; for (String locNo : locNosSearch){ - log.info("闇�瑕佹嫞鏂欑殑璐т綅锛�" + locNo +"锛岄渶瑕佽ˉ璐х殑鐗╂枡锛�" + mat.getMatnr()); + //log.info("闇�瑕佹嫞鏂欑殑璐т綅锛�" + locNo +"锛岄渶瑕佽ˉ璐х殑鐗╂枡锛�" + mat.getMatnr()); if(Cools.isEmpty(locDetlService.selectByLocWithoutContainer(locNo))){ flag = true; continue; @@ -90,7 +94,7 @@ /* 瀹氭椂澶勭悊鑷姩琛ヨ揣鍗曟嵁 */ - @Scheduled(cron = "0/10 * * * * ? ") + //@Scheduled(cron = "0/10 * * * * ? ") public void excuteOrder(){ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "鑷姩琛ヨ揣鍗�")); List<Order> orderList = orderService.selectList(new EntityWrapper<Order>() -- Gitblit v1.9.1