#

lsh

2024-01-18 e22cafd7f7ce99f5faccffb61ba8280e81fd3015

#

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

@@ -3292,10 +3292,10 @@
            Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
            // 获取LED线程
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
//            // 相同工作号集合则过滤
//            if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
//                continue;
//            }
            // 相同工作号集合则过滤
            if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
                continue;
            }
            // 命令下发 -------------------------------------------------------------------------------
            if (!commands.isEmpty()) {
//                if (led.getId() == 7) {

 src/main/java/com/zy/asrs/utils/RouteUtils.java

@@ -27,6 +27,10 @@
        add(110);add(120);add(111);add(121);
    }};

    public static final List<Integer> MERGE_STA_NO_FIVE = new ArrayList<Integer>() {{
        add(113);add(123);add(114);add(1142);
    }};

//    正序
    public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE = new ArrayList<Integer>() {{
        add(101);add(102);add(104);add(122);add(105);add(107);add(118);add(108);add(119);add(110);add(120);add(111);add(121);add(113);add(123);add(114);add(1142);add(116);add(117);

 src/main/java/com/zy/common/model/MatDto.java

@@ -24,6 +24,9 @@
    //批次
    private String model;

    //卷号
    private String juanNo;

    // 物料数量
    private Double count;

@@ -40,12 +43,14 @@
        this.matNo = matNo;
        this.maknx = maknx;
        this.count = count;
        this.specs = specs;
    }
    public MatDto(WrkDetl wrkDetl) {
        this.matNo = wrkDetl.getMatnr();
        this.maknx = wrkDetl.getMaktx();
        this.specs = wrkDetl.getMatnr();
        this.batch = wrkDetl.getBatch();
        this.juanNo = wrkDetl.getSku();
        this.count = wrkDetl.getAnfme();
    }
}

 src/main/webapp/static/images/zy-logo.png

 src/main/webapp/views/console-old.html

@@ -22,7 +22,7 @@
            <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
        </div>
        <div class="head-right">
            <img src="../static/images/zy-logo.png" alt="中扬" height="44" width="80">
            <img src="../static/images/zy-logo.png" alt="徐工汉云" height="44" width="80">
        </div>
    </div>


 src/main/webapp/views/console.html

@@ -21,7 +21,7 @@
                <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
            </div>
            <div class="head-right">
                <img src="../static/images/zy-logo.png" alt="中扬" height="44" width="80">
<!--                <img src="../static/images/zy-logo.png" alt="徐工汉云" height="44" width="80">-->
            </div>
        </div>
        <!-- 货架 + 堆垛机 + 入库站点 -->

 src/main/webapp/views/index.html

@@ -27,7 +27,7 @@
<!-- 主体内容 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
    Copyright © 2015 All Rights Reserved. <a href="https://www.zoneyung.com" target="_blank">浙江中扬立库技术有限公司</a>  保留所有权利
    Copyright © 2023 All Rights Reserved. <a href="https://www.zoneyung.com" target="_blank">徐工汉云</a>  保留所有权利
</footer>
</body>
<script>

 src/main/webapp/views/monitor/monitor.html

@@ -186,7 +186,7 @@
                    <div class="image-border image-border2"></div>
                    <div class="image-border image-border3"></div>
                    <div class="image-border image-border4"></div>
                    <span>浙江中扬立库技术有限公司</span>
                    <span>徐工汉云</span>
                    <img src="../../static/image/barcode.png">
                </div>
            </div>

 src/main/webapp/views/monitor/monitor0.html

@@ -164,7 +164,7 @@
                    <div class="image-border image-border2"></div>
                    <div class="image-border image-border3"></div>
                    <div class="image-border image-border4"></div>
                    <span>浙江中扬立库技术有限公司</span>
                    <span>徐工汉云</span>
                    <img src="../../static/image/barcode.png">
                </div>
            </div>