From f39a9d14daa326d702c575843a337fa3303eb458 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 12 Apr 2019 13:14:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 165 --------------------- .../i3plus/pojo/wms/bean/WmsActionLogData.java | 76 ---------- .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 122 --------------- .../wms/repository/WmsActionLogDataRepository.java | 17 --- .../repository/WmsActionLogDetailsRepository.java | 16 -- .../wms/repository/WmsActionLogRepository.java | 16 -- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 73 --------- 7 files changed, 485 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java 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 deleted file mode 100644 index 6776ce7..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ /dev/null @@ -1,165 +0,0 @@ -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; -import javax.persistence.Transient; - -/** - * @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; - - @Transient - @ApiParam(value = "交易类型名称") - public 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") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "开始作业时间") - public String startTime; - - @Column(name="END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "结束作业时间") - public String endTime; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") - public String startTimeStart; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") - public String endTimeStart; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") - public 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; - - @Column(name="INIT_AM_ID") - @ApiParam(value = "初始化组件编号", example = "0") - private Long initAmId; - - @Column(name="DETAILS_AM_ID") - @ApiParam(value = "明细处理组件编号", example = "0") - private Long detailsAmId; - - @Column(name="END_AM_ID") - @ApiParam(value = "结束组件编号", example = "0") - private Long endAmId; - - public Long getInitAmId() { - if (initAmId != null) { - return initAmId.longValue(); - } else { - return initAmId; - } - } - - public Long getDetailsAmId() { - if (detailsAmId != null) { - return detailsAmId.longValue(); - } else { - return detailsAmId; - } - } - - public Long getEndAmId() { - if (endAmId != null) { - return endAmId.longValue(); - } else { - return endAmId; - } - } -} 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 deleted file mode 100644 index d67742d..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ /dev/null @@ -1,76 +0,0 @@ -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 : 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 = "记录明细编号") - @JsonSerialize(using = ToStringSerializer.class) - 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", columnDefinition = "TEXT") - @ApiParam(value = "输入参数") - private String inParams; - - @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") - @ApiParam(value = "输出参数") - private String outParams; - - @Column(name = "OUT_RESULT", columnDefinition = "TEXT") - @ApiParam(value = "执行结果") - private String outResult; -} 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 deleted file mode 100644 index 001acec..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ /dev/null @@ -1,122 +0,0 @@ -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; -import javax.persistence.Transient; - -/** - * @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; - - @Transient - @ApiParam(value = "流程名称") - public String agNameC; - - @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; - - @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; - - @Column(name = "GOTO_BTN_CODE") - @ApiParam(value = "跳转按钮代码") - private String goToBtnCode; - - @Column(name = "GOTO_BTN_NAME") - @ApiParam(value = "跳转按钮名称") - private String goToBtnName; - - @Column(name = "PRE_SHOW") - @ApiParam(value = "是否预显示", example = "1") - private Integer preShow; - - @Column(name = "SHOW_AM_ID") - @ApiParam(value = "回显组件方法ID", example = "1") - private Long showAmId; - - public Long getAsId() { - if (asId != null) { - return asId.longValue(); - } else { - return asId; - } - } - - public Long getAlId() { - if (alId != null) { - return alId.longValue(); - } else { - return alId; - } - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java deleted file mode 100644 index 8875b03..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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 { -} diff --git 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 deleted file mode 100644 index 280d727..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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 { -} diff --git 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 deleted file mode 100644 index 2c2da0b..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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 { -} 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 839fb10..082673d 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 @@ -6,12 +6,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -1307,21 +1305,6 @@ public class WmsHqlPack { } /** - * 作业记录参数信息 查询条件封装 - * - * @param wmsActionLogData - * @return - */ - public static DdlPackBean packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { - DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); - getStringBuilderPack(wmsActionLogData, result); - - return result; - } - - /** * 作业步骤调用参数信息 查询条件封装 * * @param wmsActionStepCallParam @@ -1339,62 +1322,6 @@ public class WmsHqlPack { } /** - * 作业记录 查询条件封装 - * @param wmsActionLog - * @return - */ - public static DdlPackBean packHqlWmsActionLog(WmsActionLog wmsActionLog) { - DdlPackBean result = new DdlPackBean(); - - if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - DdlPreparedPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), - "startTime", result, true); - } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - DdlPreparedPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), - "endTime", result, true); - } - - // 作业流程编号 - DdlPreparedPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); - // 作业流程名称 - DdlPreparedPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); - // 单据编号 - DdlPreparedPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); - // 设备编号 - DdlPreparedPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); - // 交易类型代码 - DdlPreparedPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); - // 流程状态 - DdlPreparedPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); - - getStringBuilderPack(wmsActionLog, result); - - return result; - } - - /** - * 作业记录明细 查询条件封装 - * @param wmsActionLogDetails - * @return - */ - public static DdlPackBean packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { - DdlPackBean result = new DdlPackBean(); - - //作业流程id（对应作业记录明细里自增的id） - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); - - getStringBuilderPack(wmsActionLogDetails, result); - - DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - - return result; - } - - /** * PO订单条码表 分页查询 * * @param wmsPoSn