From f5e7194351d3720f67c29c2fe2a19eea0014a044 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 22 十一月 2023 21:51:56 +0800
Subject: [PATCH] 任务下发bug修复
---
src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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..d0ab451 100644
--- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.handler.AutoReplenishmentHandler;
import lombok.extern.slf4j.Slf4j;
@@ -24,12 +27,45 @@
private DocTypeService docTypeService;
@Autowired
private AutoReplenishmentHandler autoReplenishmentHandler;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
+
+ /*
+ 瀹氭椂渚垮埄搴撳瓨锛岀敓鎴愯嚜鍔ㄨˉ璐у崟鎹�
+ */
+ //@Scheduled(cron = "0/5 * * * * ? ")
+ public void createOrder(){
+ //妫�娴嬫槸鍚︽湁鏈畬鎴愮殑琛ヨ揣鍗曟嵁
+ 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("settle",1));
+ if(count > 0){
+ return;
+ }
+
+ //鏌ヨ鎵�鏈夐渶瑕佽ˉ璐х殑鐗╂枡
+ List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().eq(false, "store_min", 0));
+ if(!Cools.isEmpty(matList)){
+ for (Mat mat : matList){
+ //鏌ヨ褰撳墠鐗╂枡鏄惁鍦╝gv搴撳皬浜庡簱瀛樹笂闄�
+ Double anfmeSum = agvLocDetlService.selectSumAnfmeByMatnr(mat.getMatnr());
+ if(anfmeSum < mat.getStoreMin()){
+ autoReplenishmentHandler.create(mat,mat.getStoreMax() - anfmeSum);
+ break;
+ }
+ }
+ }
+ }
/*
瀹氭椂澶勭悊鑷姩琛ヨ揣鍗曟嵁
*/
@Scheduled(cron = "0/5 * * * * ? ")
- public void excute(){
+ 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