diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
index 3240a9a..c8eddfd 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
@@ -1,6 +1,46 @@
 package cn.estsh.i3plus.pojo.andon.sqlpack;
 
-import cn.estsh.i3plus.pojo.andon.bean.*;
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam;
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
+import cn.estsh.i3plus.pojo.andon.bean.AndonActor;
+import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule;
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType;
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg;
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
+import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast;
+import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellGroupCfg;
+import cn.estsh.i3plus.pojo.andon.bean.AndonConfig;
+import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg;
+import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg;
+import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod;
+import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon;
+import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg;
+import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType;
+import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase;
+import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
+import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord;
+import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord;
+import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType;
+import cn.estsh.i3plus.pojo.andon.bean.AndonPLC;
+import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach;
+import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
+import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject;
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
+import cn.estsh.i3plus.pojo.andon.bean.MesArea;
+import cn.estsh.i3plus.pojo.andon.bean.MesEquipment;
+import cn.estsh.i3plus.pojo.andon.bean.MesShift;
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell;
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -788,7 +828,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result);
+        if (mesArea != null) {
+            DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -805,7 +847,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result);
+        if (mesWorkCenter != null) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -822,7 +866,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result);
+        if (mesWorkCell != null) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -839,7 +885,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result);
+        if (mesEquipment != null) {
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -857,7 +905,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result);
+        if (mesShift != null) {
+            DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(), "shiftCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
index 26e9d6c..96ba229 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
@@ -43,9 +43,4 @@ public abstract class BaseAPS extends BaseBean {
     public void setCustomField(String code, Object value) {
         customFields.put(code, value);
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        return this == obj;
-    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
index 2fa0ef7..0e529ea 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
@@ -77,7 +77,7 @@ public class DateDuration {
      * @return
      */
     public long getTimeInMillis() {
-        return this.time * 1000;
+        return this.time * 1000l;
     }
 
     @Override
@@ -153,7 +153,7 @@ public class DateDuration {
      * @return
      */
     public long getTimeInMillis(double amount) {
-        return this.getTime(amount) * 1000;
+        return this.getTime(amount) * 1000l;
     }
 
     private void parse() {
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java
index 35cc4ba..027f459 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java
@@ -12,7 +12,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class CustomDateDeserializer extends JsonDeserializer<Date> {
-    public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Override
     public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java
index 8b8780d..6bfd17f 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java
@@ -9,7 +9,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class CustomDateSerializer extends JsonSerializer<Date> {
-    public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Override
     public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
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 f1d9061..2e3d875 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
@@ -20,7 +20,13 @@ import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * @Description : 自定义持久化接口实现
@@ -1579,8 +1585,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         Query query = entityManager.createQuery(queryString.toString());
-        for (String key : packBean.getHqlPreparedMap().keySet()) {
-            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
+        if (packBean != null) {
+            for (String key : packBean.getHqlPreparedMap().keySet()) {
+                query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key));
+            }
         }
 
         return query.getResultList();
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 379c7cb..c7611a7 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
@@ -2216,8 +2216,8 @@ public class WmsHqlPack {
         if (wmsProdCfgType != null) {
             DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
             DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
+            DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result);
         }
-        DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 //        getStringBuilderPack(wmsProdCfgType, result);
         return result;