From 95d473bc8c09ef41e1455f93dec49c5ee6ac548f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 六月 2024 08:23:38 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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..95c20f8 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;
@@ -48,7 +49,7 @@
* 浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
- private Integer wrkNo;
+ private Integer taskNo;
/**
* 搴忓垪鍙�
@@ -227,9 +228,9 @@
public Motion() {}
- 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) {
+ public Motion(String uuid,Integer taskNo,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.taskNo = taskNo;
this.serialNo = serialNo;
this.title = title;
this.priority = priority;
@@ -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