#

zzgtfwq

2 天以前 5bf9fc880a56385f0b49e8cd3a05eced20d616d1

#

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

@@ -1203,10 +1203,15 @@
                        crnCommand.setTaskNo((short)999); // 工作号
                        crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                        crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式:  站位移转4
                        crnCommand.setSourcePosX((short) 1);     // 源库位排
                        Integer crnNo = crnProtocol.getCrnNo();
                        int row1 = crnNo * 4;
                        if (crnNo>2){
                            row1 = row1-2;
                        }
                        crnCommand.setSourcePosX((short) row1);     // 源库位排
                        crnCommand.setSourcePosY((short) 1);     // 源库位列
                        crnCommand.setSourcePosZ((short) 1);   // 源库位层
                        crnCommand.setDestinationPosX((short) 1);     // 目标库位排
                        crnCommand.setDestinationPosX((short) row1);     // 目标库位排
                        crnCommand.setDestinationPosY((short) 1);     // 目标库位层
                        crnCommand.setDestinationPosZ((short) 1);     // 目标库位列
                        if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {

 src/main/webapp/static/js/console.map.js

@@ -289,6 +289,7 @@
            "width": 2900,
            "height": 600,
            "stns": [
                { "type": "stn", "id": "site-125", "text": "125", "top": 416, "left": 1162, "width": 54, "height": 20 },
            ],
            "barcode": []
        },

 src/main/webapp/views/crn.html

@@ -77,12 +77,12 @@
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn4" disabled="disabled">
                </div>
                <div class="crn-command-item">
                    <label>5#</label>
                    <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn5" disabled="disabled">
                </div>
<!--                <div class="crn-command-item">-->
<!--                    <label>5#</label>-->
<!--                    <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--                    <input id="crn5" disabled="disabled">-->
<!--                </div>-->
            </div>
            <!-- 堆垛机状态位信息 -->
            <div class="crn-state">
@@ -152,7 +152,7 @@
                        <label><input type="radio" name="crnSelect" value="2">&nbsp;2号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="3">&nbsp;3号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5号堆垛机</label>
<!--                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5号堆垛机</label>-->
                    </div>
                </div>
                <!-- 源站/源库位 选择 -->