Merge branch 'dev' into test

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

@@ -685,9 +685,9 @@ public class WmsHqlPack {
         // 来源单据类型
         DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
         // 来源单据号
-        DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsSnPrint.getRefNo(), "refNo", result);
         // 打印机
-        DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
+        DdlPreparedPack.getStringLikerPack(wmsSnPrint.getPrinter(), "printer", result);
         // 打印机状态
         DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result);
 
@@ -948,8 +948,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
         DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
 
         getStringBuilderPack(wmsPackage, result);
@@ -985,11 +985,11 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
-        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result);
-        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
+        DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
+        DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
 
         DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
                 wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
@@ -1085,13 +1085,13 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //单号
-        DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result);
         //业务类型
         DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
         //关联单据类型
         DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
         //关联单据号
-        DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+        DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
 
         getStringBuilderPack(wmsQCMaster, result);
 
@@ -1712,10 +1712,10 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
         DdlPackBean packBean = new DdlPackBean();
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
-            DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean);
+            DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmName(), "tmName", packBean);
         }
         if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
-            DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean);
+            DdlPreparedPack.getStringLikerPack(wmsTransModule.getCallClass(), "callClass", packBean);
         }
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
             DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);