From ce43df438a4bbef5b9ffaed0a33a97db6e88fbf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:07 +0800
Subject: [PATCH] 优化异常处理及订单同步逻辑
---
src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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..8cf793a 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 * * * ? ")
+// @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>()
@@ -63,7 +67,7 @@
if(anfmeSum > mat.getStoreMin()){
continue;
}
- //鏌ヨ褰撳墠鐗╂枡鍥涢」搴撴槸鍚﹀瓨鍦�,骞朵笖鎵樼洏涓嶅惈鏈夐潪鏂欑鐗╂枡
+ //鏌ヨ褰撳墠鐗╂枡鍥涢」搴撴槸鍚﹀瓨鍦�,骞朵笖璐ф灦涓嶅惈鏈夐潪璐ф灦鐗╂枡
if(Cools.isEmpty(locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("matnr", mat.getMatnr())))){
continue;
}
@@ -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