From f368ec88ccb944fb8201ed9949f19915c19ebaca Mon Sep 17 00:00:00 2001
From: "rock.yu" <rock.yu@estsh.com>
Date: Tue, 4 Aug 2020 18:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E7=AE=A1?=
 =?UTF-8?q?=E5=AE=B6=E7=BB=84=E4=BB=B6=E8=B0=83=E7=94=A8=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/wms/bean/WmsActionLogData.java     | 60 ++++++++++++++--------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java
index da9a121..1ca730c 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java
@@ -11,10 +11,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description :作业记录参数表
@@ -33,14 +30,41 @@ import javax.persistence.Table;
 public class WmsActionLogData extends BaseBean {
 
     private static final long serialVersionUID = -8150713013135101134L;
-    @Column(name = "ALD_ID")
-    @ApiParam(value = "记录明细编号")
+
+    @Column(name = "TASK_NO")
+    @ApiParam(value = "作业任务编号", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public String taskNo;
+
+    @Column(name = "TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型编号")
+    public String transTypeCode;
+
+    @Transient
+    @Column(name = "MOVE_NO")
+    @ApiParam(value = "移动单单号")
+    public String moveNo;
+
+    @Column(name = "AG_ID")
+    @ApiParam(value = "作业流程编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long aldId;
+    public Long agId;
 
-    @Column(name = "ALD_SEQ")
-    @ApiParam(value = "步骤序号")
-    private Integer aldSeq;
+    @Column(name = "AL_NAME_RDD")
+    @ApiParam(value = "流程名称")
+    public String agNameRdd;
+
+    @Column(name = "ACTION_USER_NAME")
+    @ApiParam(value = "作业人员")
+    public String actionUserName;
+
+    @Column(name = "FIX_NO")
+    @ApiParam(value = "设备编号")
+    public String fixNo;
+
+    @Column(name = "AGD_SEQ")
+    @ApiParam(value = "作业步骤序号")
+    private Integer agdSeq;
 
     @Column(name = "CALL_CLASS")
     @ApiParam(value = "实现类")
@@ -54,21 +78,17 @@ public class WmsActionLogData extends BaseBean {
     @ApiParam(value = "执行状态")
     private Integer executeStatus;
 
-    @Column(name = "START_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00")
-    private String startTime;
-
-    @Column(name = "END_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00")
-    private String endTime;
-
+    /**
+     * 保存调用组件时的 params
+     */
     @Lob
     @Column(name = "IN_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输入参数")
     private String inParams;
 
+    /**
+     * 保存调用组件后的返回值
+     */
     @Lob
     @Column(name = "OUT_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输出参数")