Merge branch 'dev' into test

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

@@ -2379,7 +2379,7 @@ public class WmsHqlPack {
 
 
 
-    /**
+     /**
      * 业务：库存查询封装
      *
      * @param wmsStockQuan
@@ -2388,22 +2388,25 @@ public class WmsHqlPack {
     public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
         DdlPackBean result = new DdlPackBean();
 
-
+     
         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;
     }
-
+    
     public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
         DdlPackBean result = new DdlPackBean();
 
-
+     
         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;