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

@@ -27,6 +27,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();
     }
 
@@ -60,6 +61,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();
     }
 
@@ -283,7 +285,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();
@@ -335,6 +339,8 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsZones(WmsZones wmsZones) {
         StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result);
         //仓库代码
         HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result);
         //库存地代码
@@ -352,6 +358,8 @@ public class WmsHqlPack {
      */
     public static String packHqlBasCustomer(BasCustomer basCustomer) {
         StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result);
         //客户编号
         HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
         //客户简称
@@ -369,6 +377,8 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) {
         StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result);
         //供应商编号
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
         //供应商简称