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

@@ -893,14 +893,14 @@ public class WmsHqlPack {
      * @param tranNo
      * @return
      */
-    public static String packWmsTransSn(String tranNo) {
+    public static DdlPackBean packWmsTransSn(String tranNo) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        HqlPack.getStringEqualPack(tranNo, "transNo", result);
+        DdlPreparedPack.getStringEqualPack(tranNo, "transNo", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -909,19 +909,19 @@ public class WmsHqlPack {
      * @param wmsTransQuan
      * @return
      */
-    public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) {
+    public static DdlPackBean packWmsTransQuan(WmsTransQuan wmsTransQuan) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
-        HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
-        HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
-        HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
-        HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
 
         getStringBuilderPack(wmsTransQuan, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1427,12 +1427,12 @@ public class WmsHqlPack {
      * @param wmsStockSn
      * @return
      */
-    public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
+    public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
-        HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
-        HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
+        DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1441,12 +1441,12 @@ public class WmsHqlPack {
      * @param wmsStockQuan
      * @return
      */
-    public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) {
+    public static DdlPackBean packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
-        HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
-        HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
         getStringBuilderPack(wmsStockQuan, result);
-        return result.toString();
+        return result;
     }
 
     /**