联调

dubin

5 天以前 5c423ac136ae1e4cd3627fd3a8eb1b26fe5bb3ca

联调

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

@@ -903,6 +903,10 @@
                        if (wrkMast.getIoType() >= 100) {
                            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep1(crn.getId(), wrkMast.getSourceStaNo());
                            if (wrkMast1 != null) {
                                if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(2,5)) == 1){
                                    this.outPut(crn, crnProtocol, mark);
                                    continue;
                                }
                                this.outTake(crn, crnProtocol, 2, mark);
                            } else {
                                this.outPut(crn, crnProtocol, mark);
@@ -928,6 +932,10 @@
                        if (wrkMast.getIoType() >= 100) {
                            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep1(crn.getId(), wrkMast.getSourceStaNo());
                            if (wrkMast1 != null) {
                                if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(2,5)) == 29){
                                    this.outPut(crn, crnProtocol, mark);
                                    continue;
                                }
                                this.outTake(crn, crnProtocol, 1, mark);
                            } else {
                                this.outPut(crn, crnProtocol, mark);
@@ -2043,6 +2051,7 @@
            // 修改工作档状态 11.生成出库ID => 12.吊车出库中
            Date now = new Date();
            wrkMast.setWrkSts(12L);
            wrkMast.setPltType(crnStation);
            wrkMast.setCrnStrTime(now);
            wrkMast.setModiTime(now);
            if (wrkMastMapper.updateById(wrkMast) == 0) {
@@ -3795,7 +3804,7 @@
            }

            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getTaskNoTwo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO && crnProtocol.getStatusTypeTwo()== CrnStatusType.IDLE) {
                if (crnProtocol.getCrnNo() == 1 && crnProtocol.getBay() == 11 && crnProtocol.getLevel() == 1) {
                if (crnProtocol.getBay() == 11 && crnProtocol.getLevel() == 1) {
                    continue;
                }
                Page<BasCrnOpt> basCrnOptPage = crnOptService.selectPage(new Page<>(1, 1), new EntityWrapper<BasCrnOpt>().eq("crn_no", crn.getId()).orderBy("send_time", false));

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

@@ -533,8 +533,8 @@
//        convertRow(command);
        command.setCrnNo(slave.getId());
//        short[] array = new short[10];
        short[] array = new short[9];
        //array[0] = command.getAckFinish(); // 任务完成确认位
        short[] array = new short[10];
//        array[0] = command.getAckFinish(); // 任务完成确认位
        array[0] = command.getTaskNo();  // 任务号
        array[1] = command.getTaskMode();  // 模式
        array[2] = command.getSourcePosX(); // 源位置排号
@@ -551,6 +551,7 @@
        OperateResult result = siemensNet.Write("DB100.20", array);
        OperateResult result2 = siemensNet.Write("DB100.0", array2);
        News.info("堆垛机工位2命令下发[id:{}] >>>>> {}", slave.getId(), array);
        News.info("堆垛机工位2任务完成确认位下发[id:{}] >>>>> {}", slave.getId(), array2);

        int writeCount1 = 1;
        do {
@@ -558,7 +559,7 @@
                if (!result.IsSuccess || !result2.IsSuccess) {
//                    if (!resetFlag){
                    News.error("写入堆垛机工位2plc数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(command), writeCount1);
                    result = siemensNet.Write("DB100.0", array);
                    result = siemensNet.Write("DB100.20", array);
//                    }
                    Thread.sleep(100);
                    writeCount1++;
@@ -599,7 +600,7 @@
                        }
//                        if (!resetFlag){
                        News.error("写入堆垛机工位2plc数据失败，重新下发任务  回读不一致 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(command), writeCount1);
                        result = siemensNet.Write("DB100.0", array);
                        result = siemensNet.Write("DB100.20", array);
//                        }
                        writeCount1++;
                        continue;