src/main/java/com/zy/asrs/entity/WrkMast.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; } } 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; } }