From 60e6d51d357173050c65c962db6f1648128f9ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 28 Jul 2019 18:44:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B62.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 30 +++++++++++----- .../i3plus/pojo/model/wms/WmsAgCacheModel.java | 27 ++++++++++++++ .../i3plus/pojo/model/wms/WmsAgdCacheModel.java | 26 ++++++++++++++ .../i3plus/pojo/model/wms/WmsAmCacheModel.java | 23 ++++++++++++ .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 35 +++++++++--------- .../pojo/wms/bean/WmsActionGroupDetails.java | 41 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 35 ++++++------------ .../i3plus/pojo/wms/bean/WmsActionLogData.java | 6 ++-- .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 17 +++++---- .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 26 +++++++++----- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 9 +++-- .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +-- 14 files changed, 206 insertions(+), 77 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 8ad590e..830cb97 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -724,6 +724,19 @@ public class WmsEnumUtil { public String getValue() { return value; } + + public static MODULE_METHOD_NAME codeOf(String value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } } @@ -1471,14 +1484,13 @@ public class WmsEnumUtil { return description; } - public static String valueOf(int val) { - String tmp = null; + public static ACTION_BUTLER_SOURCE valueOf(Integer val) { for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { - tmp = values()[i].description; + return values()[i]; } } - return tmp; + return null; } } @@ -1487,7 +1499,7 @@ public class WmsEnumUtil { * 组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum COMPONENT_TYPE { + public enum AM_TYPE { PROCESS_HANDLING(10, "流程处理组件"), PROCESS_INITIALIZATION(20, "流程初始化组件"), @@ -1499,7 +1511,7 @@ public class WmsEnumUtil { private int value; private String description; - COMPONENT_TYPE(int value, String description) { + AM_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -1522,7 +1534,7 @@ public class WmsEnumUtil { return tmp; } - public static COMPONENT_TYPE switchGetValue(int val) { + public static AM_TYPE switchGetValue(int val) { int tmp = 1; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -1574,7 +1586,7 @@ public class WmsEnumUtil { * 10=交互动作,20=后台动作,30=提交动作 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum GROUP_VALUE_TYPE { + public enum AGD_VALUE_TYPE { INTERACTIVE_ACTION(10, "交互动作"), BACKSTAGE_ACTION(20, "后台动作"), @@ -1584,7 +1596,7 @@ public class WmsEnumUtil { private int value; private String description; - GROUP_VALUE_TYPE(int value, String description) { + AGD_VALUE_TYPE(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java new file mode 100644 index 0000000..78ba929 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; +import cn.estsh.i3plus.pojo.wms.bean.WmsOptionModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description 作业流程缓存Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/24 22:16 + * @Modify + */ +@Data +public class WmsAgCacheModel { + + @ApiParam("作业流程") + public WmsActionGroup wmsActionGroup; + @ApiParam("流程初始化自定义组件") + public List options; + @ApiParam("作业流程明细Model集合") + public Map wmsAgdCacheModelMap; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java new file mode 100644 index 0000000..b9cf218 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description 作业流程明细缓存Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/24 22:16 + * @Modify + */ +@Data +public class WmsAgdCacheModel { + @ApiParam("作业流程明细") + public WmsActionGroupDetails wmsActionGroupDetails; + @ApiParam("作业步骤调用") + public List wmsActionStepCallList; + @ApiParam("作业步骤调用参数") + public Map wmsActionStepCallParamsMap; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java new file mode 100644 index 0000000..5ba47c0 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description 作业处理组件缓存Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/24 22:17 + * @Modify + */ +@Data +public class WmsAmCacheModel { + @ApiParam("作业处理组件") + public WmsActionModule wmsActionModule; + @ApiParam("作业处理组件参数集合") + public List wmsActionModuleParamList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index 30fe13b..25ed168 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -17,5 +17,5 @@ import java.util.List; @Data public class WmsMoveDetailsModel implements Serializable { private WmsMoveDetails details; - private List moveSn; + private List moveSnList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 48c1efe..9ac398e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -69,30 +69,27 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "GOJS位置") private String position; - public Long getInitAmId() { - if (initAmId != null) { - return initAmId.longValue(); - } else { - return initAmId; - } + @Transient + @ApiParam(value = "提交步骤序号") + private Integer submitStepSeq; + + public long getInitAmIdVal() { + return this.initAmId == null ? 0 : this.initAmId.intValue(); + } + + public long getDetailsAmIdVal() { + return this.detailsAmId == null ? 0 : this.detailsAmId.intValue(); } - public Long getDetailsAmId() { - if (detailsAmId != null) { - return detailsAmId.longValue(); - } else { - return detailsAmId; - } + public long getEndAmIdVal() { + return this.endAmId == null ? 0 : this.endAmId.intValue(); } - public Long getEndAmId() { - if (endAmId != null) { - return endAmId.longValue(); - } else { - return endAmId; - } + public int getAutoInitVal() { + return this.autoInit == null ? 0 : this.autoInit.intValue(); } - public WmsActionGroup() { + public int geSubmitStepSeqVal() { + return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index beb6129..81183f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -65,6 +65,11 @@ public class WmsActionGroupDetails extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long asId; + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private Long atId; + @Transient @ApiParam(value = "作业步骤名称") private String asName; @@ -89,4 +94,40 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "回显组件方法ID", example = "1") @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; + + @Column(name = "IS_COMMIT_ABLE") + @ApiParam(value = "是否可提交", example = "2") + private Integer isCommitAble; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + public int getNgSeqVal() { + return this.ngSeq == null ? 0 : this.ngSeq; + } + + public int getOkSeqVal() { + return this.okSeq == null ? 0 : this.okSeq; + } + + public int getPreShowVal() { + return this.preShow == null ? 0 : this.preShow; + } + + public int getIsCommitAbleVal() { + return this.isCommitAble == null ? 0 : this.isCommitAble; + } + + public int getValueTypeVal() { + return this.valueType == null ? 0 : this.valueType; + } + + public int getToUpperVal() { + return this.toUpper == null ? 0 : this.toUpper; + } + + public int getLenCheckVal() { + return this.lenCheck == null ? 0 : this.lenCheck; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index dffe9b6..18113af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -29,30 +29,21 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_ACTION_LOG") -@Api(value="作业记录表",description = "作业记录表") +@Api(value="作业记录表") public class WmsActionLog extends BaseBean { - @Column(name="TASK_ID") + @Column(name="TASK_NO") @ApiParam(value = "作业任务编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) - public Long taskId; - - //get单独处理 - public Long getTaskId() { - if(taskId != null) { - return taskId.longValue(); - }else{ - return taskId; - } - } + public String taskNo; @Column(name="TRANS_TYPE_CODE") @ApiParam(value = "交易类型编号") public String transTypeCode; - @Column(name="TRANS_TYPE_NAME") - @ApiParam(value = "交易类型名称") - public String transTypeName; + @Column(name="MOVE_NO") + @ApiParam(value = "移动单单号") + public String moveNo; @Column(name="AG_ID") @ApiParam(value = "作业流程编号", example = "1") @@ -76,13 +67,9 @@ public class WmsActionLog extends BaseBean { @ApiParam(value = "作业人员") public String actionUserName; - @Column(name="FIX_ID") + @Column(name="FIX_NO") @ApiParam(value = "设备编号") - public String fixId; - - @Column(name="ORDER_NO") - @ApiParam(value = "单据编号") - public String orderNo; + public String fixNo; @Column(name="START_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -129,15 +116,15 @@ public class WmsActionLog extends BaseBean { @Column(name="INIT_AM_ID") @ApiParam(value = "初始化组件编号", example = "0") - private Long initAmId; + public Long initAmId; @Column(name="DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") - private Long detailsAmId; + public Long detailsAmId; @Column(name="END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") - private Long endAmId; + public Long endAmId; public Long getInitAmId() { if (initAmId != null) { 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 e507653..183b936 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 @@ -74,7 +74,7 @@ public class WmsActionLogData extends BaseBean { private String outParams; @Lob - @Column(name = "OUT_RESULT") - @ApiParam(value = "执行结果") - private String outResult; + @Column(name = "ERROR_MSG") + @ApiParam(value = "异常信息") + private String errorMsg; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index f6cc610..7715e02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -31,7 +31,7 @@ import javax.persistence.Table; public class WmsActionLogDetails extends BaseBean { @Column(name = "AL_ID") - @ApiParam(value = "作业流程ID", example = "1") + @ApiParam(value = "作业记录ID", example = "1") @JsonSerialize(using = ToStringSerializer.class) public Long alId; @@ -75,6 +75,11 @@ public class WmsActionLogDetails extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) public Long asId; + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) + public Long atId; + @Column(name = "ALD_STATUS") @ApiParam(value = "执行状态", example = "1") public Integer aldStatus; @@ -89,23 +94,23 @@ public class WmsActionLogDetails extends BaseBean { @Column(name = "GOTO_BTN_CODE") @ApiParam(value = "跳转按钮代码") - private String goToBtnCode; + public String goToBtnCode; @Column(name = "GOTO_BTN_NAME") @ApiParam(value = "跳转按钮名称") - private String goToBtnName; + public String goToBtnName; @Column(name = "PRE_SHOW") @ApiParam(value = "是否预显示", example = "1") - private Integer preShow; + public Integer preShow; @Column(name = "SHOW_AM_ID") @ApiParam(value = "回显组件方法ID", example = "1") - private Long showAmId; + public Long showAmId; @Column(name = "AGD_ID") @ApiParam(value = "作业流程明细ID", example = "1") - private Long agdId; + public Long agdId; public Long getAsId() { if (asId != null) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index c9e8915..e41964f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -24,7 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_STEP_CALL", indexes = { +@Table(name = "WMS_ACTION_STEP_CALL", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "AS_ID"), @Index(columnList = "AM_ID") @@ -32,17 +32,17 @@ import javax.persistence.*; @Api("作业步骤调用信息") public class WmsActionStepCall extends BaseBean { - @Column(name="AS_ID") - @ApiParam(value = "作业步骤ID",example = "0") + @Column(name = "AS_ID") + @ApiParam(value = "作业步骤ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) public Long asId; - @Column(name="SEQ") - @ApiParam(value = "序号",example = "0") + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "0") public Integer seq; - @Column(name="AM_ID") - @ApiParam(value = "处理组件ID",example = "0") + @Column(name = "AM_ID") + @ApiParam(value = "处理组件ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) public Long amId; @@ -54,11 +54,19 @@ public class WmsActionStepCall extends BaseBean { @ApiParam(value = "组件描述") public String amDesc; - @Column(name="AM_TYPE") + @Column(name = "AM_TYPE") @ApiParam(value = "组件类型", example = "0") public Integer amType; - @Column(name="OK_VALUE") + @Column(name = "OK_VALUE") @ApiParam(value = "成功标志", example = "10") public Integer okValue; + + public int getAmTypeVal() { + return this.amType == null ? 0 : this.amType; + } + + public int getOkValueVal() { + return this.okValue == null ? 0 : this.okValue; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index b572de7..1c1f95c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -22,13 +22,16 @@ public class WmsOperationBean extends BaseBean { public String barCode; @ApiParam("可选项的值") - public List options; + public List options; @ApiParam("设备编号") public String fixNo; - @ApiParam("作业记录编号") - public String alId; + @ApiParam("交易类型") + public String transTypeCode; + + @ApiParam("任务单号") + public String taskNo; /** * 触发源: diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index c095d84..cc5984b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -70,6 +70,6 @@ public class WmsTransType extends BaseBean { private String menuUrl; public String getMenuUrl() { - return "/handle?transCode=" + this.transTypeCode; + return "/handle?transTypeCode=" + this.transTypeCode; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 6f65d60..1bfbfe1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2188,9 +2188,9 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false); - DdlPreparedPack.getStringEqualPack(actionLog.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean); DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean); - DdlPreparedPack.getStringEqualPack(actionLog.getFixId(), "fixId", packBean); + DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", packBean); DdlPreparedPack.getStringEqualPack(actionLog.getAgNameRdd(), "agNameRdd", packBean);