From 372d916d0f5f95938c9883c0d949fe69585f1e6e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 22 Nov 2018 13:28:18 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index def0ca7..24e1dde 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -30,7 +30,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="SYS_USER_INFO") @Api(value="用户详细",description = "用户详细") -public class SysUserInfo extends BaseBean { +public class SysUserInfo extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") @@ -115,6 +115,9 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="用户所有部门信息") private transient List departmentList; + @ApiParam("用户的部门ID信息") + private transient List departmentIdList; + @ApiParam(value ="用户所有岗位信息") private transient List positionList; From 29c28271b306a2fab058fd022a59a404f2150948 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 22 Nov 2018 15:55:57 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 4609c69..d3e74f8 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 @@ -987,4 +987,22 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤 查询 + * + * @param wmsActionStepCall + * @return + */ + public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); + HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + + getStringBuilderPack(wmsActionStepCall, result); + + return result.toString(); + } } From dc634e860f6f68022b1ddfbf139a0279cf7ce2be Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 22 Nov 2018 16:06:08 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsActionStepType.java | 50 ++++++++++++++++++++ .../wms/repository/WmsActionStepRepository.java | 16 +++++++ .../repository/WmsActionStepTypeRepository.java | 17 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 34 ++++++++++++++ 5 files changed, 171 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java new file mode 100644 index 0000000..b8c52a4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -0,0 +1,54 @@ +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 : silliter.yuan + * @CreateDate : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_STEP") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤信息",description = "作业步骤信息") +public class WmsActionStep extends BaseBean { + + @Column(name = "AS_NAME_E") + @ApiParam(value = "英文类型名称") + private String asNameE; + + @Column(name = "AS_DESC_E") + @ApiParam(value = "英文类型描述") + private String asDescE; + + @Column(name = "AS_NAME_C") + @ApiParam(value = "中文类型名称") + private String asNameC; + + @Column(name = "AS_DESC_C") + @ApiParam(value = "中文类型描述") + private String asDescC; + + @Column(name = "AT_NAME_C_RDD") + @ApiParam(value = "步骤类型名称") + private String atNameCRdd; + + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号") + private String atId; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java new file mode 100644 index 0000000..cb08f18 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -0,0 +1,50 @@ +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 : silliter.yuan + * @CreateDate : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +public class WmsActionStepType extends BaseBean { + + @Column(name = "AT_NAME_E") + @ApiParam(value = "英文类型名称") + private String atNameE; + + @Column(name = "AT_DESC_E") + @ApiParam(value = "英文类型描述") + private String atDescE; + + @Column(name = "AT_NAME_C") + @ApiParam(value = "中文类型名称") + private String atNameC; + + @Column(name = "AT_DESC_C") + @ApiParam(value = "中文类型描述") + private String atDescC; + + @Column(name = "FUN_CALL_NAME") + @ApiParam(value = "方法调用名称") + private String funCallName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java new file mode 100644 index 0000000..91e4ff9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.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.WmsActionStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java new file mode 100644 index 0000000..793ad96 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.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.WmsActionStepType; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤类型操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepTypeRepository 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 4609c69..95fc35f 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 @@ -987,4 +987,38 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤类型表信息查询 + * + * @param wmsActionStepType + * @return + */ + public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + + getStringBuilderPack(wmsActionStepType, result); + + return result.toString(); + } + + /** + * 作业步骤信息查询 + * + * @param wmsActionStep + * @return + */ + public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); + + getStringBuilderPack(wmsActionStep, result); + + return result.toString(); + } } From e5c5e80d4152e4bfc62c376b883c275ca844ab28 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 22 Nov 2018 16:09:47 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 42 ++++++++++++++++++++++ .../repository/WmsActionStepCallRepository.java | 14 ++++++++ 2 files changed, 56 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java 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 new file mode 100644 index 0000000..7b9f906 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -0,0 +1,42 @@ +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 : jimmy.zeng + * @CreateDate : 2018-11-22 14:18 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_STEP_CALL") +@Api("作业步骤调用信息") +public class WmsActionStepCall extends BaseBean { + + @Column(name="AS_ID") + @ApiParam("作业步骤ID") + public Long asId; + + @Column(name="SEQ") + @ApiParam(value = "序号",example = "0") + public Integer seq; + + @Column(name="AM_ID") + @ApiParam("处理组件ID") + public Long amId; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java new file mode 100644 index 0000000..1a6a5c0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; + +/** + * @Description : 作业步骤调用信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-22 14:41 + * @Modify: + **/ +public interface WmsActionStepCallRepository extends BaseRepository { +} From da4665b0d7935b83868e2b1c4df537c1d2c0dfb4 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 22 Nov 2018 17:13:28 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=EF=BC=8Cdao,sqlPack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsActionModule.java | 50 ++++++++++++ .../i3plus/pojo/wms/bean/WmsActionModuleParam.java | 50 ++++++++++++ .../repository/WmsActionModuleParamRepository.java | 16 ++++ .../wms/repository/WmsActionModuleRepository.java | 15 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 94 ++++++++++++++++------ 5 files changed, 200 insertions(+), 25 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java new file mode 100644 index 0000000..a59768a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -0,0 +1,50 @@ +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 : dragon.xu +* @CreateDate : 2018-11-22 16:53 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_MODULE") +@Api("作业步骤处理组") +public class WmsActionModule extends BaseBean { + + @Column(name="AM_NAME") + @ApiParam("组件名称") + public String amName; + + @Column(name="AM_DESC") + @ApiParam("组件描述") + public String amDesc; + + @Column(name="CALL_CLASS") + @ApiParam("实现类") + public String callClass; + + @Column(name="CALL_FUN") + @ApiParam("调用方法") + public String callFun; + + @Column(name="AM_TYPE") + @ApiParam(value = "组件类型", example = "0") + public Integer amType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java new file mode 100644 index 0000000..8910354 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -0,0 +1,50 @@ +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 : dragon.xu +* @CreateDate : 2018-11-22 16:53 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_MODULE_PARAM") +@Api("作业步骤处理组参数") +public class WmsActionModuleParam extends BaseBean { + + @Column(name="AM_ID") + @ApiParam("组件ID") + public Long amID; + + @Column(name="PARAM_CODE") + @ApiParam("参数编码") + public String paramCode; + + @Column(name="PARAM_NAME") + @ApiParam("参数名称") + public String paramName; + + @Column(name="PARAM_VALUE_LIST") + @ApiParam("参数可选值列表") + public String paramValueList; + + @Column(name="PARAM_TYPE") + @ApiParam(value = "参数类型", example = "0") + public Integer paramType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java new file mode 100644 index 0000000..3aa2b6c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.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.WmsActionModuleParam; +import org.springframework.stereotype.Repository; + +/** +* @Description : 作业步骤处理组件参数 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 17:01 +* @Modify: +**/ +@Repository +public interface WmsActionModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java new file mode 100644 index 0000000..5fde9b3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; +import org.springframework.stereotype.Repository; +/** +* @Description : 作业步骤处理组件 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 17:01 +* @Modify: +**/ +@Repository +public interface WmsActionModuleRepository 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 1486a84..099c6e3 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 @@ -18,7 +18,8 @@ public class WmsHqlPack { /** * 封装公用查询参数 - * @param bean 实体对象 + * + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -190,7 +191,7 @@ public class WmsHqlPack { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -210,7 +211,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -233,7 +234,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result); HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -319,7 +320,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -614,7 +615,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); - getStringBuilderPack(wmsASNMasterDetails,result); + getStringBuilderPack(wmsASNMasterDetails, result); return result.toString(); } @@ -669,6 +670,7 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 + * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -691,10 +693,11 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 + * * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); @@ -706,15 +709,16 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 + * * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); return result.toString(); @@ -722,10 +726,11 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 + * * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); @@ -737,6 +742,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -763,6 +769,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -864,16 +871,18 @@ public class WmsHqlPack { return result.toString(); } + /** - *内部单据：库存移动单主表唯一性查询 + * 内部单据：库存移动单主表唯一性查询 + * * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); @@ -881,14 +890,15 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 + * * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); @@ -896,10 +906,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 + * * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsMoveDetails.getOrderNo(), "orderNo", result); @@ -909,12 +920,12 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringLikerPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(),"whNo",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(),"zoneNo",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(),"locateNo",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(), "zoneNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(), "locateNo", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsMoveDetails, result); return result.toString(); @@ -922,10 +933,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 + * * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsMoveSn.getOrderNo(), "orderNo", result); @@ -1040,4 +1052,36 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤处理组件查询条件封装 + * + * @param wmsActionModuleParam + * @return + */ + public static String packHqlWmsActionModule(WmsActionModuleParam wmsActionModuleParam) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + getStringBuilderPack(wmsActionModuleParam, result); + + return result.toString(); + } + + /** + * 作业步骤处理组件参数查询条件封装 + * + * @param wmsActionModule + * @return + */ + public static String packHqlWmsActionModuleParam(WmsActionModule wmsActionModule) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + getStringBuilderPack(wmsActionModule, result); + + return result.toString(); + } } From 9fefeffdb76042822420003f18fc91d63b2b415f Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 22 Nov 2018 18:04:47 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java | 15 +++++++++++++-- .../pojo/wms/repository/WmsActionStepCallRepository.java | 8 ++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) 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 7b9f906..942e6a8 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 @@ -1,7 +1,10 @@ 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.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,7 +32,8 @@ import javax.persistence.Table; public class WmsActionStepCall extends BaseBean { @Column(name="AS_ID") - @ApiParam("作业步骤ID") + @ApiParam(value = "作业步骤ID",example = "0") + @JsonSerialize(using = ToStringSerializer.class) public Long asId; @Column(name="SEQ") @@ -37,6 +41,13 @@ public class WmsActionStepCall extends BaseBean { public Integer seq; @Column(name="AM_ID") - @ApiParam("处理组件ID") + @ApiParam(value = "处理组件ID",example = "0") + @JsonSerialize(using = ToStringSerializer.class) public Long amId; + + @ApiParam(value = "组件名称") + public transient String amName; + + @ApiParam(value = "组件描述") + public transient String amDesc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java index 1a6a5c0..6987eb6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; /** * @Description : 作业步骤调用信息 @@ -11,4 +15,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; * @Modify: **/ public interface WmsActionStepCallRepository extends BaseRepository { + + @Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ") + List findWmsActionStepCallByAmid(@Param("id") long id); + } From 9c1466fdcac466b6036a16d542929acec089006d Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 22 Nov 2018 18:08:46 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsActionResponseBean.java | 35 ++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 13 ++++++- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 43 ++++++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java new file mode 100644 index 0000000..f1abe18 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -0,0 +1,35 @@ +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 javax.persistence.Entity; +import java.util.List; + +/** + * @Description : PDA传输到后台的实体bean对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 15:58 + * @Modify: + **/ +@Data +@Api("返回前端数据实体") +public class WmsActionResponseBean extends BaseBean { + + @ApiParam("进度") + public Double percent; + + @ApiParam("当前步骤") + public Integer currentStep; + + @ApiParam("总步数") + public int totalStep; + + @ApiParam("提示信息") + public String message; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index b8c52a4..4198ff5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -49,6 +49,15 @@ public class WmsActionStep extends BaseBean { private String atNameCRdd; @Column(name = "AT_ID") - @ApiParam(value = "步骤类型编号") - private String atId; + @ApiParam(value = "步骤类型编号", example = "0") + private Long atId; + + //get单独处理 + public Long getAtId() { + if(atId != null) { + return atId.longValue(); + }else{ + return atId; + } + } } 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 new file mode 100644 index 0000000..9f9d6c2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -0,0 +1,43 @@ +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; +import java.util.List; + +/** + * @Description : PDA传输到后台的实体bean对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 15:58 + * @Modify: + **/ +@Data +@Api("接受前端数据实体") +public class WmsOperationBean extends BaseBean { + + @ApiParam("扫描内容") + public String barCode; + + @ApiParam("可选项的值") + public List options; + + /** + * 触发源:10=扫描枪, + * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除) + * 60=明细（清空） + */ + @ApiParam("触发源") + public int sourceOwner; + + @ApiParam("选中的明细数据") + public String details; +} From e2ebcd943011b7f165b4e82ac244ab0f73e3f4e7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 22 Nov 2018 19:01:32 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index f1abe18..33c4b57 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -31,5 +31,14 @@ public class WmsActionResponseBean extends BaseBean { @ApiParam("提示信息") public String message; + @ApiParam("列表信息") + public List informations; + + @ApiParam("可选项") + public List options; + + @ApiParam("选中的明细数据") + public String details; + } From c2d8a35df6000e31de2639de4b2bb0d65494a7fb Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 22 Nov 2018 19:51:43 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E4=BF=A1=E6=81=AF?= 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 4609c69..a226b47 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 @@ -470,7 +470,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //发运单号 - HqlPack.getStringEqualPack(wmsShopping.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); //物料编码 From 1eb12350b285f0fb94fc8d9e687d8d97e7b83c26 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 22 Nov 2018 20:12:17 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E6=99=82=E9=96=93?= 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 a29ad39..8c26bfa 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,7 @@ 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.getStartDate(), wmsIbCheckPlan.getEndDate(), "startDate", result, true); getStringBuilderPack(wmsIbCheckPlan, result); From 37c8e3e212f95543e49fd681478ae9100fe9f047 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 22 Nov 2018 20:13:41 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsActionStepCallRepository.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java index 6987eb6..d1f658c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -2,8 +2,6 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import java.util.List; @@ -15,8 +13,4 @@ import java.util.List; * @Modify: **/ public interface WmsActionStepCallRepository extends BaseRepository { - - @Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ") - List findWmsActionStepCallByAmid(@Param("id") long id); - } From 6977e11090b78ec10533a8eeb9ecc41c61e2e897 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 22 Nov 2018 20:59:53 +0800 Subject: [PATCH 12/22] bug --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) 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 a29ad39..c0b3799 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 @@ -1039,4 +1039,36 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤处理组件查询条件封装 + * + * @param wmsActionModuleParam + * @return + */ + public static String packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + getStringBuilderPack(wmsActionModuleParam, result); + + return result.toString(); + } + + /** + * 作业步骤处理组件参数查询条件封装 + * + * @param wmsActionModule + * @return + */ + public static String packHqlWmsActionModule(WmsActionModule wmsActionModule) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + getStringBuilderPack(wmsActionModule, result); + + return result.toString(); + } } From 5dbf1bb2e8a5949c014ecdb28136e73d5b0c88f2 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 22 Nov 2018 21:59:42 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E4=BF=A1=E6=81=AFBug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index cf31941..7df2552 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -687,7 +687,7 @@ public class ImppEnumUtil { * 1.SYSTEM：系统参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MESSAGE_CONTENT_TYPE{ + public enum MESSAGE_TYPE_CONTENT { HTML(1,"HTML","text/plain;charset=UTF-8"), TEXT(2,"TEXT","text/plain;charset=UTF-8"); @@ -696,10 +696,10 @@ public class ImppEnumUtil { private String name; private String description; - MESSAGE_CONTENT_TYPE() { + MESSAGE_TYPE_CONTENT() { } - MESSAGE_CONTENT_TYPE(int value, String name, String description) { + MESSAGE_TYPE_CONTENT(int value, String name, String description) { this.value = value; this.name = name; this.description = description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index bbd57cd..3b7d26b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -72,8 +72,8 @@ public class SysFile extends BaseBean { @ApiParam(value ="文件大小(KB)" , example ="0") private Integer fileSize; - @Column(name="DOWNLOADS") + @Column(name="DOWNLOAD_NUM") @ApiParam(value ="下载次数" , example ="0") - private Integer downloads; + private Integer downloadNum; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index e805f03..a3d87b2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -38,8 +38,8 @@ public class SysMessage extends BaseBean { @ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") private Integer messageType; - @Column(name="MESSAGE_CONTENT_TYPE") - @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_CONTENT_TYPE)" , example ="-1") + @Column(name="MESSAGE_TYPE_CONTENT") + @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)" , example ="-1") private Integer messageContentType; @Column(name="MESSAGE_CONTENT") From 7b71b349a70ac603ca18eb49be3be351d9f84190 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 23 Nov 2018 11:11:13 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= 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 cdb2be6..d78eb17 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 @@ -448,7 +448,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); - HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result); + HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); From f99d4e4dc6cf5f4e18de3e4e9a176fa003fd8394 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 23 Nov 2018 13:57:21 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 4 +--- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java | 9 +-------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 33c4b57..9972172 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -1,11 +1,9 @@ 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 javax.persistence.Entity; import java.util.List; /** @@ -17,7 +15,7 @@ import java.util.List; **/ @Data @Api("返回前端数据实体") -public class WmsActionResponseBean extends BaseBean { +public class WmsActionResponseBean { @ApiParam("进度") public Double percent; 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 9f9d6c2..eeb7643 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 @@ -1,16 +1,9 @@ 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; import java.util.List; /** @@ -22,7 +15,7 @@ import java.util.List; **/ @Data @Api("接受前端数据实体") -public class WmsOperationBean extends BaseBean { +public class WmsOperationBean { @ApiParam("扫描内容") public String barCode; From 4e995eac9baa25181f53626940d40bacbea60901 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 23 Nov 2018 14:27:16 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 4049c53..9ab72fc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -92,9 +92,6 @@ public class SysUser extends BaseBean { @ApiParam(value ="用户类型（枚举，待定）" , example ="-1") private Integer userType; - @ApiParam(value ="用户信息") - private transient SysUserInfo userInfo; - @ApiParam(value ="用户所有角色信息") private transient List roleList; 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 17/22] =?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 18/22] =?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 19/22] =?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 20/22] =?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 21/22] =?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(); From df478b5ff52c3ce8162d8e4d987fa990d24c9048 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sat, 24 Nov 2018 11:41:10 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 097f901..cea18b8 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 @@ -1194,7 +1194,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MOVE_ORDER_STATUS { - CREATE(0, "创建"),BE_HANDLE(5, "待处理"),FINISH(10, "已处理"); + CREATE(1, "创建"),BE_HANDLE(10, "待处理"),FINISH(20, "已处理"); private int value; private String description;