#

pang.jiabao

2024-08-07 dfafabacf23bf22181d7c3f3665e684be7921f7d

#

 src/main/java/com/zy/controller/ConsoleController.java

@@ -141,8 +141,8 @@

//            Short totalBay = locMastMapper.selectTotalBay();

            vo.setOffset((double) new Random().nextInt(560));     //  堆垛机偏移量
            vo.setBay((short) (crnProtocol.getBay() - crn.getOffset()));    //  当前列
            vo.setOffset((double) new Random().nextInt(500));     //  堆垛机偏移量
            vo.setBay((short) (crnProtocol.getBay()));    //  当前列
            /**
             * 堆垛机状态判断
             */

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

@@ -1055,8 +1055,10 @@
                    break;
//                    continue;
                }
                // 107无物才能出，其他有转运架才能出
                boolean loading = (staProtocol.getSiteId() == 107) != staProtocol.isLoading();
                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                if (staProtocol.isAutoing() && loading && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                    // 命令下发区 --------------------------------------------------------------------------
                    log.warn("堆垛机出库命令下发："+staProtocol.getWorkNo()+","+staProtocol.isOutEnable()+","+staProtocol.getSiteId());
@@ -3042,11 +3044,11 @@

        if (wrkMast.getStaNo() == 104) {
            // 判断出库站点情况,可入，堆垛机可以取货，可出，堆垛机可以放货
            if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable()) {
            if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable() || !staProtocol105.isLoading()) {
                return;
            }
        } else if (wrkMast.getStaNo() == 107) {
            if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable()) {
            if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable() || staProtocol107.isLoading()) {
                return;
            }
        }

 src/main/resources/application.yml

@@ -84,7 +84,7 @@
    crnOutStn[2]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 107
      row: 2
      row: 1
      bay: 28
      lev: 1
    crnOutStn[3]:

 src/main/webapp/views/console.html

@@ -595,37 +595,38 @@
                    for (var i = 0; i < crns.length; i++) {
                        var crnEl = $("#crn-" + crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        var unit = 0;//($('.item').eq(0).width() + 13) / 2;
                        var unit = 31;//($('.item').eq(0).width() + 13) / 2;

                        if (crns[i].bay < 0 || crns[i].bay === -2) {
                            crns[i].bay = 1
                        }
                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
                        // crns[i].bay = 15;
                        var offSet = 0;
                        switch (i) {
                            case 0:
                            case 1:
                            case 2:
                            case 3:
                                unit = 35;
                                offSet = 500;
                                break;
                            case 5:
                                unit = 124;
                                offSet = 550;
                                break;
                            case 4:
                            case 6:
                                unit = 62;
                                offSet = 550;
                                break;
                        }

                        var offSet = 1450;
                        // switch (i) 5
                        //     case 0:
                        //     case 1:
                        //     case 2:
                        //     case 3:
                        //         unit = 35;
                        //         offSet = 500;
                        //         break;
                        //     case 5:
                        //         unit = 124;
                        //         offSet = 550;
                        //         break;
                        //     case 4:
                        //     case 6:
                        //         unit = 62;
                        //         offSet = 550;
                        //         break;
                        // }
                        console.log(offSet)
                        if(crns[i].bay === 1){
                            crnEl.animate({left: offSet + 'px'}, 1000);
                        } else {
                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
                            let lf = (offSet - crns[i].bay * 42);
                            crnEl.animate({left: lf + 'px'}, 1000);
                        }

                    }