#

luxiaotao1123

2022-09-08 0da95c97fe87a359eefceeaeb25f9d62bc908e2e

#

 src/main/java/com/zy/core/enums/SteLocaType.java

@@ -2,6 +2,7 @@

public enum SteLocaType {

    NONE(0, "未知"),
    A(1, "A点"),
    B(2, "B点"),
    A_WAITING(3, "A待机点"),

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

@@ -75,7 +75,7 @@
//            log.info("条码扫描仪连接成功 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        } catch (Exception e) {
            socket = null;
            log.error("条码扫描仪连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
//            log.error("条码扫描仪连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            return false;
        }
        return true;

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

@@ -66,7 +66,7 @@
//            log.info("条码扫描仪连接成功 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        } catch (Exception e) {
            socket = null;
            log.error("条码扫描仪连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            log.error("磅秤扫描仪连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            return false;
        }
        return true;

 src/main/webapp/views/ste.html

@@ -109,17 +109,17 @@
                            <button class="item" onclick="steOperator(2)">右出库</button>
                            <button class="item" onclick="steOperator(3)">左入库</button>
                            <button class="item" onclick="steOperator(4)">右入库</button>
                            <button class="item" onclick="steOperator(5)">左移库</button>
                            <button class="item" onclick="steOperator(6)">右移库</button>
                            <button class="item" onclick="steOperator(7)">原点</button>
                            <button class="item" onclick="steOperator(8)">远点</button>
                            <button class="item" onclick="steOperator(9)">A 点</button>
                            <button class="item" onclick="steOperator(10)">B 点</button>
                            <button class="item" onclick="steOperator(11)">左搬移</button>
                            <button class="item" onclick="steOperator(12)">右搬移</button>
<!--                            <button class="item" onclick="steOperator(5)">左移库</button>-->
<!--                            <button class="item" onclick="steOperator(6)">右移库</button>-->
                            <button class="item" onclick="steOperator(7)">去右端</button>
                            <button class="item" onclick="steOperator(8)">去左端</button>
<!--                            <button class="item" onclick="steOperator(9)">A 点</button>-->
<!--                            <button class="item" onclick="steOperator(10)">B 点</button>-->
<!--                            <button class="item" onclick="steOperator(11)">左搬移</button>-->
<!--                            <button class="item" onclick="steOperator(12)">右搬移</button>-->
                            <button class="item" onclick="steOperator(13)">充电</button>
                            <button class="item" onclick="steOperator(14)">左盘点</button>
                            <button class="item" onclick="steOperator(15)">右盘点</button>
<!--                            <button class="item" onclick="steOperator(14)">左盘点</button>-->
<!--                            <button class="item" onclick="steOperator(15)">右盘点</button>-->
                            <button class="item" onclick="steOperator(16)">任务完成</button>
                        </div>
                    </fieldset>