#console 下发输送线和堆垛机命令

Junjie

2023-11-27 95a8a2bd5b418980860fcaac6a6f5293e9cd65f2

#console 下发输送线和堆垛机命令

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

@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceErrorService;
import com.zy.asrs.service.WrkMastService;
@@ -67,6 +68,8 @@
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private DeviceErrorService deviceErrorService;
    @Autowired
    private BasCrnpService basCrnpService;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -310,6 +313,11 @@
        CrnDetailVo vo = new CrnDetailVo();
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            if (crnSlave.getId().equals(crnNo)) {
                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
                if (basCrnp == null) {
                    return R.error("数据库维护异常");
                }

                SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                vo.setCrnNo(crnNo);
@@ -334,6 +342,8 @@
                        vo.setError("");    // todo
                    }
                }
                vo.setInEnable(basCrnp.getInEnable());//可入
                vo.setOutEnable(basCrnp.getOutEnable());//可出
                return R.ok().add(vo);
            }
        }

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

@@ -198,9 +198,9 @@
    public R siteDetlUpdate(@RequestParam Integer devNo,
                            @RequestParam Short workNo,
                            @RequestParam Short staNo,
                            @RequestParam String pakMk,
                            @RequestParam Boolean inEnable,
                            @RequestParam Boolean outEnable
                            @RequestParam(required = false) String pakMk,
                            @RequestParam(required = false) Boolean inEnable,
                            @RequestParam(required = false) Boolean outEnable
    ) {
        BasDevp basDevp = basDevpService.selectById(devNo);
        if (basDevp == null) {

 src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java

@@ -39,4 +39,10 @@
    // 异常
    private String error = "";

    // 可入
    private String inEnable = "";

    // 可出
    private String outEnable = "";

}

 src/main/webapp/views/realtimeWatch/console.html

@@ -7,9 +7,6 @@
    <link rel="stylesheet" href="../../static/wms/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">

<!--    <script src="../../static/wcs/js/jquery/jquery-3.3.1.min.js"></script>-->
<!--    <script src="../../static/wcs/js/layer/layer.js"></script>-->
    <script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
    <script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
@@ -136,7 +133,7 @@
                        <span>堆垛机号：</span>
                    </div>
                    <div class="form-item-input">
                        <input type="text" name="crnNo" value="">
                        <input type="text" name="crnNo" value="" id="crnNo">
                    </div>
                </div>
                <!-- 工作号 -->
@@ -220,6 +217,14 @@
                        <input type="text" name="error" value="">
                    </div>
                </div>
                <!-- 操作按钮 -->
                <div class="form-item" style="display: flex;">
                    <div class="form-item-input">
                        <div>入库：开<input type="radio" name="pakIn" id="pakInY" value="1"> 关<input type="radio" name="pakIn" id="pakInN" value="0"/></div>
                        <div>出库：开<input type="radio" name="pakOut" id="pakOutY" value="1"> 关<input type="radio" name="pakOut" id="pakOutN" value="0"/></div>
                    </div>
                    <div><a id="crnCommand" class="layui-btn">下发命令</a></div>
                </div>
            </form>
        </div>
        <!-- 输送设备弹窗 -->
@@ -236,7 +241,7 @@
                        <span>设备号：</span>
                    </div>
                    <div class="form-item-input">
                        <input type="text" name="siteId" value="">
                        <input type="text" name="siteId" value="" id="devpSiteId">
                    </div>
                </div>
                <!-- 工作号 -->
@@ -245,7 +250,7 @@
                        <span>工作号：</span>
                    </div>
                    <div class="form-item-input">
                        <input type="text" name="workNo" value="">
                        <input type="text" name="workNo" value="" id="devpWorkNo">
                    </div>
                </div>
                <!-- 工作状态 -->
@@ -317,7 +322,7 @@
                        <span>目标站：</span>
                    </div>
                    <div class="form-item-input">
                        <input type="text" name="staNo" value="">
                        <input type="text" name="staNo" value="" id="devpStaNo">
                    </div>
                </div>
                <!-- 源库位 -->
@@ -338,7 +343,10 @@
                        <input type="text" name="locNo" value="">
                    </div>
                </div>

                <!-- 操作按钮 -->
                <div class="form-item">
                    <a id="devpCommand" class="layui-btn">下发命令</a>
                </div>
            </form>
        </div>
    </div>
@@ -448,12 +456,27 @@
            },
            method: 'post',
            success: 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');
                    if (val === "inEnable") {
                        if (res.data[val] === 'Y') {
                            $("#pakInY").prop("checked", true);
                        }else{
                            $("#pakInN").prop("checked", true);
                        }
                    }else if (val === "outEnable") {
                        if (res.data[val] === 'Y') {
                            $("#pakOutY").prop("checked", true);
                        }else{
                            $("#pakOutN").prop("checked", true);
                        }
                    }else {
                        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');
                        }
                    }
                }
            }
@@ -763,5 +786,62 @@
        $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
    }

    //下发输送线命令
    $("#devpCommand").on("click", () => {
        let siteId = $("#devpSiteId").val()//设备id
        let wrkNo = $("#devpWorkNo").val()//工作号
        let staNo = $("#devpStaNo").val()//目标站

        $.ajax({
            url: baseUrl+"/site/detl/update",
            headers: {'token': localStorage.getItem('token')},
            data: {
                devNo: siteId,
                workNo: wrkNo,
                staNo: staNo,
            },
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    layer.msg("下发成功",{icon: 1,});
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg, {icon: 2});
                }
            }
        })
    });

    //下发堆垛机命令
    $("#crnCommand").on("click", () => {
        let crnNo = $("#crnNo").val()//设备id
        var pakIn = $('input[name="pakIn"]:checked').val();
        var pakOut = $('input[name="pakOut"]:checked').val();

        console.log(pakIn,pakOut)

        $.ajax({
            url: baseUrl + "/basCrnp/update/auth",
            headers: {
                'token': localStorage.getItem('token')
            },
            data: {
                crnNo: crnNo,
                inEnable: pakIn == 1 ? "Y" : "N",
                outEnable: pakOut == 1 ? "Y" : "N"
            },
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    layer.msg("下发成功",{icon: 1,});
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg, {icon: 2});
                }
            }
        });
    });

</script>