From 364b9ccc44bc6863280c5cc00aa8512cfff548d4 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 25 四月 2025 15:27:18 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 168 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 91 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index 742db07..5aabe2f 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -1,35 +1,20 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_task_wrk_log")
@@ -40,151 +25,152 @@
/**
* wms浠诲姟鍙�
*/
- @ApiModelProperty(value= "wms浠诲姟鍙�")
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
@TableField("task_no")
private String taskNo;
/**
- * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
private Integer status;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
*/
- @ApiModelProperty(value= "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @ApiModelProperty(value = "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 浠诲姟绫诲瀷
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷")
@TableField("io_type")
private Integer ioType;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
/**
* 璧风偣
*/
- @ApiModelProperty(value= "璧风偣")
+ @ApiModelProperty(value = "璧风偣")
@TableField("start_point")
private String startPoint;
/**
* 缁堢偣
*/
- @ApiModelProperty(value= "缁堢偣")
+ @ApiModelProperty(value = "缁堢偣")
@TableField("target_point")
private String targetPoint;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 娲惧彂鏃堕棿
*/
- @ApiModelProperty(value= "娲惧彂鏃堕棿")
+ @ApiModelProperty(value = "娲惧彂鏃堕棿")
@TableField("assign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date assignTime;
/**
* 鎵ц鏃堕棿
*/
- @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
@TableField("execute_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date executeTime;
/**
* 瀹岀粨鏃堕棿
*/
- @ApiModelProperty(value= "瀹岀粨鏃堕棿")
+ @ApiModelProperty(value = "瀹岀粨鏃堕棿")
@TableField("complete_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
/**
* 鍙栨秷鏃堕棿
*/
- @ApiModelProperty(value= "鍙栨秷鏃堕棿")
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿")
@TableField("cancel_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Integer wrkSts;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
/**
* 鎸囦护鎵ц姝ュ簭
*/
- @ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
+ @ApiModelProperty(value = "鎸囦护鎵ц姝ュ簭")
@TableField("command_step")
private Integer commandStep;
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
+// @ApiModelProperty(value= "")
+// @TableId(value = "id", type = IdType.AUTO)
+// private Long id;
@ApiModelProperty(value = "绉诲簱鏍囪")
@TableField("transfer_mark")
private Integer transferMark;
- public TaskWrkLog() {}
+ public TaskWrkLog() {
+ }
- public TaskWrkLog(String taskNo,Integer status,Integer wrkNo,Date createTime,Integer ioType,Double ioPri,String startPoint,String targetPoint,Long modiUser,Date modiTime,String memo,String barcode,Date assignTime,Date executeTime,Date completeTime,Date cancelTime,Integer wrkSts,Integer crnNo,Integer commandStep) {
+ public TaskWrkLog(String taskNo, Integer status, Integer wrkNo, Date createTime, Integer ioType, Double ioPri, String startPoint, String targetPoint, Long modiUser, Date modiTime, String memo, String barcode, Date assignTime, Date executeTime, Date completeTime, Date cancelTime, Integer wrkSts, Integer crnNo, Integer commandStep) {
this.taskNo = taskNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -206,6 +192,30 @@
this.commandStep = commandStep;
}
+ public TaskWrkLog(TaskWrk taskWrk) {
+ this.taskNo = taskWrk.getTaskNo();
+ this.status = taskWrk.getStatus();
+ this.wrkNo = taskWrk.getWrkNo();
+ this.createTime = taskWrk.getCreateTime();
+ this.ioType = taskWrk.getIoType();
+ if (Cools.isEmpty(taskWrk.getIoPri())) {
+ taskWrk.setIoPri(1);
+ }
+ this.ioPri = (double) taskWrk.getIoPri();
+ this.startPoint = taskWrk.getStartPoint();
+ this.targetPoint = taskWrk.getTargetPoint();
+ this.modiUser = taskWrk.getModiUser();
+ this.modiTime = taskWrk.getModiTime();
+ this.memo = taskWrk.getMemo();
+ this.barcode = taskWrk.getBarcode();
+ this.assignTime = taskWrk.getAssignTime();
+ this.executeTime = taskWrk.getExecuteTime();
+ this.completeTime = taskWrk.getCompleteTime();
+ this.cancelTime = taskWrk.getCancelTime();
+ this.wrkSts = taskWrk.getWrkSts();
+ this.crnNo = taskWrk.getCrnNo();
+ this.commandStep = taskWrk.getCommandStep();
+ }
// TaskWrkLog taskWrkLog = new TaskWrkLog(
// null, // wms浠诲姟鍙�
// null, // 浠诲姟鐘舵��
@@ -229,86 +239,90 @@
// );
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鎺ユ敹";
case 2:
return "娲惧彂";
case 3:
- return "瀹岀粨";
+ return "姝ュ簭瀹屾垚";
case 4:
return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
default:
return String.valueOf(this.status);
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAssignTime$(){
- if (Cools.isEmpty(this.assignTime)){
+ public String getAssignTime$() {
+ if (Cools.isEmpty(this.assignTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
}
- public String getExecuteTime$(){
- if (Cools.isEmpty(this.executeTime)){
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
}
- public String getCompleteTime$(){
- if (Cools.isEmpty(this.completeTime)){
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
}
- public String getCancelTime$(){
- if (Cools.isEmpty(this.cancelTime)){
+ public String getCancelTime$() {
+ if (Cools.isEmpty(this.cancelTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
--
Gitblit v1.9.1