新增作业步骤调用参数信息和作业记录参数信息

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :作业记录参数表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-23 13:14
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ACTION_LOG_DATA")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="作业记录参数表",description = "作业记录参数表")
+public class WmsActionLogData extends BaseBean {
+
+    @Column(name = "ALD_ID")
+    @ApiParam(value = "记录明细编号")
+    private Long aldId;
+
+    @Column(name = "ALD_SEQ")
+    @ApiParam(value = "步骤序号")
+    private Integer aldSeq;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam(value = "实现类")
+    private String callClass;
+
+    @Column(name = "CALL_FUN")
+    @ApiParam(value = "调用方法")
+    private String callFun;
+
+    @Column(name = "EXECUTE_STATUS")
+    @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;
+
+    @Column(name = "IN_PARAMS")
+    @ApiParam(value = "输入参数")
+    private String inParams;
+
+    @Column(name = "OUT_PARAMS")
+    @ApiParam(value = "输出参数")
+    private String outParams;
+
+    @Column(name = "OUT_RESULT")
+    @ApiParam(value = "执行结果")
+    private String outResult;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :作业步骤调用参数表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-23 14:52
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ACTION_STEP_CALL_PARAM")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="作业步骤调用参数表",description = "作业步骤调用参数表")
+public class WmsActionStepCallParam extends BaseBean {
+
+    @Column(name = "AGD_ID")
+    @ApiParam(value = "流程明细编号")
+    private Long agdId;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号")
+    private Integer seq;
+
+    @Column(name = "AM_ID")
+    @ApiParam(value = "处理组件编号")
+    private Long amId;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam(value = "参数编码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam(value = "参数值")
+    private String paramValue;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionLogDataRepository extends BaseRepository<WmsActionLogData, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-23 15:00
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionStepCallParamRepository extends BaseRepository<WmsActionStepCallParam, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1071,4 +1071,34 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 作业记录参数信息 查询条件封装
+     *
+     * @param wmsActionLogData
+     * @return
+     */
+    public static String packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result);
+        getStringBuilderPack(wmsActionLogData, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业步骤调用参数信息 查询条件封装
+     *
+     * @param wmsActionStepCallParam
+     * @return
+     */
+    public static String packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result);
+        getStringBuilderPack(wmsActionStepCallParam, result);
+
+        return result.toString();
+    }
 }