From 116ab17ceb0c77aef99fa10b8a88fc055bb839f0 Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期一, 23 六月 2025 19:35:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 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..e926683 100644 --- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java +++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java @@ -173,9 +173,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 +205,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 +260,11 @@ case 2: return "娲惧彂"; case 3: - return "瀹岀粨"; + return "姝ュ簭瀹屾垚"; case 4: return "鍙栨秷"; + case 5: + return "瀹岀粨"; default: return String.valueOf(this.status); } -- Gitblit v1.9.1