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/jpa/daoimpl/BaseRepositoryImpl.java

@@ -10,7 +10,6 @@ import org.hibernate.NonUniqueResultException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
-import org.springframework.util.CollectionUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -219,7 +218,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 更新参数汇总方法
-     *
      * @param conditionName 条件属性名
      * @param conditionValue 条件属性值
      * @param propertyName  更新属性名
@@ -480,22 +478,25 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public T getByProperty(DdlPackBean packBean) {
+
+        try {
             List<T> list = findByHqlWhere(packBean);
-        if (CollectionUtils.isEmpty(list)) {
+            return list.size() != 0 ? list.get(0) : null;
+        }catch(NoResultException ne){
             LOGGER.error("数据不存在，DdlPackBean：{}",packBean);
-            throw new RuntimeException("数据不存在");
+            return null;
-        } else if (list.size() > 1) {
+        }catch(NonUniqueResultException ex){
             LOGGER.error("查询单条记录，但出现多条。packBean：{}",packBean);
-            throw new RuntimeException("存在多条记录");
+            throw new RuntimeException("存在多条记录：" + ex.getMessage());
         }
-        return list.iterator().next();
     }
 
     @Override
     public T getByProperty(String propertyName, Object value) {
         String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
         try {
-            return (T) entityManager.createQuery(queryString).setParameter(propertyName, value).getSingleResult();
+            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;
@@ -532,7 +533,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         try{
-            return (T) queryObject.getSingleResult();
+            List<T> list = queryObject.getResultList();
+            return list.size() != 0 ? list.get(0) : null;
         }catch(NoResultException ne){
             LOGGER.error("数据不存在",ne);
             return null;
@@ -1148,7 +1150,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 保存对象
-     *
      * @param item 保存对象
      * @return
      */
@@ -1212,7 +1213,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 对为赋值的属性进行赋值
-     *
      * @param field
      */
     private void fieldSetInitParam(T item,Field field) {
@@ -1268,7 +1268,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 批量弱删除
-     *
      * @return
      */
     @Override
@@ -1291,7 +1290,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 批量弱删除
-     *
      * @return
      */
     @Override
@@ -1330,7 +1328,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 批量禁用
-     *
      * @return
      */
     @Override
@@ -1353,7 +1350,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 批量禁用
-     *
      * @return
      */
     @Override

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

@@ -211,7 +211,7 @@ public class WmsMoveSn extends BaseBean {
     }
     public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
             String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
-            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode){
+            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn){
             this.organizeCode=organizeCode;
             this.orderNo=orderNo;
             this.item=item;
@@ -236,5 +236,6 @@ public class WmsMoveSn extends BaseBean {
             this.destZoneNo = destZoneNo;
             this.destWhNo =destWhNo;
             this.busiTypeCode = busiTypeCode;
+            this.sn = sn;
 }
 }