From 36e3f1926b0f7e4a8a96cc817aaf0f638abb93f5 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 05 十二月 2023 13:15:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
index 3f08e02..6f0497a 100644
--- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
@@ -13,7 +13,9 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
+import java.util.Set;
@Slf4j
@Component
@@ -35,8 +37,9 @@
/*
瀹氭椂渚垮埄搴撳瓨锛岀敓鎴愯嚜鍔ㄨˉ璐у崟鎹�
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0 */1 * * * ? ")
public void createOrder(){
+ System.out.println(new Date());
//妫�娴嬫槸鍚︽湁鏈畬鎴愮殑琛ヨ揣鍗曟嵁
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "鑷姩琛ヨ揣鍗�"));
int count = orderService.selectCount(new EntityWrapper<Order>()
@@ -56,12 +59,27 @@
if(Cools.isEmpty(anfmeSum)){
anfmeSum = 0.0;
}
- //鏌ヨ褰撳墠鐗╂枡鍥涢」搴撴槸鍚﹀瓨鍦�
+ //褰撳墠鐗╂枡涓嶉渶瑕佽ˉ璐�
+ if(anfmeSum > mat.getStoreMin()){
+ continue;
+ }
+ //鏌ヨ褰撳墠鐗╂枡鍥涢」搴撴槸鍚﹀瓨鍦�,骞朵笖鎵樼洏涓嶅惈鏈夐潪鏂欑鐗╂枡
if(Cools.isEmpty(locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("matnr", mat.getMatnr())))){
continue;
}
- if(anfmeSum < mat.getStoreMin()){
+ Set<String> locNosSearch = locDetlService.selectLocNos(mat.getMatnr());
+ //鏄惁鍚湁鍙ˉ璐у嚭搴撶殑搴撲綅
+ boolean flag = false;
+ for (String locNo : locNosSearch){
+ //log.info("闇�瑕佹嫞鏂欑殑璐т綅锛�" + locNo +"锛岄渶瑕佽ˉ璐х殑鐗╂枡锛�" + mat.getMatnr());
+ if(Cools.isEmpty(locDetlService.selectByLocWithoutContainer(locNo))){
+ flag = true;
+ continue;
+ }
+ }
+
+ if(flag){
autoReplenishmentHandler.create(mat,mat.getStoreMax() - anfmeSum);
break;
}
@@ -72,7 +90,7 @@
/*
瀹氭椂澶勭悊鑷姩琛ヨ揣鍗曟嵁
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ @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