Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -12,6 +12,42 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes条码生成规则最大值后是否循环
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NUMBER_RULE_ISCYCLE {
+
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        NUMBER_RULE_ISCYCLE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 关键件条码规则信息绑定规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -25,7 +25,7 @@ import java.util.*;
  * @Modify:
  **/
 public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRepository<T, ID>
-                                                            implements BaseRepository<T, ID> {
+        implements BaseRepository<T, ID> {
     public static final Logger LOGGER = LoggerFactory.getLogger(BaseRepositoryImpl.class);
 
     /**
@@ -391,8 +391,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         return query.setFirstResult(offset)
-                 .setMaxResults(pageSize)
-                 .getResultList();
+                .setMaxResults(pageSize)
+                .getResultList();
     }
 
     @Override
@@ -607,8 +607,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         if(pager.getTotalRows() > 0){
             String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
             return entityManager.createQuery(queryString)
-                        .setParameter(propertyName, value)
-                        .getResultList();
+                    .setParameter(propertyName, value)
+                    .getResultList();
         }else{
             return new ArrayList<T>();
         }
@@ -671,7 +671,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public List<T> findByHqlWhere(DdlPackBean packBean) {
         Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
-                                    + " as model where 1=1 " + packBean.getPackedHql());
+                + " as model where 1=1 " + packBean.getPackedHql());
 
         for (String key : packBean.getHqlPreparedMap().keySet()) {
             query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
@@ -958,9 +958,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public List<?> findBySqlPage(String sql, Class entity, Pager pager) {
         if(pager.getTotalRows() > 0){
             return entityManager.createNativeQuery(sql,entity)
-                        .setFirstResult(pager.getStartRow())
-                        .setMaxResults(pager.getPageSize())
-                        .getResultList();
+                    .setFirstResult(pager.getStartRow())
+                    .setMaxResults(pager.getPageSize())
+                    .getResultList();
         }else{
             return new ArrayList();
         }
@@ -975,8 +975,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int findBySqlCount(String sql) {
         try{
             Long count = (Long) entityManager
-                        .createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Long.class)
-                        .getSingleResult();
+                    .createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Long.class)
+                    .getSingleResult();
             return count == null ? 0 : count.intValue();
         }catch(NoResultException e){
             return 0;
@@ -1081,9 +1081,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             queryString.append(" " + orderByStuff);
 
             return entityManager.createQuery(queryString.toString())
-                            .setFirstResult(pager.getStartRow())
-                            .setMaxResults(pager.getPageSize())
-                            .getResultList();
+                    .setFirstResult(pager.getStartRow())
+                    .setMaxResults(pager.getPageSize())
+                    .getResultList();
         }else{
             return new ArrayList<T>();
         }
@@ -1140,9 +1140,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
         if(pager.getTotalRows() > 0){
             return entityManager.createNativeQuery(sql)
-                        .setFirstResult(pager.getStartRow())
-                        .setMaxResults(pager.getPageSize())
-                        .getResultList();
+                    .setFirstResult(pager.getStartRow())
+                    .setMaxResults(pager.getPageSize())
+                    .getResultList();
         }else{
             return new ArrayList<Object[]>();
         }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java

@@ -38,7 +38,7 @@ public class MesNumberRule extends BaseBean {
 
     @Column(name = "PREFIX")
     @ApiParam("前缀")
-    private Integer prefix;
+    private String prefix;
 
     @Column(name = "NUMBER_RULE")
     @ApiParam("编码规则")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :条码生成规则
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-23
+ * @Modify:
+ **/
+@Repository
+public interface MesNumberRuleRepository extends BaseRepository<MesNumberRule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1077,4 +1077,30 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+
+    /**
+     * Mes条码生成规则
+     * @param numberRule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesNumberRule(MesNumberRule numberRule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(numberRule, organizeCode);
+        if (StringUtils.isNotEmpty(numberRule.getRuleCode())) {
+            DdlPreparedPack.getStringLikerPack(numberRule.getRuleCode(), "ruleCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(numberRule.getNumberRule())) {
+            DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean);
+        }
+        if (StringUtils.isNotEmpty(numberRule.getPrefix())) {
+            DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean);
+        }
+        if (null != numberRule.getIsCycle()) {
+            DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);
+        }
+
+        packBean.setOrderByStr(numberRule.orderBy());
+        return packBean;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -75,15 +75,15 @@ public class WmsActionGroup extends BaseBean {
     private Integer submitStepSeq;
 
     public long getInitAmIdVal() {
-        return this.initAmId == null ? 0 : this.initAmId.intValue();
+        return this.initAmId == null ? 0 : this.initAmId.longValue();
     }
 
     public long getDetailsAmIdVal() {
-        return this.detailsAmId == null ? 0 : this.detailsAmId.intValue();
+        return this.detailsAmId == null ? 0 : this.detailsAmId.longValue();
     }
 
     public long getEndAmIdVal() {
-        return this.endAmId == null ? 0 : this.endAmId.intValue();
+        return this.endAmId == null ? 0 : this.endAmId.longValue();
     }
 
     public int getAutoInitVal() {