From c135b2adb55f470ca20b434ed71ae48d8874d6b0 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 11:05:06 +0800
Subject: [PATCH] 订单系统bug
---
src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 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 7050458..7ed6705 100644
--- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
@@ -3,16 +3,19 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderService;
+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.List;
+import java.util.Set;
@Slf4j
@Component
@@ -24,12 +27,75 @@
private DocTypeService docTypeService;
@Autowired
private AutoReplenishmentHandler autoReplenishmentHandler;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
+ @Autowired
+ private LocDetlService locDetlService;
+
+ /*
+ 瀹氭椂閬嶅巻搴撳瓨锛岀敓鎴愯嚜鍔ㄨˉ璐у崟鎹�
+ */
+ @Scheduled(cron = "0 */1 * * * ? ")
+ public void createOrder(){
+
+ if(!"Y".equals(Parameter.get().getAutoReplenishment())){
+ return;
+ }
+
+ //妫�娴嬫槸鍚︽湁鏈畬鎴愮殑琛ヨ揣鍗曟嵁
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "鑷姩琛ヨ揣鍗�"));
+ int count = orderService.selectCount(new EntityWrapper<Order>()
+ .eq("doc_type", docType.getDocId())
+ .andNew().eq("settle",2)
+ .or().eq("settle",1));
+ if(count > 0){
+ return;
+ }
+
+ //鏌ヨ鎵�鏈夐渶瑕佽ˉ璐х殑鐗╂枡
+ List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().gt( "store_min", 0));
+ if(!Cools.isEmpty(matList)){
+ for (Mat mat : matList){
+ //鏌ヨ褰撳墠鐗╂枡鏄惁鍦╝gv搴撳皬浜庡簱瀛樹笂闄�
+ Double anfmeSum = agvLocDetlService.selectSumAnfmeByMatnr(mat.getMatnr());
+ 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;
+ }
+
+ 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;
+ }
+ }
+ }
+ }
/*
瀹氭椂澶勭悊鑷姩琛ヨ揣鍗曟嵁
*/
- @Scheduled(cron = "0/5 * * * * ? ")
- public void excute(){
+ @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>()
.eq("doc_type", docType.getDocId())
--
Gitblit v1.9.1