From 74be59f7ae8fe0a4435dc0b532e9a5ba32ab56de Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 四月 2024 22:13:04 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java
index 4d64132..4268ff1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java
+++ b/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());
}
--
Gitblit v1.9.1