From 9fa7314698afd63d49eb962a8a586898667d9225 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 27 三月 2024 09:35:34 +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/rcs/entity/MotionCtg.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionCtg.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionCtg.java
index 2ce6eca..e4bc14c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionCtg.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionCtg.java
@@ -3,6 +3,8 @@
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.service.DeviceTypeService;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.User;
@@ -43,7 +45,7 @@
* 璁惧绫诲瀷
*/
@ApiModelProperty(value= "璁惧绫诲瀷")
- private Long deviceType;
+ private Long deviceCtg;
/**
* 缂栧彿
@@ -116,8 +118,8 @@
public MotionCtg() {}
- public MotionCtg(Long deviceType,String uuid,String name,String flag,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer deleted,Long hostId) {
- this.deviceType = deviceType;
+ public MotionCtg(Long deviceCtg,String uuid,String name,String flag,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer deleted,Long hostId) {
+ this.deviceCtg = deviceCtg;
this.uuid = uuid;
this.name = name;
this.flag = flag;
@@ -146,11 +148,11 @@
// null // 鎵�灞炴満鏋�
// );
- public String getDeviceType$(){
- DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class);
- DeviceType deviceType = service.getById(this.deviceType);
- if (!Cools.isEmpty(deviceType)){
- return String.valueOf(deviceType.getId());
+ public String getDeviceCtg$(){
+ DeviceCtgService service = SpringUtils.getBean(DeviceCtgService.class);
+ DeviceCtg deviceCtg = service.getById(this.deviceCtg);
+ if (!Cools.isEmpty(deviceCtg)){
+ return String.valueOf(deviceCtg.getId());
}
return null;
}
--
Gitblit v1.9.1