【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】

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

@@ -493,6 +493,21 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 两个提交用or拼接
+     *
+     * @param data
+     * @param columnName
+     * @param packBean
+     */
+    public static void getNotOrIsNull(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and (model." + columnName + " in (:m_" + columnName + ") " +
+                    "or   model." + columnName + " is null)", data);
+        }
+    }
+
+
+    /**
      * 封装in查询语句
      *
      * @param data

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

@@ -213,7 +213,7 @@ public class WmsHqlPack {
             numList.add(0);
             numList.add(wmsPOMaster.getPriorRC());
             numList.add(null);
-            DdlPreparedPack.getInPackList(numList, "priorRC", result);
+            DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result);
         }else{
             DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
         }