Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs

luxiaotao1123

2022-03-01 adbda4e54b89ea45d42fbb5079c93023dc702520

Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -33,10 +33,7 @@
import com.zy.core.thread.ScaleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.*;

@@ -282,7 +279,7 @@
        return R.ok();
    }

    @PostMapping("/barcode/output/site")
    @GetMapping("/barcode/output/site")
    public R crnOutput(){
//        StringBuilder str = new StringBuilder();
//        String s;

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

@@ -298,8 +298,7 @@
    /**
     * 拣料、并板、盘点再入库
     */
    @Async
    public void stnToCrnStnPick(){
    public synchronized void stnToCrnStnPick(){
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历拣料入库口
            for (DevpSlave.Sta pickSta : devp.getPickSta()) {

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

@@ -151,7 +151,7 @@
            }
        } else {
            page.newLine("自动化立体仓库");
            page.newLine("西格邁股份有限公司");
            page.newLine("西格迈股份有限公司");
        }

        // 设置字体

 src/main/resources/application.yml

@@ -180,7 +180,7 @@
      staNo: 182
    # 拣料入库口
    pickSta[0]:
      staNo: 173
      staNo: 176
      barcode: ${wcs-slave.barcode[0].id}
  # 条码扫描仪
  barcode[0]:

 src/main/webapp/views/console.html

@@ -972,36 +972,24 @@
                <div class="table-head">
                    <li><span>条码名称</span><span class="right">扫码时间</span></li>
                </div>
                <div class="table-body">
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                <div id="barcode1" class="table-body">

                </div>
            </div>
            <div class="tablebox">
                <div class="table-head">
                    <li><span>条码名称</span><span class="right">扫码时间</span></li>
                </div>
                <div class="table-body">
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                <div id="barcode2" class="table-body">

                </div>
            </div>
            <div class="tablebox">
                <div class="table-head">
                    <li><span>条码名称</span><span class="right">扫码时间</span></li>
                </div>
                <div class="table-body">
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                    <li><span>出库单1</span><span class="right">12-12 12:12</span></li>
                <div id="barcode3" class="table-body">

                </div>
            </div>
        </div>
@@ -1230,6 +1218,67 @@

</body>
</html>
<script>
    var tData = []
    var tDate1 = []
    var tDate2 = []
    var tDate3 = []
    function getCodeData(){
        $.ajax({
            url:baseUrl +'/console/barcode/output/site',
            method:'GET',
            success:function (res) {
                if(res.code === 200){
                    tData = eval(res.data);
                    console.log(tData)
                    if(tData.length<=5){
                        tData1 = tData
                    } else if (tData.length<=10){
                        tDate1 = tData.slice(0,5)
                        tData.splice(0,5)
                        tDate2 = tData
                        console.log(tDate2)
                    } else if(tData.length<=15){
                        tDate1 = tData.slice(0,5)
                        tDate2 = tData.slice(6,10)
                        tData.splice(0,10)
                        tDate3 = tData
                        console.log(tDate3)
                    } else {
                        tData = tData.slice(-15)
                        tDate1 = tData.slice(-15)
                        tDate2 = tData.slice(-10)
                        tDate3 = tData.slice(-5)

                    }
                }
            }
        })
    }
    setInterval(function () {
        getCodeData();
        renderBarCode();
    }, 1000)




    function renderBarCode() {
        for (var i = 0;i<tDate1.length;i++){
            console.log(tDate1[i])
            var str1 = '<li><span>' + tDate1[i].barcode + '</span><span class="right">' + tDate1[i].time + '</span></li>'
            $('#barcode1').append(str1)
        }
        for(var j = 0;j<tDate2.length;j++){
            var str2 = '<li><span>' + tDate2[j].barcode + '</span><span class="right">' + tDate2[j].time + '</span></li>'
            $('#barcode2').append(str2)
        }
        for(var k = 0;k<tDate3.length;k++){
            var str3 = '<li><span>' + tDate3[k].barcode + '</span><span class="right">' + tDate3[k].time + '</span></li>'
            $('#barcode3').append(str3)
        }
    }
</script>
<script type="text/javascript">
    // 弹窗站点信息
    $('.site').on('click',function(){
@@ -1248,7 +1297,7 @@
            },
            method:'post',
            success:function (res) {
                for (var val in data) {
                for (var val in res.data) {
                    var find = $("#siteWindow").find(":input[name='" + val + "']");
                    if (find[0].type==='text') {
                        find.val(data[val]);
@@ -1259,15 +1308,6 @@
            }

        })
        // res.data
        for (var val in data) {
            var find = $("#siteWindow").find(":input[name='" + val + "']");
            if (find[0].type==='text') {
                find.val(data[val]);
            } else if (find[0].type === 'checkbox') {
                find.attr("checked", data[val] === 'Y');
            }
        }

    });
    // 堆垛机信息
@@ -1277,17 +1317,28 @@
        $("#siteWindow").attr("style","display:none;");
        $('.detailed').empty();
        $('.detailed').append(id+'号堆垛机');
        $.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
            console.log(res)
            for (var val in res.data) {
                var find = $("#crnWindow").find(":input[name='" + val + "']");
                if (find[0].type==='text') {
                    find.val(res.data[val]);
                } else if (find[0].type === 'checkbox') {
                    find.attr("checked", res.data[val] === 'Y');
        $.ajax({
            url:baseUrl+"/console/crn/detail",
            headers:{
                'token': localStorage.getItem('token')
            },
            data:{
                crnNo: id
            },
            method:'post',
            success:function (res) {
                for (var val in res.data) {
                    var find = $("#crnWindow").find(":input[name='" + val + "']");
                    if (find[0].type==='text') {
                        find.val(res.data[val]);
                    } else if (find[0].type === 'checkbox') {
                        find.attr("checked", res.data[val] === 'Y');
                    }
                }
            }

        })

    })
    // 弹窗关闭
    $('button').on('click',function(){