From 2ad41030e69bbb2d155cebf53a6f8920781174f4 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 11 Dec 2018 10:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E5=B9=B6=E6=89=93=E5=BC=80=20MQ=20=E4=BB=A5=E5=8F=8A=E9=82=AE?= =?UTF-8?q?=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 10 ++++++++ .../i3plus/pojo/model/wms/CheckPointModel.java | 1 - .../i3plus/pojo/platform/bean/SysFactoryStore.java | 4 ++-- .../i3plus/pojo/platform/bean/SysOrderNoRule.java | 27 ++++++++++++++++++---- .../i3plus/pojo/platform/bean/SysUserInfo.java | 4 ++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 12 ++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 1 + .../wms/repository/WmsIbCheckPlanRepository.java | 5 ++-- 9 files changed, 56 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index ae21e54..38b454c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -120,6 +120,16 @@ public class CommonEnumUtil { } return tmp; } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java index eabefdf..494586d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java @@ -41,5 +41,4 @@ public class CheckPointModel { *实际抽点数量【从前端输入获取】 */ private Integer actQty; - } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java index dcfe3bd..814ba4f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java @@ -29,9 +29,9 @@ public class SysFactoryStore extends BaseBean { @Column(name="store_code") @ApiParam("仓库代码") - public String storeCode; + private String storeCode; @Column(name="store_name") @ApiParam("仓库名称") - public String storeName; + private String storeName; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index e086d41..a76db1f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -13,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 单号规则 @@ -58,20 +61,36 @@ public class SysOrderNoRule extends BaseBean { private Long serialNoLength; @Column(name = "IS_CYCLE") - @ApiParam(value = "达到最大值后是否循环",example = "1") + @ApiParam(value = "达到最大值后是否循环",example = "1",hidden = true) private Integer isCycle; + @Transient + @ApiParam(value = "达到最大值后是否循环",example = "否") + private String isCycleName; + + public String getIsCycleName() { + if(isCycle != null){ + CommonEnumUtil.TRUE_OR_FALSE.valueOf(isCycle); + } + return isCycleName; + } + + public void setIsCycleName(String isCycleName) { + this.isCycleName = isCycleName; + this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName); + } + @Column(name = "SERIAL_NO") - @ApiParam(value = "当前流水号",example = "-1") + @ApiParam(value = "当前流水号",example = "-1",hidden = true) @JsonSerialize(using = ToStringSerializer.class) private Long serialNo; @Column(name = "ORDER_NO") - @ApiParam(value = "当前单号") + @ApiParam(value = "当前单号",hidden = true) private String orderNo; @Column(name = "ORDER_NO_RULE_STATUS") - @ApiParam(value = "单号规则状态") + @ApiParam(value = "单号规则状态",hidden = true) private Integer orderNoRuleStatus; @Column(name="ORDER_NO_RULE_DESCRIPTION") 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 84781e3..84d5d02 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 @@ -113,6 +113,10 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="登录次数",example = "0") private Integer userLoginNum; + @Column(name="USER_NUM") + @ApiParam(value ="用户账号数",example = "0") + private Integer userNum; + @Transient @ApiParam(value ="用户所有部门信息") private List departmentList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 1b0d73a..f77920e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; +import java.util.List; + /** * @Description : 平台对象封装 * @Reference : @@ -113,6 +115,16 @@ public class CoreHqlPack { return result.toString(); } + public static String packHqlSysOrganize(Long[] ids, Integer typeId){ + StringBuffer result = new StringBuffer(); + + // 查询参数封装 + HqlPack.getInPack(StringUtils.join(ids,","),"id",result); + HqlPack.getNumEqualPack(typeId,"organizeType",result); + + return result.toString(); + } + /** * 部门复杂查询 * @param department diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 71c9869..6e95f51 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -35,7 +35,7 @@ public class WmsMoveMaster extends BaseBean { /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 + * MI=移库入库,MO=移库出库,SO=发运1 */ @Column(name="ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 62774b3..c466a30 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -18,6 +18,7 @@ import javax.persistence.Table; * @Author : hansen.ke * @CreateDate : 2018-11-28 15:20 * @Modify: + * 2018-12-10 10:39:46 **/ @Data @Entity diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java index fd86ecd..430e521 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java @@ -6,10 +6,11 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.Date; +import java.util.List; /** * @Description : 抽点比例表 - * @Reference : + * @Reference :1 * @Author : jimmy.zeng * @CreateDate : 2018-11-07 11:17 * @Modify: @@ -17,6 +18,6 @@ import java.util.Date; public interface WmsIbCheckPlanRepository extends BaseRepository { @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and icp.organizeCode=:organizeCode and icp.startDate<=:date and icp.endDate>=:date") - WmsIbCheckPlan findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date); + List findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date); }