#1

dubin

1 天以前 42c0a8f901dd3641ef7db01207141a3cd80a52b7

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

@@ -855,7 +855,7 @@
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getModeType() == CrnModeType.AUTO && crnProtocol.getForkPos() == 0 && crnProtocol.getTaskNo() == 0 && crnProtocol.getTaskNoTwo() == 0) {
                News.warnNoLog("" + mark + " - 0" + " - 开始执行堆垛机入出库作业下发");
                if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 0) {
                    News.error("工位1无物，工位2无物");
                    //News.error("工位1无物，工位2无物");
                    //堆垛机没有物料
                    // 如果最近一次是入库模式
                    if (crnProtocol.getLastIo().equals("I")) {
@@ -881,7 +881,7 @@
                    }

                } else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 1) {
                    News.error("工位1有物，工位2有物");
                    //News.error("工位1有物，工位2有物");
                    // 堆垛机有物料
                    WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 1);
                    if (wrkMast != null) {
@@ -894,7 +894,7 @@
                        log.error("" + mark + " - 1" + " - 有物料无工作档  ===》异常");
                    }
                } else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 0) {
                    News.error("工位1有物，工位2无物");
                    //News.error("工位1有物，工位2无物");
                    // 堆垛机工位1有物料
                    WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 1);
                    if (wrkMast != null) {
@@ -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);
@@ -919,7 +923,7 @@
                        log.error("" + mark + " - 1" + " - 有物料无工作档  ===》异常");
                    }
                } else if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 1) {
                    News.error("工位1无物，工位2有物");
                    //News.error("工位1无物，工位2有物");
                    // 堆垛机工位2有物料
                    WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 2);
                    if (wrkMast != null) {
@@ -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);
@@ -961,16 +969,17 @@
     * @return
     */
    private Integer getCrnStation(String locNo) {
        String bay = locNo.substring(2, 5);
        String bay = locNo.substring(2, 5);//0100203
        if (Integer.parseInt(bay) == 1) {
            return 1;
        } else if (Integer.parseInt(bay) == 29) {
            return 2;
        }
        if (Integer.parseInt(locNo.substring(0, 2)) >= 14) {
            return 1;
        } else {
//        if (Integer.parseInt(locNo.substring(0, 2)) >= 14) {
        if (Integer.parseInt(bay) >= 14) {
            return 2;
        } else {
            return 1;
        }
    }

@@ -2043,6 +2052,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 +3805,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));
@@ -3852,7 +3862,10 @@
            // 获取工作状态为11（生成出库ID）的出库工作档
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep107(slave.getId(), crnStn.getStaNo());
            for (WrkMast wrkMast : wrkMasts) {
                if (wrkMast == null || wrkMast.getPltType() == 2) {
//                if (wrkMast == null || wrkMast.getPltType() == 2) {
//                    continue;
//                }
                if (wrkMast == null){
                    continue;
                }
                // 工作档状态判断