From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 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..77b9ec2 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -1,31 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+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.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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -173,9 +157,9 @@
@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 = "绉诲簱鏍囪")
@@ -205,7 +189,30 @@
this.crnNo = crnNo;
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, // 浠诲姟鐘舵��
@@ -237,9 +244,13 @@
case 2:
return "娲惧彂";
case 3:
- return "瀹岀粨";
+ return "姝ュ簭瀹屾垚";
case 4:
return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
+ case 7:
+ return "鎵嬪姩瀹岀粨";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1