*

L

1 天以前 e2a14112a81740481623dc16bbd1301432ce34b0

*

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -763,17 +763,23 @@
                        }
                        List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<TaskWrkLog>().eq("CRN_NO",crnProtocol.getLaneNo()).orderBy("COMPLETE_TIME",false));
                        if (!taskWrkLogs.isEmpty()) {
                            TaskWrkLog taskWrkLog = taskWrkLogs.get(0);
                            Date completeTime = taskWrkLog.getCompleteTime();
                            if (completeTime==null){
                                completeTime = taskWrkLog.getCancelTime();
                            boolean signT = false;
                            for (TaskWrkLog taskWrkLog : taskWrkLogs){
                                Date completeTime = taskWrkLog.getCompleteTime();
                                if (completeTime==null){
                                    completeTime = taskWrkLog.getModiTime();
                                    continue;
                                }
                                long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(completeTime, new Date());
                                if (differenceInSeconds <= 60*2*1000) {
                                    signT = true;
                                    break;
                                } else {
                                    signT = false;
                                    break;
                                }
                            }
                            long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(completeTime, new Date());
                            if (differenceInSeconds <= 60*10*1000) {
                                return;
                            if (signT){
                                continue;
                            }
                        }
                        // 命令下发区 --------------------------------------------------------------------------

 src/main/java/com/zy/core/MainProcess.java

@@ -47,6 +47,8 @@
                    mainService.storeFinished();
                    // 任务下发
                    mainService.taskStart();
                    // 出库  ===>>  堆垛机2分钟无任务则回到源点
                    mainService.crnStnToOutStnSou();
                } catch (Exception e) {
                    e.printStackTrace();
                }
@@ -67,8 +69,6 @@
                    mainService.crnStnToOutStn();
                    // 堆垛机异常信息记录
                    mainService.recCrnErr();
                    // 出库  ===>>  堆垛机10分钟无任务则回到源点
                    mainService.crnStnToOutStnSou();
                    // 输送线异常信息记录
//                    mainService.recDevErr();
                    // 出库  ===>> 工作档信息写入led显示器

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -286,6 +286,7 @@
            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
            deviceErrorService.addDeviceError("crnWriteIng", slave.getId(), "巷道号"+command.getLaneNo()+";堆垛机待下发指令:"+JSON.toJSONString(command.getNowTask()));
        } catch (Exception e){
            log.error("crnWriteIng新增异常");
        }

        try{
@@ -320,7 +321,7 @@

        try{
            Thread.sleep(50L);
        } catch (Exception e){}
        } catch (Exception e){log.error("延时异常324行");}

        log.info("堆垛机任务写100.0：值：array crnWrite-317行;array:"+JSON.toJSONString(array));
        OperateResult result = siemensNet.Write("DB100.0", array);
@@ -330,8 +331,8 @@
            i++;
            //堆垛机任务写入后，回读一次，看是否成功
            try{
                Thread.sleep(100L);
            } catch (Exception e){}
                Thread.sleep(50L);
            } catch (Exception e){log.error("延时异常335行");}

            log.info("堆垛机任务读100.0：值：20 crnWrite-317行;");
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);