Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -504,6 +504,19 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装not in String查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param packBean
+     */
+    public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
+        if (data != null && data.length > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
+        }
+    }
+
+    /**
      * 封装in String查询语句
      *
      * @param data
@@ -559,9 +572,9 @@ public class DdlPreparedPack {
             data = "";
             for (int i = 0; i < dataArray.length; i++) {
                 if (i == dataArray.length - 1) {
-                    data += "'" + dataArray[i] + "'";
+                    data += "" + dataArray[i] + "";
                 } else {
-                    data += "'" + dataArray[i] + "',";
+                    data += "" + dataArray[i] + ",";
                 }
             }
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.wms;
 
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,15 +38,12 @@ public class WmsMessageStyleModel implements Serializable {
 
     public WmsMessageStyleModel() {
     }
+
     public WmsMessageStyleModel(String message, Integer selectQty) {
         this.message = message;
-        if(selectQty==1){
-        this.wsStatus=10;
-     }
-     if(selectQty==2){
-         this.wsStatus=20;
-     }
+        this.wsStatus = selectQty;
     }
+
     public WmsMessageStyleModel(String message) {
         this.message = message;
     }