From 11dcd6be3a6f97f1ccb3d84d34c9b8d143a62019 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 6 Nov 2018 18:41:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 23 ++++++++++++++++++++++ .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 9 +++++++++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 22 +++++++++++++++++++++ .../platform/repository/LogOperateRepository.java | 6 +++++- .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 23 ++++++---------------- .../pojo/wms/repository/WareHouseRepository.java | 4 ++-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 ++++++++++++++ 7 files changed, 82 insertions(+), 20 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 54b1d81..4d95887 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 @@ -492,4 +492,27 @@ public class CommonEnumUtil { } } + /** + * 启用或禁用 + */ + public enum OPEN_CLOSE { + OPEN(1, "启用"), + CLOSE(2, "禁用"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + OPEN_CLOSE(int value, String description) { + this.value = value; + this.description = description; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 96c9529..66fbd7f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -128,6 +128,13 @@ public interface BaseRepository extends JpaReposito public int updateByHqlWhere(String hqlWhere,String propertyName, Object propertyValue); /** + * 批量弱删除仓库信息 + * @param ids + * @return + */ + public boolean deleteWeaklyByIds(Long[] ids) ; + + /** * 批量修改数据熟悉 * @param hqlWhere HQL where 语句 * @param propertyName 修改的字段名称 @@ -226,4 +233,6 @@ public interface BaseRepository extends JpaReposito public List findBySqlObjList(String sql); public List findBySqlObjListByPager(String sql,Pager pager); + + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 6768a89..55249c3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -777,6 +777,28 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** + * 批量弱删除 + * @param ids + * @return + */ + @Override + public boolean deleteWeaklyByIds(Long[] ids) { + if(ids != null && ids.length > 0){ + String hql = "update " + persistentClass.getName() + " model where model.id in(:ids) "; + Query query = entityManager.createQuery(hql); + query.setParameter("ids", Arrays.asList(ids)); + + int delResult = query.executeUpdate(); + if (delResult == ids.length) { + return true; + } + }else{ + throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! ids:" + ids); + } + return false; + } + + /** * 保存对象 * @param item 保存对象 * @return diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java index ebc7b4a..90adcd2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java @@ -1,3 +1,4 @@ +/* package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; @@ -5,12 +6,15 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import org.springframework.data.mongodb.repository.MongoRepository; +*/ /** * @Description : 操作日志表(使用Mongodb) * @Reference : * @Author : wei.peng * @Date : 2018-10-22 12:03:00.118 * @Modify : - **/ + **//* + public interface LogOperateRepository extends BaseMongoRepository { } +*/ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 201f865..f847cac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -14,39 +14,28 @@ import javax.persistence.Table; /** * @Description : 工厂仓库 * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 + * @Author : amy + * @CreateDate : 2018-11-06 15:58 * @Modify: **/ @Data @Entity @DynamicInsert @DynamicUpdate -@Table(name="T_WMS_WAREHOUSE") +@Table(name="WMS_WAREHOUSE") @Api("工厂仓库信息") public class WareHouse extends BaseBean { - @Column(name="code") + @Column(name="CODE") @ApiParam("仓库代码") public String code; - @Column(name="name") + @Column(name="NAME") @ApiParam("仓库名称") public String name; - @Column(name="address") + @Column(name="ADDRESS") @ApiParam("仓库地址") public String address; - @Column(name="telephone") - @ApiParam("仓库电话号码") - public String telephone; - - @Column(name="fax") - @ApiParam("仓库传真号码") - public String fax; - - @Column(name="contact") - @ApiParam("联系人") - public String contact; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WareHouseRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WareHouseRepository.java index 18825fb..cce89d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WareHouseRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WareHouseRepository.java @@ -7,8 +7,8 @@ import org.springframework.stereotype.Repository; /** * @Description : 对象持久层仓用方法控制 * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 9:47 + * @Author : amy + * @CreateDate : 2018-11-06 9:47 * @Modify: **/ @Repository 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 8009e30..638df10 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; @@ -121,4 +122,18 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 仓库分页查询条件 + * @param wareHouse + * @return + */ + public static String packHqlWareHouse(WareHouse wareHouse) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result); + return result.toString(); + } }