Merge remote-tracking branch 'origin/master'

modules/i3plus-pojo-base/pom.xml

@@ -31,6 +31,10 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
 
     </dependencies>
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -56,11 +56,11 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "有效性",example = "1")
     public Integer isValid;    //EnumUtil.isValid;
 
-    @Column(name="create_user")
+    @Column(name="create_user",updatable = false)
     @ApiParam(value = "创建用户")
     public String createUser;
 
-    @Column(name="create_date")
+    @Column(name="create_date",updatable = false)
     @ApiParam(value = "创建日期")
     public String createDatetime;
 
@@ -89,11 +89,11 @@ public abstract class BaseBean implements Serializable {
     public transient String modifyDateTimeEnd;
 
     @ApiParam(value = "排序属性")
-    public transient String orderByParam;
+    public transient String orderByParam = "";
 
     @ApiParam(value = "排序属性",example = "1")
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
-    public transient int ascOrDesc;
+    public transient int ascOrDesc = 1;
 
     //排序方式
     public String orderBy(){
@@ -109,7 +109,4 @@ public abstract class BaseBean implements Serializable {
         return result;
     }
 
-    public String getOrderByParam() {
-        return this.orderByParam == null ? "" : this.orderByParam;
-    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java

@@ -43,6 +43,9 @@ public class PagerHelper {
     }
 
     private static Pager getPager(int pageSize, int currentPage, int totalRows) {
+        // TODO 10可用系统参数替换
+        pageSize = pageSize == 0 ? 10 : pageSize;
+
         Pager pager = new Pager();
         pager.setPageSize(pageSize);
         pager.setTotalRows(totalRows);

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -502,4 +502,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;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -10,6 +10,40 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class WmsEnumUtil {
+
+    /**
+     * 交易状态
+     */
+    public enum TRANS_STATUS {
+        CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败");
+
+        private int value;
+        private String description;
+
+        private TRANS_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * 消息队列，队列名称
      * 1: success_queue

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -83,6 +83,13 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public void deleteByIds(Long[] ids);
 
     /**
+     * 批量删除 指定列名
+     * @param propName
+     * @param ids
+     */
+    public void deleteByTypeLong(String propName, Long[] ids);
+
+    /**
      * 通过多单属性进行单个值更新
      * @param conditionName
      * @param conditionValue
@@ -128,6 +135,13 @@ public interface BaseRepository <T, ID extends Serializable> 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 +240,6 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public List<Object[]> findBySqlObjList(String sql);
 
     public List<Object[]> findBySqlObjListByPager(String sql,Pager pager);
+
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -145,14 +145,19 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public void deleteByIds(Long[] ids) {
-        if(ids != null && ids.length > 0){
+        deleteByTypeLong("id",  ids);
-            String hql = "delete from " + persistentClass.getName() + " model where model.id in(:ids) ";
+    }
+
+    @Override
+    public void deleteByTypeLong(String propName, Long[] ids) {
+        if ((propName != null && propName.length() > 0) && (ids != null && ids.length > 0)) {
+            String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:ids) ";
             Query query = entityManager.createQuery(hql);
             query.setParameter("ids", Arrays.asList(ids));
 
             query.executeUpdate();
         }else{
-            throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! ids:" + ids);
+            throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! "+propName+":" + ids);
         }
     }
 
@@ -777,6 +782,28 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java

@@ -77,6 +77,4 @@ public class SysRole extends BaseBean {
     @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1")
     private Integer roleStatusId;
 
-
-
 }

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<LogOperate, Long> {
 }
+*/

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 
@@ -172,6 +173,10 @@ public class CoreHqlPack {
         // hql拼接
         HqlPack.getStringLikerPack(sysDictionary.getName(),"name",result);
         HqlPack.getStringLikerPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result);
+        // 默认查询非顶级字典
+        if(sysDictionary.getParentId() == null || sysDictionary.getParentId() < 1){
+            HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(),"parentId",result);
+        }
         HqlPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",result);
 
         return result.toString();
@@ -301,4 +306,15 @@ public class CoreHqlPack {
         return  result.toString();
     }
 
+    public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){
+        StringBuffer result = new StringBuffer();
+
+        // and
+        HqlPack.getStringEqualPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result);
+        // not
+        HqlPack.getNumNOEqualPack(sysDictionary.getId(),"id",result);
+
+        return result.toString();
+    }
+
 }

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
+ * @Author : amy
- * @CreateDate : 2018-09-04 15:58
+ * @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;
 }

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
+ * @Author : amy
- * @CreateDate : 2018-09-13 9:47
+ * @CreateDate : 2018-11-06 9:47
  * @Modify:
  **/
 @Repository

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;
@@ -100,6 +101,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
+        HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result);
         HqlPack.getStringLikerPack(wmsTransType.getTransCode(),"transCode",result);
         HqlPack.getStringLikerPack(wmsTransType.getTransName(),"transName",result);
 
@@ -116,9 +118,23 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringEqualPack(wmsTrans.getTransCode(),"transCode",result);
-        HqlPack.getNumEqualPack(wmsTrans.getSn(),"sn",result);
+        HqlPack.getStringEqualPack(wmsTrans.getSn(),"sn",result);
         HqlPack.timeBuilder(wmsTrans.getCreateDatetime(),null,"createDatetime",result,true);
 
         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();
+    }
 }