#

zyx

2024-06-05 a7afa6efe2093f8cbd4f5879e83c10683c9d7d21

#

 lib/framework-3.4.5.jar

Binary files differ

 lib/license.lic

Binary files differ

 lib/oscarJDBC8.jar

Binary files differ

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

@@ -48,17 +48,11 @@
//    }};
    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
        add(101);add(102);add(103);add(104);
        add(105);add(106);add(107);add(108);
    }};

    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
        add(201);add(202);add(203);
        add(204);add(205);add(206);
    }};

    public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
        add(301);add(302);add(303);
        add(304);add(305);add(306);
        add(200);add(201);add(202);
        add(210);add(211);add(212);
    }};


@@ -92,8 +86,6 @@
                return staNos1;
            case 2:
                return staNos2;
            case 3:
                return staNos3;
            default:
                throw new CoolException("服务器异常");
        }

 src/main/resources/lib/framework-3.4.5.jar

Binary files differ

 src/main/resources/lib/oscarJDBC8.jar

Binary files differ

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

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

@@ -1,322 +1,78 @@
mapInfo = {
    "mapName": "BJYCWCS",
    "mapName": "WCS",
    "rackCount": 4,
    "crnCount": 3,
    "stbCount": 13,
    "crnCount": 1,
    "stbCount": 10,
    "hpPosition": 0,
    "minBayNo": 1,
    "floors": 1,
    "floors": 2,
    "racks": [{
        "type": "rack",
        "id": "rack1",
        "top": 125,
        "left": 379,
        "width": 1280,
        "height": 22,
        "id": "rack4",
        "top": 351,
        "left": 577,
        "width": 528,
        "height": 32,
        "minBayNo": 1,
        "maxBayNo": 47
        "maxBayNo": 4
    }, {
        "type": "rack",
        "id": "rack1",
        "top": 200,
        "left": 577,
        "width": 528,
        "height": 32,
        "minBayNo": 1,
        "maxBayNo": 4
    }, {
        "type": "rack",
        "id": "rack2",
        "top": 146,
        "left": 379,
        "width": 1280,
        "height": 22,
        "top": 234,
        "left": 577,
        "width": 528,
        "height": 32,
        "minBayNo": 1,
        "maxBayNo": 47
        "maxBayNo": 4
    }, {
        "type": "rack",
        "id": "rack3",
        "top": 194,
        "left": 561,
        "width": 1027,
        "height": 22,
        "minBayNo": 4,
        "maxBayNo": 44
    }, {
        "type": "rack",
        "id": "rack31",
        "top": 194,
        "left": 379,
        "width": 60,
        "height": 22,
        "top": 317,
        "left": 577,
        "width": 528,
        "height": 32,
        "minBayNo": 1,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack32",
        "top": 194,
        "left": 1588,
        "width": 45,
        "height": 22,
        "minBayNo": 47,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack4",
        "top": 215,
        "left": 561,
        "width": 1027,
        "height": 22,
        "minBayNo": 4,
        "maxBayNo": 44
    }, {
        "type": "rack",
        "id": "rack41",
        "top": 215,
        "left": 379,
        "width": 60,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack42",
        "top": 215,
        "left": 1588,
        "width": 45,
        "height": 22,
        "minBayNo": 47,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack11",
        "top": 300,
        "left": 379,
        "width": 1280,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }, {
        "type": "rack",
        "id": "rack12",
        "top": 321,
        "left": 379,
        "width": 1280,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }, {
        "type": "rack",
        "id": "rack13",
        "top": 369,
        "left": 561,
        "width": 1027,
        "height": 22,
        "minBayNo": 4,
        "maxBayNo": 44
    }, {
        "type": "rack",
        "id": "rack131",
        "top": 369,
        "left": 379,
        "width": 60,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack132",
        "top": 369,
        "left": 1588,
        "width": 45,
        "height": 22,
        "minBayNo": 47,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack14",
        "top": 390,
        "left": 561,
        "width": 1027,
        "height": 22,
        "minBayNo": 4,
        "maxBayNo": 44
    }, {
        "type": "rack",
        "id": "rack141",
        "top": 390,
        "left": 379,
        "width": 60,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack142",
        "top": 390,
        "left": 1588,
        "width": 45,
        "height": 22,
        "minBayNo": 47,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack21",
        "top": 475,
        "left": 379,
        "width": 1280,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }, {
        "type": "rack",
        "id": "rack22",
        "top": 496,
        "left": 379,
        "width": 1280,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }, {
        "type": "rack",
        "id": "rack23",
        "top": 544,
        "left": 561,
        "width": 1027,
        "height": 22,
        "minBayNo": 4,
        "maxBayNo": 44
    }, {
        "type": "rack",
        "id": "rack231",
        "top": 544,
        "left": 379,
        "width": 60,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack232",
        "top": 544,
        "left": 1588,
        "width": 45,
        "height": 22,
        "minBayNo": 47,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack24",
        "top": 565,
        "left": 561,
        "width": 1027,
        "height": 22,
        "minBayNo": 4,
        "maxBayNo": 44
    }, {
        "type": "rack",
        "id": "rack241",
        "top": 565,
        "left": 379,
        "width": 60,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 1
    }, {
        "type": "rack",
        "id": "rack242",
        "top": 565,
        "left": 1588,
        "width": 45,
        "height": 22,
        "minBayNo": 47,
        "maxBayNo": 1
        "maxBayNo": 4
    }],
    "rackDescs": [{
        "type": "rackDescs",
        "id": "lb_desc1",
        "text": "#1",
        "top": 125,
        "left": 348,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc2",
        "text": "#2",
        "top": 146,
        "left": 348,
        "width": 30,
        "top": 237,
        "left": 1154,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc3",
        "text": "#3",
        "top": 194,
        "left": 348,
        "top": 317,
        "left": 1154,
        "width": 32,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc1",
        "text": "#1",
        "top": 200,
        "left": 1154,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc4",
        "text": "#4",
        "top": 215,
        "left": 348,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc1",
        "text": "#11",
        "top": 300,
        "left": 348,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc2",
        "text": "#12",
        "top": 321,
        "left": 348,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc3",
        "text": "#13",
        "top": 370,
        "left": 348,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc4",
        "text": "#14",
        "top": 390,
        "left": 348,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc1",
        "text": "#21",
        "top": 475,
        "left": 348,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc2",
        "text": "#22",
        "top": 496,
        "left": 348,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc3",
        "text": "#23",
        "top": 545,
        "left": 348,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc4",
        "text": "#24",
        "top": 565,
        "left": 348,
        "top": 360,
        "left": 1151,
        "width": 33,
        "height": 23
    }],
@@ -324,48 +80,16 @@
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 184,
        "left": 340,
        "width": 1300,
        "top": 293,
        "left": 539,
        "width": 600,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 171,
        "left": 340,
        "width": 93,
        "height": 22
    },{
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 358,
        "left": 340,
        "width": 1300,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 345,
        "left": 340,
        "width": 93,
        "height": 22
    },{
        "type": "track",
        "id": "lb_track3",
        "text": "",
        "top": 533,
        "left": 340,
        "width": 1300,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-3",
        "text": "3",
        "top": 520,
        "left": 340,
        "top": 284,
        "left": 833,
        "width": 93,
        "height": 22
    }],
@@ -373,178 +97,107 @@
        "type": "Control_floor",
        "id": "tabControl_floor1",
        "text": "楼层",
        "top": 68,
        "top": 64,
        "left": 80,
        "width": 1845,
        "height": 676,
        "width": 1389,
        "height": 666,
        "floors": [{
            "type": "floor",
            "id": "page_floor1",
            "text": "1库",
            "text": "1F",
            "top": 4,
            "left": 22,
            "width": 1819,
            "height": 668,
            "width": 1363,
            "height": 658,
            "stns": [{
                "type": "stn",
                "id": "site-104",
                "text": "104",
                "top": 196,
                "left": 501,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-105",
                "text": "105",
                "top": 196,
                "left": 440,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-103",
                "text": "103",
                "top": 217,
                "left": 501,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-106",
                "text": "106",
                "top": 217,
                "left": 440,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-102",
                "text": "102",
                "top": 238,
                "left": 501,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-107",
                "text": "107",
                "top": 238,
                "left": 440,
                "width": 60,
                "height": 20
                "top": 318,
                "left": 342,
                "width": 91,
                "height": 32
            }, {
                "type": "stn",
                "id": "site-101",
                "text": "101",
                "top": 260,
                "left": 501,
                "width": 60,
                "height": 20
                "top": 351,
                "left": 342,
                "width": 91,
                "height": 32
            }, {
                "type": "stn",
                "id": "site-108",
                "text": "108",
                "top": 260,
                "left": 440,
                "width": 60,
                "height": 20
                "id": "site-103",
                "text": "103",
                "top": 318,
                "left": 434,
                "width": 141,
                "height": 32
            }, {
                "type": "stn",
                "id": "site-203",
                "text": "203",
                "top": 371,
                "left": 501,
                "width": 60,
                "height": 20
                "id": "site-104",
                "text": "104",
                "top": 235,
                "left": 448,
                "width": 127,
                "height": 32
            }]
            }, {
                "type": "stn",
                "id": "site-204",
                "text": "204",
                "top": 371,
                "left": 440,
                "width": 60,
                "height": 20
            }, {
            "type": "floor",
            "id": "page_floor2",
            "text": "2F",
            "top": 4,
            "left": 22,
            "width": 1363,
            "height": 658,
            "stns": [{
                "type": "stn",
                "id": "site-202",
                "text": "202",
                "top": 392,
                "left": 501,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-205",
                "text": "205",
                "top": 392,
                "left": 440,
                "width": 60,
                "height": 20
                "top": 386,
                "left": 978,
                "width": 127,
                "height": 32
            }, {
                "type": "stn",
                "id": "site-201",
                "text": "201",
                "top": 413,
                "left": 501,
                "width": 60,
                "height": 20
                "top": 420,
                "left": 978,
                "width": 127,
                "height": 32
            }, {
                "type": "stn",
                "id": "site-206",
                "text": "206",
                "top": 413,
                "left": 440,
                "width": 60,
                "height": 20
                "id": "site-212",
                "text": "212",
                "top": 386,
                "left": 577,
                "width": 160,
                "height": 32
            }, {
                "type": "stn",
                "id": "site-303",
                "text": "303",
                "top": 546,
                "left": 501,
                "width": 60,
                "height": 20
                "id": "site-200",
                "text": "200",
                "top": 454,
                "left": 978,
                "width": 127,
                "height": 32
            }, {
                "type": "stn",
                "id": "site-304",
                "text": "304",
                "top": 546,
                "left": 440,
                "width": 60,
                "height": 20
                "id": "site-211",
                "text": "211",
                "top": 420,
                "left": 577,
                "width": 160,
                "height": 32
            }, {
                "type": "stn",
                "id": "site-302",
                "text": "302",
                "top": 567,
                "left": 501,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-305",
                "text": "305",
                "top": 567,
                "left": 440,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-301",
                "text": "301",
                "top": 588,
                "left": 501,
                "width": 60,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-306",
                "text": "306",
                "top": 588,
                "left": 440,
                "width": 60,
                "height": 20
                "id": "site-210",
                "text": "210",
                "top": 454,
                "left": 577,
                "width": 160,
                "height": 32
            }]
        }]
    }]

 src/main/webapp/views/console.html

@@ -47,11 +47,11 @@
                    <span>堆垛机 1</span>
                    <span class="state-ss machine-put-flag    ">入库</span>
                </div>
                <div class="state">
                    <span>堆垛机 2</span>
                    <span class="state-ss machine-auto-flag    ">自动</span>
<!--                <div class="state">-->
<!--                    <span>堆垛机 2</span>-->
<!--                    <span class="state-ss machine-auto-flag    ">自动</span>-->

                </div>
<!--                </div>-->
                <div class="button"><span>所有状态</span></div>
                <div class="button item-group">
                    <span class="machine-put-flag">入库</span>

 src/main/webapp/views/crn.html

@@ -59,18 +59,18 @@
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn1" disabled="disabled">
                </div>
                <div class="crn-command-item">
                    <label>2#</label>
                    <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn2" disabled="disabled">
                </div>
                <div class="crn-command-item">
                    <label>3#</label>
                    <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn3" disabled="disabled">
                </div>
<!--                <div class="crn-command-item">-->
<!--                    <label>2#</label>-->
<!--                    <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--                    <input id="crn2" disabled="disabled">-->
<!--                </div>-->
<!--                <div class="crn-command-item">-->
<!--                    <label>3#</label>-->
<!--                    <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--                    <input id="crn3" disabled="disabled">-->
<!--                </div>-->
            </div>
            <!-- 堆垛机状态位信息 -->
            <div class="crn-state">
@@ -137,8 +137,8 @@
                    <span class="select-title">堆垛机号</span>
                    <div class="select-container" style="padding: 20px 0;">
                        <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1号堆垛机</label>
                        <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="2">&nbsp;2号堆垛机</label>-->
<!--                        <label><input type="radio" name="crnSelect" value="3">&nbsp;3号堆垛机</label>-->
                    </div>
                </div>
                <!-- 源站/源库位 选择 -->