自动化立体仓库 - WCS系统
Junjie
2023-05-24 9301d31986fb2a59970c665b3a64cbc9e37b086a
堆垛机调试
3个文件已修改
182 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/CrnController.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wms/js/crnOperate/crnOperate.js 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/crnOperate/crnOperate.html 114 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/CrnController.java
@@ -207,6 +207,46 @@
        return R.ok().add(list);
    }
    @PostMapping("/crn/table/crn/{id}/msg")
    @ManagerAuth(memo = "堆垛机数据表")
    public R crnMsgTable(@PathVariable("id") Integer id){
        BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", id).orderBy("crn_no"));
        // 表格行
        CrnMsgTableVo vo = new CrnMsgTableVo();
        vo.setCrnNo(basCrnp.getCrnNo());   //  堆垛机号
        // 获取堆垛机信息
        CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
        if (crnThread == null) {
            return R.error();
        }
        CrnProtocol crnProtocol = crnThread.getCrnProtocol();
        if (crnProtocol == null) {
            return R.error();
        }
        vo.setWorkNo(crnProtocol.getTaskNo());  //  任务号
        if (crnProtocol.getTaskNo()>0) {
            WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
            if (wrkMast != null) {
                vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
                vo.setSourceStaNo(wrkMast.getSourceStaNo$());    //  源站
                vo.setStaNo(wrkMast.getStaNo$());   //  目标站
                vo.setSourceLocNo(wrkMast.getSourceLocNo());    //  源库位
                vo.setLocNo(wrkMast.getLocNo());    //  目标库位
            }
        } else {
            vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
        }
        vo.setXspeed(crnProtocol.getXSpeed());  //  走行速度(m/min)
        vo.setYspeed(crnProtocol.getYSpeed());  //  升降速度(m/min)
        vo.setZspeed(crnProtocol.getZSpeed());  //  叉牙速度(m/min)
        vo.setXdistance(crnProtocol.getXDistance());  //  走行距离(Km)
        vo.setYdistance(crnProtocol.getYDistance());  //  升降距离(Km)
        vo.setXduration(crnProtocol.getXDuration());    //  走行时长(H)
        vo.setYduration(crnProtocol.getYDuration());    //  升降时长(H)
        return R.ok().add(vo);
    }
    @PostMapping("/crn/output/site")
    @ManagerAuth(memo = "堆垛机报文日志输出")
    public R crnOutput(){
src/main/webapp/static/wms/js/crnOperate/crnOperate.js
@@ -40,6 +40,34 @@
            }
        }
    })
    $.ajax({
        url: baseUrl + "/crn/table/crn/" + crnNo + "/msg",
        headers: {'token': localStorage.getItem('token')},
        method: 'POST',
        traditional:true,
        success: function (res) {
            if (res.code == 200) {
                layer.msg('连接成功')
                console.log(res)
                let data = res.data
                $("#__sourceStaNo").val(data.sourceStaNo)
                $("#__staNo").val(data.staNo)
                $("#__sourceLocNo").val(data.sourceLocNo)
                $("#__locNo").val(data.locNo)
                $("#xspeed").val(data.xspeed)
                $("#yspeed").val(data.yspeed)
                $("#zspeed").val(data.zspeed)
                $("#xdistance").val(data.xdistance)
                $("#ydistance").val(data.ydistance)
                $("#xduration").val(data.xduration)
                $("#yduration").val(data.yduration)
                $("#__workNo").val(data.workNo)
            }else {
                layer.msg(res.msg)
            }
        }
    })
}
// 入库
src/main/webapp/views/crnOperate/crnOperate.html
@@ -240,6 +240,120 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>源站</div>
                                    <input class="layui-input" id="__sourceStaNo" type="text" disabled />
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-row" style="margin-top: 20px;">
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>目标站</div>
                                    <input class="layui-input" id="__staNo" type="text" disabled />
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>源库位</div>
                                    <input class="layui-input" id="__sourceLocNo" type="text" disabled />
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>目标库位</div>
                                    <input class="layui-input" id="__locNo" type="text" disabled />
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>走行速度(m/min)</div>
                                    <input class="layui-input" id="xspeed" type="text" disabled />
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-row" style="margin-top: 20px;">
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>升降速度(m/min)    </div>
                                    <input class="layui-input" id="yspeed" type="text" disabled />
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>叉牙速度(m/min)</div>
                                    <input class="layui-input" id="zspeed" type="text" disabled />
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>走行距离(Km)</div>
                                    <input class="layui-input" id="xdistance" type="text" disabled />
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>升降距离(Km)    </div>
                                    <input class="layui-input" id="ydistance" type="text" disabled />
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-row" style="margin-top: 20px;">
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>走行时长(H)</div>
                                    <input class="layui-input" id="xduration" type="text" disabled />
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>升降时长(H)</div>
                                    <input class="layui-input" id="yduration" type="text" disabled />
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-md3">
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <div>工作号</div>
                                    <input class="layui-input" id="__workNo" type="text" disabled />
                                </div>
                            </div>
                        </div>
                    </div>
                </div>