From 57fa3510fe6573f70a5dfc043a775da32530fbc6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 15 三月 2025 16:22:12 +0800
Subject: [PATCH] 配置信息
---
src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java | 243 -----------------------------------------------
1 files changed, 4 insertions(+), 239 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java
index fde683e..4ae777a 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java
@@ -4,18 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.text.SimpleDateFormat;
import java.util.Date;
@Data
@@ -23,6 +16,10 @@
public class TaskWrkReportLog implements Serializable {
private static final long serialVersionUID = 1L;
+
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* wms浠诲姟鍙�
@@ -81,12 +78,6 @@
@TableField("target_point")
private String targetPoint;
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value = "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
/**
* 淇敼鏃堕棿
@@ -107,231 +98,5 @@
*/
@ApiModelProperty(value = "鏉＄爜")
private String barcode;
-
- /**
- * 娲惧彂鏃堕棿
- */
- @ApiModelProperty(value = "娲惧彂鏃堕棿")
- @TableField("assign_time")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date assignTime;
-
- /**
- * 鎵ц鏃堕棿
- */
- @ApiModelProperty(value = "鎵ц鏃堕棿")
- @TableField("execute_time")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date executeTime;
-
- /**
- * 瀹岀粨鏃堕棿
- */
- @ApiModelProperty(value = "瀹岀粨鏃堕棿")
- @TableField("complete_time")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date completeTime;
-
- /**
- * 鍙栨秷鏃堕棿
- */
- @ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @TableField("cancel_time")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date cancelTime;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value = "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 鍫嗗灈鏈哄彿
- */
- @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
- @TableField("crn_no")
- private Integer crnNo;
-
- /**
- * 鎸囦护鎵ц姝ュ簭
- */
- @ApiModelProperty(value = "鎸囦护鎵ц姝ュ簭")
- @TableField("command_step")
- private Integer commandStep = 0;
-
- @ApiModelProperty(value = "绉诲簱鏍囪")
- @TableField("transfer_mark")
- private Integer transferMark;
-
- @ApiModelProperty(value = "鍘熷璧风偣")
- @TableField("origin_start_point")
- private String originStartPoint;
-
- @ApiModelProperty(value = "鍘熷璧风偣")
- @TableField("origin_target_point")
- private String originTargetPoint;
-
- @ApiModelProperty(value = "寮�濮嬩换鍔℃爣璁�")
- @TableField("mark_start")
- private Integer markStart;
-
- public TaskWrkReportLog() {
- }
-
- public TaskWrkReportLog(String taskNo, Integer status, Integer wrkNo, Date createTime, Integer ioType, Integer ioPri, String startPoint, String targetPoint, Long modiUser, Date modiTime, String memo, String barcode, Date assignTime, Date executeTime, Date completeTime, Date cancelTime, Integer wrkSts) {
- this.taskNo = taskNo;
- this.status = status;
- this.wrkNo = wrkNo;
- this.createTime = createTime;
- this.ioType = ioType;
- this.ioPri = ioPri;
- this.startPoint = startPoint;
- this.targetPoint = targetPoint;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.memo = memo;
- this.barcode = barcode;
- this.assignTime = assignTime;
- this.executeTime = executeTime;
- this.completeTime = completeTime;
- this.cancelTime = cancelTime;
- this.wrkSts = wrkSts;
- }
-
-// TaskWrk taskWrk = new TaskWrk(
-// null, // wms浠诲姟鍙穂闈炵┖]
-// null, // 浠诲姟鐘舵��
-// null, // 浠诲姟鍙�
-// null, // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
-// null, // 浠诲姟绫诲瀷
-// null, // 浼樺厛绾�
-// null, // 璧风偣
-// null, // 缁堢偣
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null, // 鏉＄爜
-// null, // 娲惧彂鏃堕棿
-// null, // 鎵ц鏃堕棿
-// null, // 瀹岀粨鏃堕棿
-// null, // 鍙栨秷鏃堕棿
-// null // 宸ヤ綔鐘舵��
-// );
-
- public String getStatus$() {
- if (null == this.status) {
- return null;
- }
- switch (this.status) {
- case 1:
- return "鎺ユ敹";
- case 2:
- return "娲惧彂";
- case 3:
- return "姝ュ簭瀹屾垚";
- case 4:
- return "鍙栨秷";
- case 5:
- return "瀹岀粨";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getCreateTime$() {
- if (Cools.isEmpty(this.createTime)) {
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getIoType$() {
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)) {
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getModiUser$() {
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)) {
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- 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)) {
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
- }
-
- 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)) {
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
- }
-
- public String getCancelTime$() {
- if (Cools.isEmpty(this.cancelTime)) {
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
- }
-
- public String getWrkSts$() {
- BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
- BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)) {
- return String.valueOf(basWrkStatus.getWrkDesc());
- }
- return null;
- }
-
- /**
- * 鑾峰彇鎸佺画鏃堕棿
- */
- public String getDurationTime() {
- if (Cools.isEmpty(this.createTime)) {
- return "";
- }
-
- Date endDate = new Date();
- if (!Cools.isEmpty(this.assignTime)) {
- endDate = this.assignTime;
- }
-
- //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
- long l = this.createTime.getTime() - endDate.getTime();
-
- //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
- long day = l / (24 * 60 * 60 * 1000);
- long hour = (l / (60 * 60 * 1000) - day * 24);
- long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
- long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
-
- return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
- }
}
--
Gitblit v1.9.1