订单可选择商品查询添加isall参数

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -797,6 +797,7 @@ public class OrderItems extends Controller {
     @CACHEING
     public String selectItemList() throws YosException {
         StringBuffer where = new StringBuffer(" 1=1 ");
+        boolean isall = content.getBooleanValue("isall");
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
@@ -829,7 +830,11 @@ public class OrderItems extends Controller {
             typemx = orderRows.get(0).getString("typemx");
             sys_enterpriseid = orderRows.get(0).getLong("sys_enterpriseid");
         }
+
         SQLFactory sqlFactory = new SQLFactory(this, "查询可添加商品列表", pageSize, pageNumber, pageSorting);
+        if(isall){
+            sqlFactory = new SQLFactory(this, "查询可添加商品列表");
+        }
         switch (type) {
 //            case "总部订单":
 //                sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单", pageSize, pageNumber, pageSorting);
@@ -837,14 +842,23 @@ public class OrderItems extends Controller {
             case "特殊订单":
                 if (typemx.equals("电商") || typemx.equals("工程")) {
                     sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单", pageSize, pageNumber, pageSorting);
+                    if(isall){
+                        sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单");
+                    }
                 } else {
                     sqlFactory = new SQLFactory(this, "查询可添加商品列表_特殊订单", pageSize, pageNumber, pageSorting);
+                    if(isall){
+                        sqlFactory = new SQLFactory(this, "查询可添加商品列表_特殊订单");
+                    }
                 }
                 Rows rows =dbConnect.runSqlQuery("select * from  sa_agents where agentnum in('2314','2315') and siteid='"+siteid+"'");
                 if(!rows.isEmpty()){
                     for (Row row:rows) {
                         if(row.getLong("sys_enterpriseid")==sys_enterpriseid){
                             sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单", pageSize, pageNumber, pageSorting);
+                            if(isall){
+                                sqlFactory = new SQLFactory(this, "查询可添加商品列表_总部订单");
+                            }
                         }
                     }
                 }