作业记录，作业记录明细

7 years ago · 7035bdd80c
parent 4ca1d70e0c
commit 7035bdd80c
5 changed files with 292 additions and 0 deletions
--- 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
@ -0,0 +1,121 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 : hansen.ke
+ * @CreateDate : 2018-11-23 11:10
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_LOG")
+@Api(value="作业记录表",description = "作业记录表")
+public class WmsActionLog extends BaseBean {
+
+    @Column(name="TASK_ID")
+    @ApiParam(value = "作业任务编号", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long taskId;
+
+    //get单独处理
+    public Long getTaskId() {
+        if(taskId != null) {
+            return taskId.longValue();
+        }else{
+            return taskId;
+        }
+    }
+
+    @Column(name="TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型编号")
+    public String transTypeCode;
+
+    @ApiParam(value = "交易类型名称")
+    public transient String transTypeName;
+
+    @Column(name="AG_ID")
+    @ApiParam(value = "作业流程编号", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long agId;
+
+    //get单独处理
+    public Long getAgId() {
+        if(agId != null) {
+            return agId.longValue();
+        }else{
+            return agId;
+        }
+    }
+
+    @Column(name="AG_NAME_C")
+    @ApiParam(value = "作业流程名称")
+    public String agNameC;
+
+    @Column(name="ACTION_USER_NAME")
+    @ApiParam(value = "作业人员")
+    public String actionUserName;
+
+    @Column(name="FIX_ID")
+    @ApiParam(value = "设备编号")
+    public String fixId;
+
+    @Column(name="ORDER_NO")
+    @ApiParam(value = "单据编号")
+    public String orderNo;
+
+    @Column(name="START_TIME")
+    @ApiParam(value = "开始作业时间")
+    public String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam(value = "结束作业时间")
+    public String endTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    public transient String startTimeStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    public transient String startTimeEnd;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    public transient String endTimeStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    public transient  String endTimeEnd;
+
+    // 状态:1=创建,10=处理中,20=已完成
+    @Column(name="ACTION_STATUS")
+    @ApiParam(value = "作业状态", example = "1")
+    public Integer actionStatus;
+
+    @Column(name="TOTAL_STEP")
+    @ApiParam(value = "总步数", example = "1")
+    public Integer totalStep;
+
+    @Column(name="CURRENT_STEP")
+    @ApiParam(value = "当前步骤", example = "1")
+    public Integer currentStep;
+}
--- 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
@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 : hansen.ke
+ * @CreateDate : 2018-11-23 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_LOG_DETAILS")
+@Api(value="作业记录明细表",description = "作业记录表")
+public class WmsActionLogDetails extends BaseBean {
+
+    @Column(name="AL_ID")
+    @ApiParam(value = "作业流程ID", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long alId;
+
+    //get单独处理
+    public Long getAlId() {
+        if(alId != null) {
+            return alId.longValue();
+        }else{
+            return alId;
+        }
+    }
+
+    @Column(name="SEQ")
+    @ApiParam(value = "序号", example = "1")
+    public Integer seq;
+
+    @Column(name="OK_SEQ")
+    @ApiParam(value = "成功跳转步骤", example = "1")
+    public Integer okSeq;
+
+    @Column(name="NG_SEQ")
+    @ApiParam(value = "失败跳转步骤", example = "1")
+    public Integer ngSeq;
+
+    // 10=只输入一次,20=输入多次,30=输入多次不允许重复,40=本流程结束
+    @Column(name="VALUE_TYPE")
+    @ApiParam(value = "动作类型", example = "1")
+    public Integer valueType;
+
+    // 1=是,2=否
+    @Column(name="TO_UPPER")
+    @ApiParam(value = "是否转为大写", example = "1")
+    public Integer toUpper;
+
+    @Column(name="LEN_CHECK")
+    @ApiParam(value = "长度检查", example = "1")
+    public Integer lenCheck;
+
+    @Column(name="AS_ID")
+    @ApiParam(value = "作业步骤", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long asId;
+
+    //get单独处理
+    public Long getAsId() {
+        if(asId != null) {
+            return asId.longValue();
+        }else{
+            return asId;
+        }
+    }
+
+    @Column(name="ALD_STATUS")
+    @ApiParam(value = "执行状态", example = "1")
+    public Integer aldStatus;
+
+    @Column(name="START_TIME")
+    @ApiParam(value = "开始执行时间")
+    public String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam(value = "结束执行时间")
+    public String endTime;
+
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业记录明细
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-23 14:03
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionLogDetailsRepository extends BaseRepository<WmsActionLogDetails, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业记录表
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-23 14:02
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionLogRepository extends BaseRepository<WmsActionLog, Long> {
+}
--- 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
@ -1116,4 +1116,44 @@ public class WmsHqlPack {

        return result.toString();
    }
+
+    /**
+     * 作业记录 查询条件封装
+     * @param wmsActionLog
+     * @return
+     */
+    public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(),
+                "startTime", result, true);
+        HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(),
+                "endTime", result, true);
+        // 作业流程编号
+        HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result);
+        // 作业流程名称
+        HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result);
+        // 单据编号
+        HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result);
+        getStringBuilderPack(wmsActionLog, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业记录明细 查询条件封装
+     * @param wmsActionLogDetails
+     * @return
+     */
+    public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){
+        StringBuffer result = new StringBuffer();
+
+        //作业流程id（对应作业记录明细里自增的id）
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result);
+        getStringBuilderPack(wmsActionLogDetails, result);
+
+        return  result.toString();
+    }
+
+
 }