dubin
2025-11-26 c2f53466b46f8da5648d1528822612509c9dca6f
济南二机床加工线库初始化
4个文件已修改
147 ■■■■ 已修改文件
src/main/resources/application.yml 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/console.map.js 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/crn.html 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml
@@ -84,29 +84,29 @@
#      bay: 120
#      lev: 1
  # 堆垛机2
  crn[1]:
    id: 2
    ip: 172.17.60.20
    port: 102
    rack: 0
    slot: 0
    # 偏移量,当堆垛机站点列号=1时,偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1023
      row: 8
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1026
      row: 9
      bay: 1
      lev: 1
#  crn[1]:
#    id: 2
#    ip: 172.17.60.20
#    port: 102
#    rack: 0
#    slot: 0
#    # 偏移量,当堆垛机站点列号=1时,偏移量=2
#    offset: 2
#    demo: false
#    # 堆垛机入库站点
#    crnInStn[0]:
#      devpPlcId: ${wcs-slave.devp[0].id}
#      staNo: 1023
#      row: 8
#      bay: 1
#      lev: 1
#    # 堆垛机出库站点
#    crnOutStn[0]:
#      devpPlcId: ${wcs-slave.devp[0].id}
#      staNo: 1026
#      row: 9
#      bay: 1
#      lev: 1
  # 堆垛机3
#  crn[2]:
#    id: 3
src/main/webapp/static/js/console.map.js
@@ -16,12 +16,12 @@
        // {"type":"rack","id":"rack16","top":396,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
        // {"type":"rack","id":"rack11","top":287,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
        // {"type":"rack","id":"rack14","top":357,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
        {"type":"rack","id":"rack13","top":341,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
        {"type":"rack","id":"rack12","top":302,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
        {"type":"rack","id":"rack13","top":341,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":32},
        {"type":"rack","id":"rack12","top":302,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":32},
        // {"type":"rack","id":"rack7","top":193,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
        // {"type":"rack","id":"rack10","top":268,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
        {"type":"rack","id":"rack9","top":249,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
        {"type":"rack","id":"rack8","top":212,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
        // {"type":"rack","id":"rack9","top":249,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
        // {"type":"rack","id":"rack8","top":212,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
        // {"type":"rack","id":"rack2","top":83,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
        // {"type":"rack","id":"rack3","top":103,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
        // {"type":"rack","id":"rack6","top":174,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31}
@@ -35,10 +35,10 @@
        // {"type":"crane","id":"crn-6","text":"6","top":597,"left":731,"width":67,"height":13},
        // {"type":"crane","id":"crn-1","text":"1","top":162,"left":730,"width":67,"height":13},
        // {"type":"track","id":"lb_track3","text":"","top":424,"left":593,"width":733,"height":1},
        {"type":"crane","id":"crn-2","text":"2","top":234,"left":741,"width":67,"height":13},
        {"type":"track","id":"lb_track4","text":"","top":333,"left":593,"width":733,"height":1},
        {"type":"crane","id":"crn-3","text":"3","top":325,"left":730,"width":67,"height":13},
        {"type":"track","id":"lb_track5","text":"","top":241,"left":595,"width":733,"height":1},
        // {"type":"crane","id":"crn-2","text":"2","top":234,"left":741,"width":67,"height":13},
        {"type":"track","id":"lb_track4","text":"","top":333,"left":400,"width":1100,"height":1},
        {"type":"crane","id":"crn-3","text":"3","top":325,"left":1450,"width":67,"height":13},
        // {"type":"track","id":"lb_track5","text":"","top":241,"left":595,"width":733,"height":1},
        // {"type":"track","id":"lb_track6","text":"","top":168,"left":596,"width":733,"height":1},
        // {"type":"crane","id":"crn-4","text":"4","top":417,"left":730,"width":67,"height":13}
    ],
@@ -100,14 +100,15 @@
                    // {"type":"stn","id":"site-1038","text":"1038","top":418,"left":501,"width":67,"height":45},
                    // {"type":"stn","id":"site-1036","text":"1036","top":397,"left":571,"width":67,"height":17},
                    // {"type":"stn","id":"site-1035","text":"1035","top":398,"left":501,"width":67,"height":17},
                    {"type":"stn","id":"site-101","text":"101","top":344,"left":571,"width":67,"height":17},
                    {"type":"stn","id":"site-102","text":"102","top":336,"left":501,"width":67,"height":25},
                    {"type":"stn","id":"site-203","text":"203","top":344,"left":1500,"width":67,"height":17},
                    {"type":"stn","id":"site-204","text":"204","top":344,"left":1570,"width":67,"height":17},
                    // {"type":"stn","id":"site-1029","text":"1029","top":308,"left":571,"width":67,"height":17},
                    {"type":"stn","id":"site-103","text":"103","top":306,"left":501,"width":67,"height":25},
                    {"type":"stn","id":"site-201","text":"201","top":306,"left":1500,"width":67,"height":17},
                    // {"type":"stn","id":"site-1026","text":"1026","top":250,"left":571,"width":67,"height":17},
                    {"type":"stn","id":"site-104","text":"104","top":274,"left":501,"width":67,"height":25},
                    {"type":"stn","id":"site-106","text":"106","top":252,"left":571,"width":67,"height":17},
                    {"type":"stn","id":"site-105","text":"105","top":243,"left":501,"width":67,"height":25},
                    {"type":"stn","id":"site-202","text":"202","top":306,"left":1570,"width":67,"height":17},
                    {"type":"stn","id":"site-205","text":"205","top":370,"left":1200,"width":67,"height":17},
                    // {"type":"stn","id":"site-106","text":"106","top":252,"left":571,"width":67,"height":17},
                    // {"type":"stn","id":"site-105","text":"105","top":243,"left":501,"width":67,"height":25},
                    // {"type":"stn","id":"site-1020","text":"1020","top":177,"left":571,"width":67,"height":17},
                    // {"type":"stn","id":"site-1019","text":"1019","top":178,"left":502,"width":67,"height":17},
                    // {"type":"stn","id":"site-1016","text":"1016","top":142,"left":571,"width":67,"height":17},
src/main/webapp/views/crn.html
@@ -59,36 +59,36 @@
                    <!--            <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>4#</label>
                    <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
                    <!--            <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>6#</label>
                    <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn6" 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 class="crn-command-item">-->
<!--                    <label>4#</label>-->
<!--                    <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--                    <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>-->
<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--                    <input id="crn5" disabled="disabled">-->
<!--                </div>-->
<!--                <div class="crn-command-item">-->
<!--                    <label>6#</label>-->
<!--                    <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--                    <input id="crn6" disabled="disabled">-->
<!--                </div>-->
            </div>
            <!-- 堆垛机状态位信息 -->
            <div class="crn-state">
@@ -159,11 +159,11 @@
                    <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="4">&nbsp;4号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="6">&nbsp;6号堆垛机</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="4">&nbsp;4号堆垛机</label>-->
<!--                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5号堆垛机</label>-->
<!--                        <label><input type="radio" name="crnSelect" value="6">&nbsp;6号堆垛机</label>-->
                    </div>
                </div>
                <!-- 源站/源库位 选择 -->
src/main/webapp/views/index.html
@@ -24,7 +24,7 @@
            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
            <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li>
            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>
            <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>
<!--            <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>-->
        </ul>
    </div>
</div>