#

luxiaotao1123

2020-09-08 216ba7805e9705e32cfe99dfae69cb8114fe62a2

#

 pom.xml

@@ -185,7 +185,7 @@
    </dependencies>

    <build>
        <finalName>gdwcs</finalName>
        <finalName>jswcs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/resources/application.yml

@@ -1,7 +1,7 @@
server:
  port: 9090
  servlet:
    context-path: /gdwcs
    context-path: /jswcs

spring:
  application:
@@ -12,7 +12,7 @@
    #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
    #username: sa
    #password: eisoft
    url: jdbc:sqlserver://localhost:1433;databasename=gdasrs
    url: jdbc:sqlserver://localhost:1433;databasename=jsasrs
    username: sa
    password: sa@123
  mvc:
@@ -62,29 +62,6 @@
      row: 1
      bay: 1
      lev: 1
    # 堆垛机2
  crn[1]:
    id: 2
    ip: 192.168.10.40
    port: 5016
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=0
    offset: 2
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 8
      row: 4
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 6
      row: 3
      bay: 1
      lev: 1
  # 输送线
  devp[0]:
    id: 1
@@ -127,13 +104,6 @@
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1,2
  # LED2
  led[1]:
    id: 2
    ip: 192.168.10.62
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 5,6
  # 磅称
  scale[0]:
    id: 1

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

@@ -118,7 +118,7 @@
}
/* 输送线第一列 */
.site-row-1 {
    left: 100px;
    left: 200px;
}
.site-row-1 .site {
    width: 100px;
@@ -162,12 +162,36 @@
    background-color: yellow;
}

/* ------------------ 台车 ------------------ */
/* 轨道 */
.car-track {
    position: absolute;
    background: url(../image/bg.jpg);
}
#car-track-1 {
    top: 122px;
    left: 100px;
    width: 100px;
    height: 200px;
}

/* 车 */
.car {
    position: absolute;
}
#site-8 {
    top: 122px;
    left: 100px;
    width: 100px;
    height: 40px;
    line-height: 40px
}

/* ------------------ 货架总成 ------------------ */
.main-part {
    position: absolute;
    top: 100px;
    left: 200px;
    left: 300px;
}
.main-part .lane {
    /*margin-bottom: 30px;*/
@@ -307,7 +331,7 @@
    position: absolute;
    background-color:#333!important;
    color: #333 !important;
    width: 95%;
    width: 93%;
    margin-top: 10px;
}

@@ -318,9 +342,9 @@

/* 入库口 */
.cargo-put {
    /*transform: rotateY(180deg);*/
    top: 160px;
    left: 43px;
    transform: rotateY(180deg);
    top: 285px;
    left: 313px;
    position: absolute;
    width: 50px;
    height: 40px;
@@ -329,7 +353,6 @@
    background-size:100% 100%;
    background-position: top center;
}

/* 扫码器 */
.code-decoder {
    position: absolute;
@@ -348,22 +371,11 @@
}
/* 扫码器1 */
#code-decoder-1 {
    top: 144px;
    left: 100px;
    top: 320px;
    left: 200px;
}
/* 扫码器数据1 */
#code-decoder-data-1 {
    font-size: xx-small;
    margin-left: 35px;
}

/* 扫码器1 */
#code-decoder-2 {
    top: 204px;
    left: 100px;
}
/* 扫码器数据1 */
#code-decoder-data-2 {
    font-size: xx-small;
    margin-left: 35px;
}

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/gdwcs";
var baseUrl = "/jswcs";

// 赋值
function setVal(el, val) {

 src/main/webapp/views/console.html

@@ -79,26 +79,27 @@
    <!----------- 工具栏 ---------->
    <!-- 入库口 -->
    <div class="cargo-put"></div>

<!--    &lt;!&ndash; 扫码器 1&ndash;&gt;-->
<!--    <div id="code-decoder-1" class="code-decoder">-->
<!--        <span id="code-decoder-data-1" class="code-decoder-data">0</span>-->
<!--    </div>-->

<!--    &lt;!&ndash; 扫码器 2&ndash;&gt;-->
<!--    <div id="code-decoder-2" class="code-decoder">-->
<!--        <span id="code-decoder-data-2" class="code-decoder-data">0</span>-->
<!--    </div>-->
    <!-- 扫码器 -->
    <div id="code-decoder-1" class="code-decoder">
        <span id="code-decoder-data-1" class="code-decoder-data">0</span>
    </div>


    <!----------- 左输送线 ---------->

    <!-- 台车轨道 -->
    <div id="car-track-1" class="car-track"></div>

    <!-- 台车实例 -->
    <div id="site-8" class="site car">8</div>

    <!-- 第一列（宽度 100px） -->
    <div class="site-row site-row-1">
        <div id="site-1" class="site" style="height: 20px;line-height: 20px;">1</div>
        <div id="site-3" class="site" style="height: 20px;line-height: 20px; margin-top: 20px">3</div>
        <div id="site-5" class="site" style="height: 20px;line-height: 20px; margin-top: 0px">5</div>
        <div id="site-7" class="site" style="height: 20px;line-height: 20px; margin-top: 20px">7</div>
        <div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
        <div id="site-4" class="site" style="height: 40px;line-height: 40px">4</div>
        <div id="site-3" class="site" style="height: 40px;line-height: 40px;">3</div>
        <div id="site-2" class="site" style="height: 40px;line-height: 40px">2</div>
        <div id="site-1" class="site" style="height: 40px;line-height: 40px">1</div>
    </div>

    <!-- 货架 + 堆垛机 + 入库站点 + 出库站点 -->
@@ -108,7 +109,8 @@
            <span class="row-no">1#</span>
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-2" class="site" style="">2</div>
                <div id="site-6" class="site" style="">6</div>
                <button class="item">1</button>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
@@ -142,23 +144,6 @@
                <button class="item">32</button>
                <button class="item">33</button>
                <button class="item">34</button>
                <button class="item">35</button>
                <button class="item">36</button>
                <button class="item">37</button>
                <button class="item">38</button>
                <button class="item">39</button>
                <button class="item">40</button>
                <button class="item">41</button>
                <button class="item">42</button>
                <button class="item">43</button>
                <button class="item">44</button>
                <button class="item">45</button>
                <button class="item">46</button>
                <button class="item">47</button>
                <button class="item">48</button>
                <button class="item">49</button>
                <button class="item">50</button>
                <button class="item">51</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <!-- 堆垛机 -->
@@ -168,7 +153,8 @@
            </div>
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-4" class="site" style="">4</div>
                <div id="site-5" class="site" style="">5</div>
                <button class="item">1</button>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
@@ -202,143 +188,9 @@
                <button class="item">32</button>
                <button class="item">33</button>
                <button class="item">34</button>
                <button class="item">35</button>
                <button class="item">36</button>
                <button class="item">37</button>
                <button class="item">38</button>
                <button class="item">39</button>
                <button class="item">40</button>
                <button class="item">41</button>
                <button class="item">42</button>
                <button class="item">43</button>
                <button class="item">44</button>
                <button class="item">45</button>
                <button class="item">46</button>
                <button class="item">47</button>
                <button class="item">48</button>
                <button class="item">49</button>
                <button class="item">50</button>
                <button class="item">51</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
        </div>
        <div class="lane">
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-6" class="site" style="">6</div>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
                <button class="item">5</button>
                <button class="item">6</button>
                <button class="item">7</button>
                <button class="item">8</button>
                <button class="item">9</button>
                <button class="item">10</button>
                <button class="item">11</button>
                <button class="item">12</button>
                <button class="item">13</button>
                <button class="item">14</button>
                <button class="item">15</button>
                <button class="item">16</button>
                <button class="item">17</button>
                <button class="item">18</button>
                <button class="item">19</button>
                <button class="item">20</button>
                <button class="item">21</button>
                <button class="item">22</button>
                <button class="item">23</button>
                <button class="item">24</button>
                <button class="item">25</button>
                <button class="item">26</button>
                <button class="item">27</button>
                <button class="item">28</button>
                <button class="item">29</button>
                <button class="item">30</button>
                <button class="item">31</button>
                <button class="item">32</button>
                <button class="item">33</button>
                <button class="item">34</button>
                <button class="item">35</button>
                <button class="item">36</button>
                <button class="item">37</button>
                <button class="item">38</button>
                <button class="item">39</button>
                <button class="item">40</button>
                <button class="item">41</button>
                <button class="item">42</button>
                <button class="item">43</button>
                <button class="item">44</button>
                <button class="item">45</button>
                <button class="item">46</button>
                <button class="item">47</button>
                <button class="item">48</button>
                <button class="item">49</button>
                <button class="item">50</button>
                <button class="item">51</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <!-- 堆垛机 -->
            <div class="crn">
                <hr class="pathway">
                <div id="crn-2" class="machine"></div>
            </div>
            <!-- 货架 -->
            <div class="stock-group">
                <div id="site-8" class="site" style="">8</div>
                <button class="item">2</button>
                <button class="item">3</button>
                <button class="item">4</button>
                <button class="item">5</button>
                <button class="item">6</button>
                <button class="item">7</button>
                <button class="item">8</button>
                <button class="item">9</button>
                <button class="item">10</button>
                <button class="item">11</button>
                <button class="item">12</button>
                <button class="item">13</button>
                <button class="item">14</button>
                <button class="item">15</button>
                <button class="item">16</button>
                <button class="item">17</button>
                <button class="item">18</button>
                <button class="item">19</button>
                <button class="item">20</button>
                <button class="item">21</button>
                <button class="item">22</button>
                <button class="item">23</button>
                <button class="item">24</button>
                <button class="item">25</button>
                <button class="item">26</button>
                <button class="item">27</button>
                <button class="item">28</button>
                <button class="item">29</button>
                <button class="item">30</button>
                <button class="item">31</button>
                <button class="item">32</button>
                <button class="item">33</button>
                <button class="item">34</button>
                <button class="item">35</button>
                <button class="item">36</button>
                <button class="item">37</button>
                <button class="item">38</button>
                <button class="item">39</button>
                <button class="item">40</button>
                <button class="item">41</button>
                <button class="item">42</button>
                <button class="item">43</button>
                <button class="item">44</button>
                <button class="item">45</button>
                <button class="item">46</button>
                <button class="item">47</button>
                <button class="item">48</button>
                <button class="item">49</button>
                <button class="item">50</button>
                <button class="item">51</button>
                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
            </div>
            <span class="row-no">4#</span>
            <span class="row-no">2#</span>
        </div>
    </div>
</main>
@@ -607,7 +459,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                    alert(res.msg);
                }
            }
        });
@@ -634,7 +486,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                    alert(res.msg);
                }
            }
        });
@@ -659,9 +511,9 @@
                        }
                    }
                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";
                    window.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                    alert(res.msg);
                }
            }
        });
@@ -680,13 +532,12 @@
                        var crnEl = $("#crn-"+crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        // crnAnimate(crns[i].crnId, crns[i].offset);
                        var unit = $('.item').eq(0).width()+4;
                        crnEl.animate({left: (crns[i].bay * unit + 20) +'px'}, 1000);
                        crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                    alert(res.msg);
                }
            }
        });
@@ -707,7 +558,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                    alert(res.msg);
                }
            }
        });
@@ -827,17 +678,17 @@
    }


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

</script>
</html>