Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java

@@ -55,4 +55,12 @@ public class BasVendor extends BaseBean{
     @Column(name = "IS_ASN")
     @ApiParam(value = "是否发ASN", example = "0")
     private Integer isAsn;
+
+    @Column(name = "USER_NAME")
+    @ApiParam(value = "用户名")
+    private String userName;
+
+    @Column(name = "PASSWORD")
+    @ApiParam(value = "密码")
+    private String password;
 }

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

@@ -299,20 +299,21 @@ public class WmsHqlPack {
      * @param wmsLocate
      * @return
      */
-    public static String packHqlWmsLocates(WmsLocate wmsLocate) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) {
+        //查询参数封装
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result);
-        HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result);
-        HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
-        HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
-        HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
-        HqlPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
+        DdlPreparedPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result);
+        DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
+        DdlPreparedPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
 
         getStringBuilderPack(wmsLocate, result);
 
-        return result.toString();
+        return result;
     }
 
     /**