自动化立体仓库 - WCS系统
#
luxiaotao1123
2020-08-15 0157c39c88d79ea85b584f47570bab6bc0c2cdc5
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -203,21 +203,32 @@
    @PostMapping("/crn/detail")
    @ManagerAuth(memo = "堆垛机设备数据详情")
    public R crnDetail(@RequestParam String crnNo){
    public R crnDetail(@RequestParam Integer crnNo){
        if (Cools.isEmpty(crnNo)){
            return R.parse(CodeRes.EMPTY);
        }
        CrnDetailVo vo = new CrnDetailVo();
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            if (crnSlave.getId().equals(crnNo)) {
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
        vo.setCrnNo(crnNo);
        vo.setWorkNo("3387");
        vo.setSourceStaNo("2303");
        vo.setStaNo("2410");
        vo.setWorkStatus("3.吊车入库中");
        vo.setIoType("1.入库");
        vo.setSourceStock("");
        vo.setStock("05050040");
        vo.setCrnStatus("取货中");
        vo.setError("0");
                vo.setWorkNo(crnProtocol.getTaskNo());
                if (crnProtocol.getTaskNo() > 0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setSourceStaNo(wrkMast.getSourceStaNo$());
                        vo.setStaNo(wrkMast.getStaNo$());
                        vo.setWrkSts(wrkMast.getWrkSts$());   // 工作状态
                        vo.setIoType(wrkMast.getIoType$());   //  入出库类型
                        vo.setSourceLocNo(wrkMast.getSourceLocNo$());
                        vo.setLocNo(wrkMast.getLocNo$());
                        vo.setCrnStatus(crnProtocol.getStatusType().desc);
                        vo.setError("");    // todo
                    }
                }
            }
        }
        return R.ok().add(vo);
    }