Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master in...

luxiaotao1123

2024-04-08 9d0acfb65c80c4948c305ca01338f894b87346a0

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Device.java

@@ -183,6 +183,15 @@
        DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class);
        DeviceType deviceType = service.getById(this.deviceType);
        if (!Cools.isEmpty(deviceType)){
            return String.valueOf(deviceType.getFlag());
        }
        return null;
    }

    public String getDeviceTypeName$(){
        DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class);
        DeviceType deviceType = service.getById(this.deviceType);
        if (!Cools.isEmpty(deviceType)){
            return String.valueOf(deviceType.getName());
        }
        return null;