From 26956bc393bb08eb868aeafde10c187336ad5888 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 26 三月 2024 14:23:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java
index 1b895ad..574c505 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.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.rcs.service.MotionCtgService;
import com.zy.asrs.wcs.rcs.service.MotionStsService;
@@ -101,7 +103,7 @@
* 璁惧绫诲瀷
*/
@ApiModelProperty(value= "璁惧绫诲瀷")
- private Long deviceType;
+ private Long deviceCtg;
/**
* 璁惧
@@ -238,7 +240,7 @@
public Motion() {}
- public Motion(String uuid,Integer wrkNo,String serialNo,String title,Integer priority,Integer sync,Long motionCtg,Long motionSts,Long deviceType,String device,String origin,Integer oriDrt,String target,Integer tarDrt,String dockNo,Date ioTime,Date startTime,Date endTime,Date errTime,Long errCode,String errDesc,String temp,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer deleted,Long hostId) {
+ public Motion(String uuid,Integer wrkNo,String serialNo,String title,Integer priority,Integer sync,Long motionCtg,Long motionSts,Long deviceCtg,String device,String origin,Integer oriDrt,String target,Integer tarDrt,String dockNo,Date ioTime,Date startTime,Date endTime,Date errTime,Long errCode,String errDesc,String temp,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer deleted,Long hostId) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.serialNo = serialNo;
@@ -247,7 +249,7 @@
this.sync = sync;
this.motionCtg = motionCtg;
this.motionSts = motionSts;
- this.deviceType = deviceType;
+ this.deviceCtg = deviceCtg;
this.device = device;
this.origin = origin;
this.oriDrt = oriDrt;
@@ -335,10 +337,10 @@
}
public String getDeviceType$(){
- DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class);
- DeviceType deviceType = service.getById(this.deviceType);
- if (!Cools.isEmpty(deviceType)){
- return String.valueOf(deviceType.getName());
+ DeviceCtgService service = SpringUtils.getBean(DeviceCtgService.class);
+ DeviceCtg deviceCtg = service.getById(this.deviceCtg);
+ if (!Cools.isEmpty(deviceCtg)){
+ return String.valueOf(deviceCtg.getName());
}
return null;
}
--
Gitblit v1.9.1