*

lsh

2 天以前 0e8ed55d684ed8a683b97a11b8619f15c6e18223

 src/main/java/com/zy/asrs/task/WorkLogScheduler.java

@@ -37,10 +37,13 @@
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
            if(wrkMast.getIoType() != 11){
            if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
                if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
                    continue;
                }
            }
            if (!Cools.isEmpty(wrkMast.getTakeNone()) && wrkMast.getTakeNone().equals("1")){
                continue;
            }
            ReturnT<String> result = workLogHandler.start(wrkMast);
            if (!result.isSuccess()) {
@@ -49,7 +52,7 @@
        }
    }

    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    private void executeArm(){
        List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
        if (basArmMastList.isEmpty()) {
@@ -63,4 +66,18 @@
        }
    }

    @Scheduled(cron = "0/10 * * * * ? ")
    private void executeAgv(){
        List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
        if (basArmMastList.isEmpty()) {
            return;
        }
        for (BasArmMast basArmMast : basArmMastList) {
            ReturnT<String> result = workLogHandler.startArm(basArmMast);
            if (!result.isSuccess()) {
                log.error("ARM工作档[id={}]历史档处理失败", basArmMast.getId());
            }
        }
    }

}