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

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

@@ -1537,19 +1537,19 @@ public class WmsHqlPack {
      * @param wmsDataAuth
      * @return
      */
-    public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) {
+    public static DdlPackBean packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
         if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) {
-            HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result);
+            DdlPreparedPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result);
         }
         if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) {
-            HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
+            DdlPreparedPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
         }
         if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) {
-            HqlPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
+            DdlPreparedPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
         }
         getStringBuilderPack(wmsDataAuth, result);
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1558,11 +1558,11 @@ public class WmsHqlPack {
      * @param taskDetails
      * @return
      */
-    public static String packHqlWmsTaskDetails(WmsTaskDetails taskDetails) {
+    public static DdlPackBean packHqlWmsTaskDetails(WmsTaskDetails taskDetails) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result);
         getStringBuilderPack(taskDetails, result);
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1606,11 +1606,16 @@ public class WmsHqlPack {
      * @param wmsConfig
      * @return
      */
-    public static String packHqlWmsConfig(WmsConfig wmsConfig) {
+    public static DdlPackBean packHqlWmsConfig(WmsConfig wmsConfig) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+
+        DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+        DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result);
+        DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result);
+        DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigValueType(), "configValueType", result);
+
         getStringBuilderPack(wmsConfig, result);
-        return result.toString();
+        return result;
     }
 
     /**