#newVersion

luxiaotao1123

2020-12-24 2044b41581f7188b3989a0e7f1f50787f5c8fdc8

#newVersion

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

@@ -7,7 +7,9 @@
import com.core.common.Arith;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -236,6 +238,30 @@
        if (result.IsSuccess) {
            log.info("堆垛机命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));

            try {
                // 日志记录
                BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
                BasCrnOpt basCrnOpt = new BasCrnOpt(
                        command.getTaskNo().intValue(),    // 任务号
                        command.getCrnNo(),    // 堆垛机[非空]
                        new Date(),    // 下发时间
                        command.getTaskModeType().toString(),    // 模式
                        command.getSourcePosX().intValue(),    // 源排
                        command.getSourcePosY().intValue(),    // 源列
                        command.getSourcePosZ().intValue(),    // 源层
                        null,    // 源站
                        command.getDestinationPosX().intValue(),    // 目标排
                        command.getDestinationPosY().intValue(),    // 目标列
                        command.getDestinationPosZ().intValue(),    // 目标层
                        null,    // 目标站
                        null,    // 响应结果
                        null,    // 修改时间
                        null    // 修改人员
                );
                bean.insert(basCrnOpt);
            } catch (Exception ignore) {}

            return true;
        } else {
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】写入堆垛机plc数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));

 src/main/webapp/static/css/console.css

@@ -124,6 +124,24 @@
    width: 100px;
}

/* 输送线第二列 */
.site-row-2 {
    top: 226px;
    left: 440px;
}
.site-row-2 .site {
    width: 80px;
}

/* 输送线第三列 */
.site-row-3 {
    top: 226px;
    left: 520px;
}
.site-row-3 .site {
    width: 80px;
}

/* 站点 */
.site {
    color: #333;

 src/main/webapp/views/console.html

@@ -104,9 +104,22 @@
        <div id="site-1" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">1</div>
    </div>

    <!-- 第二列（宽度 100px） -->
    <div class="site-row site-row-2">
        <div id="site-103" class="site" style="height: 20px;line-height: 20px">103</div>
        <div id="site-104" class="site" style="height: 20px;line-height: 20px">104</div>
        <div id="site-105" class="site" style="height: 20px;line-height: 20px">105</div>
    </div>

    <!-- 第二列（宽度 100px） -->
    <div class="site-row site-row-3">
        <div id="site-102" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">102</div>
        <div id="site-106" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">106</div>
    </div>

    <!-- 货架 + 堆垛机 + 入库站点 + 出库站点 -->
    <div class="main-part">
        <!--第一排-->
        <!--第一组-->
        <div class="lane">
            <span class="row-no">1#</span>
            <!-- 货架 -->
@@ -193,6 +206,74 @@
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <span class="row-no">2#</span>
        </div>
        <!--第二组-->
        <div class="lane" style="margin-left: 300px">
            <span class="row-no">3#</span>
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-101" class="site" style="">101</div>
                <button class="item">2</button>
                <button class="item">4</button>
                <button class="item">6</button>
                <button class="item">8</button>
                <button class="item">10</button>
                <button class="item">12</button>
                <button class="item">14</button>
                <button class="item">16</button>
                <button class="item">18</button>
                <button class="item">20</button>
                <button class="item">22</button>
                <button class="item">24</button>
                <button class="item">26</button>
                <button class="item">28</button>
                <button class="item">30</button>
                <button class="item">32</button>
                <button class="item">34</button>
                <button class="item">36</button>
                <button class="item">38</button>
                <button class="item">40</button>
                <button class="item">42</button>
                <button class="item">44</button>
                <button class="item">46</button>
                <button class="item">48</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <!-- 堆垛机 -->
            <div class="crn">
                <hr class="pathway" style="width: 67.5%">
                <div id="crn-2" class="machine"></div>
            </div>
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-107" class="site" style="">107</div>
                <button class="item">2</button>
                <button class="item">4</button>
                <button class="item">6</button>
                <button class="item">8</button>
                <button class="item">10</button>
                <button class="item">12</button>
                <button class="item">14</button>
                <button class="item">16</button>
                <button class="item">18</button>
                <button class="item">20</button>
                <button class="item">22</button>
                <button class="item">24</button>
                <button class="item">26</button>
                <button class="item">28</button>
                <button class="item">30</button>
                <button class="item">32</button>
                <button class="item">34</button>
                <button class="item">36</button>
                <button class="item">38</button>
                <button class="item">40</button>
                <button class="item">42</button>
                <button class="item">44</button>
                <button class="item">46</button>
                <button class="item">48</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <span class="row-no">4#</span>
        </div>
    </div>
</main>
@@ -684,20 +765,6 @@
        }
        $("#site-" + id).animate({top: targetTop+'px'}, 1000);
    }


    // 台车点击事件
    $(document).on("click", ".item", function () {
        var value = prompt('目标站：', "1");
        if (value == null) {
            alert('不能为空！');
        } else if (value === '') {
            alert('不能为空！');
        } else {
            carAnimate(8, Number(value));
            // $("#site-" + 8).animate({top: (Number(value) + 122) +'px'}, 1000);
        }
    })

</script>
</html>