From 64bb911eb7d77fb4a910360e795d5abf2827612f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 13:54:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +---------
src/main/java/com/zy/core/MainProcess.java | 8 ++++----
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 9679fdf..da5e0d0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5125,7 +5125,7 @@
if (jarMaxLoc == 0 || basJarOther.getJarCount() == 0) {
break;
}
- int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 11));
+ int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 6));
if (count>0){
break;
}
@@ -7893,26 +7893,18 @@
try{
switch (sign){
case 1:
- case 5:
- case 9:
if (jarWrkMastExecuteGenerateSteComplete(sign)){
break;
}
case 2:
- case 6:
- case 10:
if (jarWrkMastExecuteGenerateJarComplete(sign)){
break;
}
case 3:
- case 7:
- case 11:
if (jarWrkMastExecuteGenerateRgvComplete1(sign)){
break;
}
case 4:
- case 8:
- case 12:
if (jarWrkMastExecuteGenerateRgvComplete2(sign)){
break;
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index f3e12d6..a8c5214 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -40,15 +40,15 @@
i++; if (i>5) i=0;
j++; if (j>5) j=0;
k++;
- if (k>13) {
+ if (k>6) {
k=0;
l++;
- if (l>3) l=0;
+ if (l>=3) l=0;
}
// 闂撮殧
- Thread.sleep(1000);
+ Thread.sleep(200);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -113,7 +113,7 @@
//JarWrkMastExecute浠诲姟鍒涘缓 //纭寲缃�
mainService.jarWrkMastExecuteGenerate(k);
//JarWrkMastExecute浠诲姟鎵ц
- mainService.jarWrkMastExecuteAction(k,j);
+ mainService.jarWrkMastExecuteAction(k,l);
//Jar浠诲姟鍒涘缓
mainService.jarMastGenerate();
//Jar浠诲姟瀹屾垚
--
Gitblit v1.9.1