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/MotionCtg.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java
index 9262b7e..cd638f7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java
@@ -3,8 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.zy.asrs.wcs.core.entity.DeviceCtg;
-import com.zy.asrs.wcs.core.service.DeviceCtgService;
+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;
@@ -149,8 +148,8 @@
// );
public String getDeviceCtg$(){
- 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.getId());
}
--
Gitblit v1.9.1