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 1/5] =?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 7b71b349a70ac603ca18eb49be3be351d9f84190 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 23 Nov 2018 11:11:13 +0800 Subject: [PATCH 2/5] =?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 3/5] =?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 4/5] =?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 5/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(); + } }