From 71404114337f70f3d3134d2e272af6e5738f7bad Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 19 十月 2024 15:27:25 +0800
Subject: [PATCH] 理货出库拆垛完成修改
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 8a13a9c..553ea93 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -2,17 +2,20 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.*;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasRgv;
+import com.zy.asrs.entity.RgvOneSign;
+import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvService;
+import com.zy.asrs.service.RgvOneSignService;
+import com.zy.asrs.service.WrkMastStaService;
import com.zy.asrs.task.handler.BareBoardHandler;
-import com.zy.asrs.task.handler.WorkMastHandler;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
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;
/**
@@ -35,7 +38,7 @@
@Autowired
private WrkMastStaService wrkMastStaService;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
@@ -46,16 +49,16 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void executeOne(){//鑷姩璋冪┖鏉垮嚭搴� 1妤肩爜鍨涗綅缃�
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
boolean sign = true;
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+ List<WrkMastSta> wrkMastStas = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
- WrkMastSta wrkMastSta2 = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+ List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
- if (Cools.isEmpty(wrkMastSta) || !Cools.isEmpty(wrkMastSta2)){
+ if (Cools.isEmpty(wrkMastStas) || wrkMastStas.size()==0 || !Cools.isEmpty(wrkMastStaList) || wrkMastStaList.size()!=0){
sign=false;
}
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
--
Gitblit v1.9.1