From 103a27c36e24b6bea09f7c87ea176fbc51803f01 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 23 Nov 2018 16:32:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=8E=E6=98=8E=E7=BB=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 47 ++++++++++++++++ .../pojo/wms/bean/WmsActionGroupDetails.java | 63 ++++++++++++++++++++++ .../WmsActionGroupDetailsRepository.java | 16 ++++++ .../wms/repository/WmsActionGroupRepository.java | 16 ++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 ++++++ 5 files changed, 157 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupRepository.java 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 new file mode 100644 index 0000000..5fec85c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : amy + * @CreateDate : 2018-11-23 13:13 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_GROUP") +@Api("作业流程") +public class WmsActionGroup extends BaseBean { + + @Column(name="AG_NAME_E") + @ApiParam("英文流程名称") + private String agNameE; + + @Column(name="AG_DESC_E") + @ApiParam("英文流程描述") + private String agDescE; + + @Column(name="AG_NAME_C") + @ApiParam("中文流程名称") + private String agNameC; + + @Column(name="AG_DESC_C") + @ApiParam("中文流程描述") + private String agDescC; + +} 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 new file mode 100644 index 0000000..3444120 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : amy + * @CreateDate : 2018-11-23 13:23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_GROUP_DETAILS") +@Api("作业流程明细") +public class WmsActionGroupDetails extends BaseBean { + + @Column(name = "AG_ID") + @ApiParam(value = "作业流程ID", example = "0") + private Long agId; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "0") + private Integer seq; + + @Column(name = "OK_SEQ") + @ApiParam(value = "成功跳转步骤", example = "0") + private Integer okSeq; + + @Column(name = "NG_SEQ") + @ApiParam(value = "失败跳转步骤", example = "0") + private Integer ngSeq; + + @Column(name = "VALUE_TYPE") + @ApiParam(value = "动作类型", example = "10") + private Integer valueType; + + @Column(name = "TO_UPPER") + @ApiParam(value = "是否转为大写", example = "2") + private Integer toUpper; + + @Column(name = "LEN_CHECK") + @ApiParam(value = "长度检查", example = "0") + private Integer lenCheck; + + @Column(name = "AS_ID") + @ApiParam(value = "作业步骤", example = "0") + private Long asId; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupDetailsRepository.java new file mode 100644 index 0000000..5eeb877 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupDetailsRepository.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.WmsActionGroupDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-23 13:32 + * @Modify: + **/ +@Repository +public interface WmsActionGroupDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupRepository.java new file mode 100644 index 0000000..abd4c88 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupRepository.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.WmsActionGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-23 13:34 + * @Modify: + **/ +@Repository +public interface WmsActionGroupRepository 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 d78eb17..0dae006 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 @@ -1070,4 +1070,19 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业流程分页查询 + * @return + */ + public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){ + StringBuffer result = new StringBuffer(); + + //查询参数封装 agDescC;agNameC + HqlPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result); + HqlPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result); + getStringBuilderPack(wmsActionGroup, result); + + return result.toString(); + } } From 4b410c1408732c7273b051f3be5dffd3a07cb262 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Fri, 23 Nov 2018 17:42:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=92=8C=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsActionLogData.java | 73 ++++++++++++++++++++++ .../pojo/wms/bean/WmsActionStepCallParam.java | 52 +++++++++++++++ .../wms/repository/WmsActionLogDataRepository.java | 17 +++++ .../WmsActionStepCallParamRepository.java | 17 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 30 +++++++++ 5 files changed, 189 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java 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 new file mode 100644 index 0000000..0328db7 --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java new file mode 100644 index 0000000..e2542a8 --- /dev/null +++ b/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; + +} 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 new file mode 100644 index 0000000..8875b03 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java new file mode 100644 index 0000000..b7c78a7 --- /dev/null +++ b/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 { +} 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 3e30660..004aff5 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 @@ -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(); + } } From 911e93429e30e1f021b9ecbd4ab76262921f4562 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 23 Nov 2018 18:12:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=BD=E7=82=B9?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java | 19 +++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index fa5715b..d6aad6f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -1,6 +1,7 @@ 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 io.swagger.models.auth.In; @@ -38,10 +39,12 @@ public class WmsIbCheckPlan extends BaseBean{ private String partNameRdd; @Column(name="START_DATE") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="开始日期") private String startDate; @Column(name="END_DATE") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="结束日期") private String endDate; @@ -57,4 +60,20 @@ public class WmsIbCheckPlan extends BaseBean{ @ApiParam(value ="已抽点件数", example = "-1") private Integer checkCounter; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value="开始日期，查询开始日期") + public transient String startDateStart; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value="开始日期，查询开始日期") + public transient String startDateEnd; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value="结束日期，查询结束日期") + public transient String endDateStart; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value = "结束日期，查询结束日期") + public transient String endDateEnd; + } 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 3e30660..931e304 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 @@ -181,8 +181,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); - HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true); - HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); + HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); + HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); getStringBuilderPack(wmsIbCheckPlan, result); From 7035bdd80c187faea76b777504a7a3c5f217640b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 23 Nov 2018 18:28:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 121 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 99 +++++++++++++++++ .../repository/WmsActionLogDetailsRepository.java | 16 +++ .../wms/repository/WmsActionLogRepository.java | 16 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 40 +++++++ 5 files changed, 292 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java create 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 new file mode 100644 index 0000000..905459f --- /dev/null +++ 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; +} 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 new file mode 100644 index 0000000..ea3f4ae --- /dev/null +++ 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; + +} 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 new file mode 100644 index 0000000..280d727 --- /dev/null +++ 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 { +} 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 new file mode 100644 index 0000000..2c2da0b --- /dev/null +++ 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 { +} 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 575b828..8533723 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 @@ -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(); + } + + } From 0c568f21072f37f78caeb1f90ef0353f64a03930 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sat, 24 Nov 2018 09:10:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0dae006..a2139ee 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 @@ -822,7 +822,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); - + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderType(),"orderType",result); getStringBuilderPack(wmsMoveMaster, result); return result.toString();