#

Junjie

2024-04-12 684484fb93775edcfa19cfc7a43d0a748c8362be

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java

@@ -5,9 +5,10 @@

import com.zy.asrs.wcs.core.BuildSupport;
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
import com.zy.asrs.wcs.core.service.DeviceCtgService;
import com.zy.asrs.wcs.core.service.MotionCtgService;
import com.zy.asrs.wcs.core.service.MotionStsService;
import com.zy.asrs.wcs.rcs.entity.DeviceType;
import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
@@ -343,8 +344,8 @@
    }

    public String getDeviceType$(){
        DeviceCtgService service = SpringUtils.getBean(DeviceCtgService.class);
        DeviceCtg deviceCtg = service.getById(this.deviceCtg);
        DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class);
        DeviceType deviceCtg = service.getById(this.deviceCtg);
        if (!Cools.isEmpty(deviceCtg)){
            return String.valueOf(deviceCtg.getName());
        }
@@ -458,8 +459,8 @@
    }

    public String getDeviceCtgEl(){
        DeviceCtgService service = SpringUtils.getBean(DeviceCtgService.class);
        DeviceCtg entity = service.getById(this.deviceCtg);
        DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class);
        DeviceType entity = service.getById(this.deviceCtg);
        if (!Cools.isEmpty(entity)){
            return String.valueOf(entity.getFlag());
        }