From ad67399e14815baa028564c0edce3fec3c414914 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 六月 2024 09:01:39 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 271 insertions(+), 29 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java
index c62a259..cfce319 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java
@@ -1,29 +1,27 @@
package com.zy.asrs.wcs.core.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.wcs.core.service.BusService;
+import com.zy.asrs.wcs.core.service.TaskCtgService;
+import com.zy.asrs.wcs.core.service.TaskStsService;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.system.service.HostService;
-
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("wcs_task_log")
@@ -35,7 +33,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
@@ -45,16 +43,10 @@
private String uuid;
/**
- * 鍚嶇О
+ * 鎬荤嚎
*/
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
-
- /**
- * 鏍囪瘑
- */
- @ApiModelProperty(value= "鏍囪瘑")
- private String flag;
+ @ApiModelProperty(value= "鎬荤嚎")
+ private Long busId;
/**
* 浠诲姟鍙�
@@ -63,10 +55,110 @@
private String taskNo;
/**
- * 浠诲姟鏁版嵁
+ * 搴忓垪鍙�
*/
- @ApiModelProperty(value= "浠诲姟鏁版嵁")
- private String taskData;
+ @ApiModelProperty(value= "搴忓垪鍙�")
+ private String serialNum;
+
+ /**
+ * 鏍囬
+ */
+ @ApiModelProperty(value= "鏍囬")
+ private String title;
+
+ /**
+ * 浠诲姟鐘舵��
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵��")
+ private Long taskSts;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ private Long taskCtg;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Integer priority;
+
+ /**
+ * 璧峰绔�
+ */
+ @ApiModelProperty(value= "璧峰绔�")
+ private String originSite;
+
+ /**
+ * 璧峰搴撲綅
+ */
+ @ApiModelProperty(value= "璧峰搴撲綅")
+ private String originLoc;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ private String destSite;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ private String destLoc;
+
+ /**
+ * 绌烘墭 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "绌烘墭 1: 鏄� 0: 鍚� ")
+ private Integer emptyMk;
+
+ /**
+ * 鎵樼洏鐮�
+ */
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ private String zpallet;
+
+ /**
+ * 鐜妭
+ */
+ @ApiModelProperty(value= "鐜妭")
+ private String phase;
+
+ /**
+ * 浠诲姟鏃堕棿
+ */
+ @ApiModelProperty(value= "浠诲姟鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date ioTime;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value= "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /**
+ * 寮傚父鏃堕棿
+ */
+ @ApiModelProperty(value= "寮傚父鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date exceptionTime;
+
+ /**
+ * 寮傚父鎻忚堪
+ */
+ @ApiModelProperty(value= "寮傚父鎻忚堪")
+ private String exceptionDesc;
/**
* 鎵�灞炴満鏋�
@@ -119,14 +211,65 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍥涘悜绌挎杞﹀彿
+ */
+ @ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
+ private Integer shuttleNo;
+
+ /**
+ * 鎻愬崌鏈哄彿
+ */
+ @ApiModelProperty(value= "鎻愬崌鏈哄彿")
+ private Integer liftNo;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ private Integer crnNo;
+
+ /**
+ * RGV鍙�
+ */
+ @ApiModelProperty(value= "RGV鍙�")
+ private Integer rgvNo;
+
+ /**
+ * AGV鍙�
+ */
+ @ApiModelProperty(value= "AGV鍙�")
+ private Integer agvNo;
+
+ /**
+ * 鏄惁璁板綍搴撲綅淇℃伅
+ */
+ @ApiModelProperty(value= "鏄惁璁板綍搴撲綅淇℃伅")
+ private String recordLoc;
+
public TaskLog() {}
- public TaskLog(String uuid,String name,String flag,String taskNo,String taskData,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public TaskLog(String uuid,Long busId,String taskNo,String serialNum,String title,Long taskSts,Long taskCtg,Integer priority,String originSite,String originLoc,String destSite,String destLoc,Integer emptyMk,String zpallet,String phase,Date ioTime,Date startTime,Date endTime,Date exceptionTime,String exceptionDesc,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,Integer shuttleNo,Integer liftNo,Integer crnNo,Integer rgvNo,Integer agvNo,String recordLoc) {
this.uuid = uuid;
- this.name = name;
- this.flag = flag;
+ this.busId = busId;
this.taskNo = taskNo;
- this.taskData = taskData;
+ this.serialNum = serialNum;
+ this.title = title;
+ this.taskSts = taskSts;
+ this.taskCtg = taskCtg;
+ this.priority = priority;
+ this.originSite = originSite;
+ this.originLoc = originLoc;
+ this.destSite = destSite;
+ this.destLoc = destLoc;
+ this.emptyMk = emptyMk;
+ this.zpallet = zpallet;
+ this.phase = phase;
+ this.ioTime = ioTime;
+ this.startTime = startTime;
+ this.endTime = endTime;
+ this.exceptionTime = exceptionTime;
+ this.exceptionDesc = exceptionDesc;
this.hostId = hostId;
this.status = status;
this.deleted = deleted;
@@ -135,14 +278,35 @@
this.updateTime = updateTime;
this.updateBy = updateBy;
this.memo = memo;
+ this.shuttleNo = shuttleNo;
+ this.liftNo = liftNo;
+ this.crnNo = crnNo;
+ this.rgvNo = rgvNo;
+ this.agvNo = agvNo;
+ this.recordLoc = recordLoc;
}
// TaskLog taskLog = new TaskLog(
// null, // 缂栧彿
-// null, // 鍚嶇О
-// null, // 鏍囪瘑
+// null, // 鎬荤嚎
// null, // 浠诲姟鍙�
-// null, // 浠诲姟鏁版嵁
+// null, // 搴忓垪鍙�
+// null, // 鏍囬
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟绫诲瀷
+// null, // 浼樺厛绾�
+// null, // 璧峰绔�
+// null, // 璧峰搴撲綅
+// null, // 鐩爣绔�
+// null, // 鐩爣搴撲綅
+// null, // 绌烘墭
+// null, // 鎵樼洏鐮�
+// null, // 鐜妭
+// null, // 浠诲姟鏃堕棿
+// null, // 寮�濮嬫椂闂�
+// null, // 缁撴潫鏃堕棿
+// null, // 寮傚父鏃堕棿
+// null, // 寮傚父鎻忚堪
// null, // 鎵�灞炴満鏋�
// null, // 鐘舵��
// null, // 鏄惁鍒犻櫎
@@ -150,8 +314,83 @@
// null, // 娣诲姞浜哄憳
// null, // 淇敼鏃堕棿
// null, // 淇敼浜哄憳
-// null // 澶囨敞
+// null, // 澶囨敞
+// null, // 鍥涘悜绌挎杞﹀彿
+// null, // 鎻愬崌鏈哄彿
+// null, // 鍫嗗灈鏈哄彿
+// null, // RGV鍙�
+// null, // AGV鍙�
+// null // 鏄惁璁板綍搴撲綅淇℃伅
// );
+
+ public String getBusId$(){
+ BusService service = SpringUtils.getBean(BusService.class);
+ Bus bus = service.getById(this.busId);
+ if (!Cools.isEmpty(bus)){
+ return String.valueOf(bus.getUuid());
+ }
+ return null;
+ }
+
+ public String getTaskSts$(){
+ TaskStsService service = SpringUtils.getBean(TaskStsService.class);
+ TaskSts taskSts = service.getOne(new LambdaQueryWrapper<TaskSts>()
+ .eq(TaskSts::getUuid, String.valueOf(this.taskSts))
+ .eq(TaskSts::getHostId, this.hostId));
+ if (!Cools.isEmpty(taskSts)){
+ return String.valueOf(taskSts.getName());
+ }
+ return null;
+ }
+
+ public String getTaskCtg$(){
+ TaskCtgService service = SpringUtils.getBean(TaskCtgService.class);
+ TaskCtg taskCtg = service.getById(this.taskCtg);
+ if (!Cools.isEmpty(taskCtg)){
+ return String.valueOf(taskCtg.getName());
+ }
+ return null;
+ }
+
+ public String getEmptyMk$(){
+ if (null == this.emptyMk){ return null; }
+ switch (this.emptyMk){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.emptyMk);
+ }
+ }
+
+ public String getIoTime$(){
+ if (Cools.isEmpty(this.ioTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+ }
+
+ public String getStartTime$(){
+ if (Cools.isEmpty(this.startTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
+ }
+
+ public String getEndTime$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+
+ public String getExceptionTime$(){
+ if (Cools.isEmpty(this.exceptionTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.exceptionTime);
+ }
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
@@ -218,5 +457,8 @@
return null;
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1