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/common/Pager.java

@@ -31,6 +31,27 @@ public class Pager {
     @ApiParam("翻页操作")
     private String pageMethod;
 
+    /* 默认最小数量分页 */
+    private static final Pager min;
+    /* 默认最大数量分页 */
+    private static final Pager max;
+    /* 默认数量分页 */
+    private static final Pager defaultPager;
+
+    static {
+        min = new Pager();
+        min.setCurrentPage(1);
+        min.setPageSize(10);
+
+        max = new Pager();
+        max.setCurrentPage(1);
+        max.setPageSize(65535);
+
+        defaultPager = new Pager();
+        defaultPager.setCurrentPage(1);
+        defaultPager.setPageSize(100);
+    }
+
     public Pager() {
     }
 
@@ -231,6 +252,30 @@ public class Pager {
         return currentPage > 1;
     }
 
+    /**
+     * 获取默认最小分页数量
+     * @return
+     */
+    public static Pager defaultMinPager(){
+        return min;
+    }
+
+    /**
+     * 默认最大分页数量
+     * @return
+     */
+    public static Pager defaultMaxPager(){
+        return max;
+    }
+
+    /**
+     * 默认分页数量
+     * @return
+     */
+    public static Pager defaultPager(){
+        return defaultPager;
+    }
+
     @Override
     public String toString() {
         return "Pager{" +

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

@@ -3248,7 +3248,8 @@ public class MesEnumUtil {
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
-        REPAIR(70, "返修插单");
+        REPAIR(70, "返修插单"),
+        FICTIVE(80, "虚拟工单");
 
         private int value;
         private String description;
@@ -4897,7 +4898,8 @@ public class MesEnumUtil {
     public enum PART_TRAIT {
         NORMAL(10, "正常件"),
         FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
-        FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成");
+        FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"),
+        FICTIVE(40, "虚拟件");
 
         private int value;
         private String description;

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

@@ -243,6 +243,9 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
 
     T getByProperty(String[] propertyNames, Object[] values);
 
+    @Deprecated
+    T getByPropertyPager(String[] propertyNames, Object[] values,Pager pager);
+
     int listCount();
 
     int findByPropertyCount(String propertyName, Object value);

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

@@ -390,7 +390,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> listPager(Pager pager) {
-        if (pager.getTotalRows() > 0) {
+        if (pager != null) {
             return entityManager.createQuery("from " + persistentClass.getName())
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
@@ -506,10 +506,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public T getByProperty(DdlPackBean packBean) {
-
         try {
-            List<T> list = findByHqlWhere(packBean);
-            return list.size() != 0 ? list.get(0) : null;
+            List<T> list = findByHqlWherePage(packBean,Pager.defaultMinPager());
+            return list != null && list.size() != 0 ? list.get(0) : null;
         }catch(NoResultException ne){
             LOGGER.error("数据不存在，DdlPackBean：{}",packBean);
             return null;
@@ -521,21 +520,18 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public T getByProperty(String propertyName, Object value) {
-        String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
-        try {
-            List<T> list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList();
-            return list.size() != 0 ? list.get(0) : null;
-        }catch(NoResultException ne){
-            LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne);
-            return null;
-        }catch(NonUniqueResultException ex){
-            LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}",propertyName,value,ex);
-            throw new RuntimeException("存在多条记录：" + ex.getMessage());
-        }
+        return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, Pager.defaultMinPager());
     }
 
     @Override
     public T getByProperty(String[] propertyNames, Object[] values) {
+        return getByPropertyPager(propertyNames, values, Pager.defaultMinPager());
+    }
+
+    @Override
+    public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) {
+        pager = pager == null ? Pager.defaultMinPager(): pager;
+
         if(propertyNames.length != values.length){
             throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
         }
@@ -561,7 +557,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         try{
-            List<T> list = queryObject.getResultList();
+            List<T> list = queryObject
+                    .setFirstResult(pager.getStartRow())
+                    .setMaxResults(pager.getPageSize())
+                    .getResultList();
             return list.size() != 0 ? list.get(0) : null;
         }catch(NoResultException ne){
             LOGGER.error("数据不存在",ne);
@@ -648,7 +647,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
             return entityManager.createQuery(queryString)
                     .setParameter(propertyName, value)
@@ -660,7 +659,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             if(propertyNames.length != values.length){
                 throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
             }
@@ -791,7 +790,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             if(propertyNames.length != values.length){
                 throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
             }
@@ -826,7 +825,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Deprecated
     @Override
     public List<T> findByHqlWherePage(String hqlWhere, Pager pager) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             StringBuffer queryString = new StringBuffer();
             queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
 
@@ -845,7 +844,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWherePage(DdlPackBean packBean, Pager pager) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
                     + " as model where 1=1 " + packBean.getPackedHql());
 
@@ -923,7 +922,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlPage(String hqlWhere, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             StringBuffer queryString = new StringBuffer();
             queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
 
@@ -942,7 +941,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlPage(DdlPackBean packBean, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
                     + " as model where 1=1 " + packBean.getPackedHql());
 
@@ -960,7 +959,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             Query queryObject = entityManager.createQuery(hql);
             for (int i = 0; i < paramName.length; i++) {
                 if (paramValue[i] != null) {
@@ -988,7 +987,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List findBySqlPage(String sql, Pager pager) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             return entityManager.createNativeQuery(sql)
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
@@ -1000,7 +999,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<?> findBySqlPage(String sql, Class entity, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             return entityManager.createNativeQuery(sql,entity)
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
@@ -1113,7 +1112,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             StringBuffer queryString = new StringBuffer();
 
             queryString.append(hql + " as model where 1=1 ");
@@ -1152,7 +1151,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<Object[]> findByHqlPageObjects(String hql, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
         }else{
             return new ArrayList<Object[]>();
@@ -1161,7 +1160,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<Object[]> findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             Query queryObject = entityManager.createQuery(hql);
             for (int i = 0; i < paramName.length; i++) {
                 if (paramValue[i] != null) {
@@ -1182,7 +1181,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             return entityManager.createNativeQuery(sql)
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())

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

@@ -96,6 +96,26 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("物料特性")
     private Integer partTrait;
 
+    @Column(name = "COLOR_CODE")
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @Column(name = "SHELVES_AMOUNT")
+    @ApiParam("挂架数")
+    private Integer shelvesAmount;
+
+    @Column(name = "QUANTITY_PER_RACK")
+    @ApiParam("挂架可放零件数")
+    private Integer quantityPerRack;
+
+    @Column(name = "PAINT_TANK_CODE")
+    @ApiParam("供漆罐代码")
+    private String paintTankCode;
+
+    @Column(name = "PRE_PART_NO")
+    @ApiParam("打磨件物料号")
+    private String prePartNo;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -173,6 +173,14 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("预留字段5")
     private String reserved5;
 
+    @Column(name = "RESERVED6")
+    @ApiParam("预留字段6")
+    private String reserved6;
+
+    @Column(name = "RESERVED7")
+    @ApiParam("预留字段7")
+    private String reserved7;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -139,13 +139,13 @@ public class StationRequestBean implements Serializable {
     private Boolean stepDialogStatus = false;
 
     @ApiParam("是否按时完成")
-    private Integer isOnTimeComplete;
+    private Integer isOnTimeComplete = 1;
 
     @ApiParam("工位剩余时间")
     private Long remainWorkTime;
 
     @ApiParam("是否操作超时")
-    private Integer isTimeOut;
+    private Integer isTimeOut = 2;
 
     @ApiParam("特殊展示数据")
     private Map<String, Object> specialDisplayMap  = new HashMap<>();