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

@@ -932,17 +932,17 @@ public class WmsHqlPack {
      * @param wmsPackage
      * @return
      */
-    public static String packWmsPackAge(WmsPackage wmsPackage) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packWmsPackAge(WmsPackage wmsPackage) {
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
-        HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
-        HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
+        DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
 
         getStringBuilderPack(wmsPackage, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1412,15 +1412,15 @@ public class WmsHqlPack {
      * @param wmsSnPrintRcd
      * @return
      */
-    public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result);
-        HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result);
-        HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result);
-        HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);
-        HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result);
+    public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result);
+        DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result);
         getStringBuilderPack(wmsSnPrintRcd, result);
-        return result.toString();
+        return result;
     }
 
     /**