Merge branch 'dev' into test

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

@@ -2391,7 +2391,8 @@ public class WmsHqlPack {
      
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
-
+       // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
+        DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
         getStringBuilderPack(wmsRouting, result);
 
         return result;
@@ -2402,8 +2403,10 @@ public class WmsHqlPack {
 
      
         DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
-//        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+        DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result);
   
+        DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result);
+        DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result);
         getStringBuilderPack(wmsRoutingRule, result);
 
         return result;