| src/main/java/com/zy/asrs/entity/WrkMast.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -551,6 +551,38 @@ return 0; } public boolean booleanStaNoSign(){ if (this.staNo == null){ return false; } else { switch (this.staNo){ case 310: case 312: case 126: case 131: return true; } } return false; } public Integer getStaNoBying(){ if (this.staNo == null){ return 0; } else { switch (this.staNo){ case 310: case 312: return 212; case 126: case 131: return 119; } } return 0; } } src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -25,7 +25,7 @@ public class WrkMastCrnScheduler { private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class); private static Integer signSmallTurn = 0; // private static Integer signSmallTurn = 0; @Autowired private WrkMastCrnHandler wrkMastCrnHandler; @@ -104,27 +104,34 @@ .eq("source_sta_no", staNo).eq("wrk_sts", 11L) .orderBy("io_pri",false)); for (WrkMast wrkMast:wrkMasts){ if (wrkMast.getStaNoSign().equals(signSmallTurn)){ continue; } // if (wrkMast.getStaNoSign().equals(signSmallTurn)){ // continue; // } if (wrkMast.getIoType()==101){ BasDevp basDevp = basDevpService.selectById(119); if (basDevp.getLoading().equals("Y") || !basDevp.getAutoing().equals("Y") || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo())); if (Cools.isEmpty(rgvOneSign)){ continue; } int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y")); if (loadIngCount>8){ if (rgvOneSign.getRgvOneSign()>=2){ continue; } RgvOneSign smallTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallTurn")); if (Cools.isEmpty(smallTurn)){ continue; } if (smallTurn.getRgvOneSign()>15){ continue; } // BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying()); // if (basDevp.getLoading().equals("Y") // || !basDevp.getAutoing().equals("Y") // || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ // continue; // } // int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y")); // if (loadIngCount>8){ // continue; // } // RgvOneSign smallTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallTurn")); // if (Cools.isEmpty(smallTurn)){ // continue; // } // if (smallTurn.getRgvOneSign()>15){ // continue; // } } try{ int row = Utils.getRow(wrkMast.getSourceLocNo()); @@ -133,10 +140,10 @@ if (Cools.isEmpty(wrkMastCrn)){ ReturnT<String> result = wrkMastCrnHandler.start(wrkMast); if (result.isSuccess()) { signSmallTurn++; if (signSmallTurn > 2){ signSmallTurn = 0; } // signSmallTurn++; // if (signSmallTurn > 2){ // signSmallTurn = 0; // } break; } } @@ -145,12 +152,12 @@ log.error("左右双工位堆垛机执行任务生成====》出库任务生成异常："+e.getMessage()); } } if (!wrkMasts.isEmpty()){ signSmallTurn++; if (signSmallTurn > 2){ signSmallTurn = 0; } } // if (!wrkMasts.isEmpty()){ // signSmallTurn++; // if (signSmallTurn > 2){ // signSmallTurn = 0; // } // } } } } src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
@@ -24,7 +24,7 @@ public class WrkMastSplitTwinInItScheduler { private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class); private static Integer signBigTurn = 0; // private static Integer signBigTurn = 0; @Autowired private WrkMastSplitTwinInItHandler wrkMastSplitTwinInItHandler; @@ -111,39 +111,46 @@ break; }else { for (WrkMast wrkMast:wrkMasts){ if (wrkMast.getStaNoSign().equals(signBigTurn)){ continue; } if (wrkMast.getStaNo()>309){ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L)); if (wrkCount>=12){ // if (wrkMast.getStaNoSign().equals(signBigTurn)){ // continue; // } if (wrkMast.booleanStaNoSign()){ RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo())); if (Cools.isEmpty(rgvOneSign)){ continue; } RgvOneSign bigTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigTurn")); if (Cools.isEmpty(bigTurn)){ if (rgvOneSign.getRgvOneSign()>=2){ continue; } if (bigTurn.getRgvOneSign()>13){ continue; } BasDevp basDevp = basDevpService.selectById(212); if (basDevp.getLoading().equals("Y") || !basDevp.getAutoing().equals("Y") || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ continue; } // int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L)); // if (wrkCount>=12){ // continue; // } // RgvOneSign bigTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigTurn")); // if (Cools.isEmpty(bigTurn)){ // continue; // } // if (bigTurn.getRgvOneSign()>13){ // continue; // } // BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying()); // if (basDevp.getLoading().equals("Y") // || !basDevp.getAutoing().equals("Y") // || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ // continue; // } } wrkMastSplitTwinInItHandler.start(wrkMastSplitTwin,wrkMast,2); signBigTurn++; if (signBigTurn > 2){ signBigTurn = 0; } // signBigTurn++; // if (signBigTurn > 2){ // signBigTurn = 0; // } break; } signBigTurn++; if (signBigTurn > 2){ signBigTurn = 0; } // signBigTurn++; // if (signBigTurn > 2){ // signBigTurn = 0; // } break; } }
