*

lsh

昨天 d7ec100166068db8197d218c57d2a6c86a5289a4

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

@@ -331,7 +331,10 @@
            }
            vo.setInEnable(basCrnp.getInEnable());
            vo.setOutEnable(basCrnp.getOutEnable());
            vo.setHpMk(basCrnp.getHpMk());
            vo.setTaskComplete(crnThread.getResetFlag()? "任务完成下发等待":"-");
            vo.setDemo(SystemProperties.WCS_RUNNING_STATUS_DEMO.get()? "开启":"关闭");
            vo.setDemoValue(SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE);
        }
        return R.ok().add(list);
    }
@@ -454,11 +457,11 @@
        command.setDestinationPosX(param.getBay());     // 目标库位列
        command.setDestinationPosY(param.getLev());     // 目标库位层
        command.setCommand((short)1);
        LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
                .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
        LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
                .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
        VersionUtils.locMoveCheckLocType(sourceLoc, loc);
//        LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
//                .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
//        LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
//                .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
//        VersionUtils.locMoveCheckLocType(sourceLoc, loc);
        return crnControl(command)?R.ok():R.error();
    }