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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -26,6 +26,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsRoutingDetail.getSeq(), "seq", result);
         HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result);
         HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true);
+        HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result);
         return result.toString();
     }
 
@@ -59,6 +60,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
         HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result);
         HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+        HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
         return result.toString();
     }
 
@@ -92,6 +94,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result);
 
         return result.toString();
     }
@@ -129,6 +132,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result);
         HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
 
         return result.toString();
     }
@@ -280,7 +284,9 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
-        HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result);
+        if(wmsOpType.getSeq()!= null){
+            HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result);
+        }
         HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result);
         HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result);
         return result.toString();