#

zhou zhou

4 分钟以前 7fbed15e8429d34b104226f97aee65193525e941

#

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

@@ -419,36 +419,13 @@
    public synchronized void crnStnToOutStn(Integer mark) {

        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            try {
                // 每台堆垛机的所有出库站处理在同一个事务中执行，快速提交释放锁
                mainService.processCrnStnToOutStnForCrn(crnSlave, mark);
            } catch (Exception e) {
                News.error(""+mark+" - crnStnToOutStn"+" - 处理堆垛机{}时发生异常", crnSlave.getId(), e);
                // 继续处理下一台堆垛机，不中断整个流程
            }
        }
    }

    /**
     * 处理单台堆垛机的所有出库站操作（使用独立事务，快速提交释放锁）
     */
    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
    public void processCrnStnToOutStnForCrn(CrnSlave crnSlave, Integer mark) {
        // 遍历堆垛机出库站
        for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
            mainService.processCrnStnToOutStn(crnStn, mark);
        }
    }

    /**
     * 处理单个堆垛机出库站的出库操作（无事务，事务由上层方法管理）
     */
    private void processCrnStnToOutStn(CrnSlave.CrnStn crnStn, Integer mark) {
        // 获取堆垛机出库站信息
        DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
        StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
        if (staProtocol == null) {
            return;
                    continue;
        } else {
            staProtocol = staProtocol.clone();
        }
@@ -456,18 +433,18 @@
            // 查询工作档
            WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(staProtocol.getSiteId());
            if (wrkMast == null) {
                return;
                        continue;
            }
            // 判断工作档条件
            if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
                return;
                        continue;
            }
            // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol.statusType == CrnStatusType.FETCHING || crnProtocol.statusType == CrnStatusType.PUTTING) {
                // 移动中
                return;
                        continue;
            }
            //  判断堆垛机状态等待确认
            if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
@@ -480,7 +457,7 @@
                staProtocol.setWorkNo(wrkMast.getWrkNo());

                if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
                    return;
                            continue;
                }
                wrkMast.setCrnEndTime(new Date());
                if (wrkMastMapper.updateById(wrkMast) != 0) {
@@ -489,7 +466,6 @@
                    crnThread.setResetFlag(true);
                } else {
                    News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
                    throw new CoolException("更新工作档的工作状态为14失败");
                }

            }else {
@@ -502,6 +478,8 @@

        }
    }
        }
    }

    /**
     * 入出库  ===>>  堆垛机入出库作业下发