From fe198a9143ad5a6840f664a2f6c2cfa1beff0e57 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 17:10:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++++++-
src/main/java/com/zy/asrs/entity/WrkMast.java | 18 ++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 18c3ff5..a79adfe 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -523,4 +523,22 @@
}
}
+ public Integer getStaNoSign(){
+ if (this.staNo == null){
+ return 0;
+ } else {
+ switch (this.staNo){
+ case 310:
+ return 1;
+ case 312:
+ return 2;
+ case 126:
+ return 1;
+ case 131:
+ return 2;
+ }
+ }
+ return 0;
+ }
+
}
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 ce6b280..91070bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -61,6 +61,8 @@
// private static final Integer jarMaxLoc1 = 7;
private static Integer jarMaxLoc = 0;
+ private static Integer signBigTurn = 0;
+ private static Integer signSmallTurn = 0;
private static final Float jarTemperature = 50F;
@Autowired
private CommonService commonService;
@@ -3098,7 +3100,9 @@
if (wrkMast == null) {
continue;
}
-
+ if (wrkMast.getStaNoSign().equals(signBigTurn)){
+ continue;
+ }
crnStation = crnStation1;
CrnSlave.CrnStn crnStn = null;
@@ -3349,6 +3353,10 @@
// }
}
}
+ signBigTurn++;
+ if (signBigTurn > 2){
+ signBigTurn = 0;
+ }
}
--
Gitblit v1.9.1