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/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/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); }