From 78a63c83855b86ad930878d109ff5ac60c055b63 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 六月 2024 08:24:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 10 ++++------
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 10 ++++++----
2 files changed, 10 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 5c2cb5c..b50d02b 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -88,12 +88,13 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute1(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠� 172
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+ Integer devNo = 173;
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
- int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", 172).eq("loading", "Y"));
+ int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", devNo).eq("loading", "Y"));
int count = 10;
if (loadIngCount<=count){
- bareBoardHandler.startYx(172,count);
+ bareBoardHandler.startYx(devNo,count);
}
}
}
@@ -102,12 +103,13 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦涓�妤�
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+ Integer devNo = 448;
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard448"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
- int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 421).le("dev_no", 448).eq("loading", "Y"));
+ int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 421).le("dev_no", devNo).eq("loading", "Y"));
int count = 25;
if (loadIngCount<=count){
- bareBoardHandler.startYx(448,count);
+ bareBoardHandler.startYx(devNo,count);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index e10298d..b928487 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -169,16 +169,15 @@
crns.add(7);
boolean sign = true;
for (Integer crnNo : crns){
- List<String> locNoList = new ArrayList<>();
-
BasCrnp basCrnp = basCrnpService.selectById(crnNo);
if (basCrnp.getCrnSts()!=3 || !basCrnp.getOutEnable().equals("Y")){
continue;
}
- sign = true;
// 鑾峰彇搴撲綅
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", crnNo));
for (LocMast locMastS : locMasts){
+ List<String> locNoList = new ArrayList<>();
+ sign = true;
if (Cools.isEmpty(locMastS)) {
// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
@@ -194,10 +193,9 @@
locNoList.add(locMastS.getLocNo());
//灏忔枡绠变即鐢熷嚭搴�
- if (Utils.getRow(locMastS.getLocNo())<=8){
+ if (sign && Utils.getRow(locMastS.getLocNo())<=8){
String locNoOther = staNoOther(locMastS.getLocNo());
LocMast locMastOther = locMastService.selectById(locNoOther);
-
if (locMastOther.getLocSts().equals("D") || locMastOther.getLocSts().equals("F") || locMastOther.getLocSts().equals("R")){
if (locMastOther.getLocSts().equals("D")){
locNoList.add(locNoOther);
@@ -205,7 +203,7 @@
}else {
sign=false;
}
- }else if (Utils.getRow(locMastS.getLocNo())>=21 && Utils.getRow(locMastS.getLocNo())<=27){
+ }else if (sign && Utils.getRow(locMastS.getLocNo())>=21 && Utils.getRow(locMastS.getLocNo())<=27){
String locNoOther = staNoOther(locMastS.getLocNo());
LocMast locMastOther = locMastService.selectById(locNoOther);
if (locMastOther.getLocSts().equals("D") || locMastOther.getLocSts().equals("F") || locMastOther.getLocSts().equals("R")){
--
Gitblit v1.9.1