Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-03-25 c4c29d91cccfccf457594b87d09c0181f8810ba2

 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;