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

zjj

2024-06-19 36c6d6b39e2b76080480c5bc90a412d711b76144

 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;