导出代码注释

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -475,32 +475,32 @@ public class cashbill extends Controller {
             row.put("amount", row.getBigDecimal("amount"));
         }
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("period");
-            rows.getFieldList().remove("sys_enterpriseid");
-            rows.getFieldList().remove("abbreviation");
-            rows.getFieldList().remove("enterprisename");
-            rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("status");
-            rows.getFieldList().remove("sourcenote");
-            rows.getFieldList().remove("ownertable");
-            rows.getFieldList().remove("ownerid");
-            rows.getFieldList().remove("createuserid");
-            rows.getFieldList().remove("createby");
-            rows.getFieldList().remove("createdate");
-            rows.getFieldList().remove("changeuserid");
-            rows.getFieldList().remove("changeby");
-            rows.getFieldList().remove("changedate");
-            rows.getFieldList().remove("subclass");
-            rows.getFieldList().remove("class");
-            rows.getFieldList().remove("unwriteoffamount");
-            rows.getFieldList().remove("offsettingbillno");
-
-            Rows uploadRows = uploadExcelToObs("cashBill", "收入凭证列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_accountclassid");
+//            rows.getFieldList().remove("period");
+//            rows.getFieldList().remove("sys_enterpriseid");
+//            rows.getFieldList().remove("abbreviation");
+//            rows.getFieldList().remove("enterprisename");
+//            rows.getFieldList().remove("sa_accountclassid");
+//            rows.getFieldList().remove("status");
+//            rows.getFieldList().remove("sourcenote");
+//            rows.getFieldList().remove("ownertable");
+//            rows.getFieldList().remove("ownerid");
+//            rows.getFieldList().remove("createuserid");
+//            rows.getFieldList().remove("createby");
+//            rows.getFieldList().remove("createdate");
+//            rows.getFieldList().remove("changeuserid");
+//            rows.getFieldList().remove("changeby");
+//            rows.getFieldList().remove("changedate");
+//            rows.getFieldList().remove("subclass");
+//            rows.getFieldList().remove("class");
+//            rows.getFieldList().remove("unwriteoffamount");
+//            rows.getFieldList().remove("offsettingbillno");
+//
+//            Rows uploadRows = uploadExcelToObs("cashBill", "收入凭证列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
         return getSucReturnObject().setData(rows).toString();
     }
 
@@ -566,32 +566,32 @@ public class cashbill extends Controller {
         for (Row row : rows) {
             row.put("amount", row.getBigDecimal("amount"));
         }
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("period");
-            rows.getFieldList().remove("sys_enterpriseid");
-            rows.getFieldList().remove("abbreviation");
-            rows.getFieldList().remove("enterprisename");
-            rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("status");
-            rows.getFieldList().remove("sourcenote");
-            rows.getFieldList().remove("ownertable");
-            rows.getFieldList().remove("ownerid");
-            rows.getFieldList().remove("createuserid");
-            rows.getFieldList().remove("createby");
-            rows.getFieldList().remove("createdate");
-            rows.getFieldList().remove("changeuserid");
-            rows.getFieldList().remove("changeby");
-            rows.getFieldList().remove("changedate");
-            rows.getFieldList().remove("subclass");
-            rows.getFieldList().remove("class");
-            rows.getFieldList().remove("unwriteoffamount");
-            rows.getFieldList().remove("offsettingbillno");
-
-            Rows uploadRows = uploadExcelToObs("cashBill", "支出凭证列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_accountclassid");
+//            rows.getFieldList().remove("period");
+//            rows.getFieldList().remove("sys_enterpriseid");
+//            rows.getFieldList().remove("abbreviation");
+//            rows.getFieldList().remove("enterprisename");
+//            rows.getFieldList().remove("sa_accountclassid");
+//            rows.getFieldList().remove("status");
+//            rows.getFieldList().remove("sourcenote");
+//            rows.getFieldList().remove("ownertable");
+//            rows.getFieldList().remove("ownerid");
+//            rows.getFieldList().remove("createuserid");
+//            rows.getFieldList().remove("createby");
+//            rows.getFieldList().remove("createdate");
+//            rows.getFieldList().remove("changeuserid");
+//            rows.getFieldList().remove("changeby");
+//            rows.getFieldList().remove("changedate");
+//            rows.getFieldList().remove("subclass");
+//            rows.getFieldList().remove("class");
+//            rows.getFieldList().remove("unwriteoffamount");
+//            rows.getFieldList().remove("offsettingbillno");
+//
+//            Rows uploadRows = uploadExcelToObs("cashBill", "支出凭证列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         return getSucReturnObject().setData(rows).toString();
     }
@@ -892,15 +892,15 @@ public class cashbill extends Controller {
         sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
         sqlFactory.addParameter("siteid", siteid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("unwriteoffamount");
-            rows.getFieldList().remove("agentnum");
-            rows.getFieldList().remove("type");
-            Rows uploadRows = uploadExcelToObs("cashBill", "审核状态的收支凭证详情列表", rows, getTitleMap_audit());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_accountclassid");
+//            rows.getFieldList().remove("unwriteoffamount");
+//            rows.getFieldList().remove("agentnum");
+//            rows.getFieldList().remove("type");
+//            Rows uploadRows = uploadExcelToObs("cashBill", "审核状态的收支凭证详情列表", rows, getTitleMap_audit());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
         return getSucReturnObject().setData(rows).toString();
     }
 
@@ -983,12 +983,12 @@ public class cashbill extends Controller {
         factory.addParameter_SQL("where", where);
         Rows rows = dbConnect.runSqlQuery(factory.getSQL());
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_accountclassid");
-            Rows uploadRows = uploadExcelToObs("cashBill", "资金流水账列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_accountclassid");
+//            Rows uploadRows = uploadExcelToObs("cashBill", "资金流水账列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         /**
          * SQL资金流水账汇总信息查询参数设置并查询

src/custom/restcontroller/sale/customer/Customer.java

@@ -561,36 +561,36 @@ public class Customer extends Controller {
                 row.put("industry", new Rows());
             }
         }
-        if (isExport) {
-            //去除不要的导出项
-            rows.getFieldList().remove("sa_customersid");
-            rows.getFieldList().remove("parentid");
-            rows.getFieldList().remove("sys_enterpriseid");
-            rows.getFieldList().remove("sa_customerpoolid");
-            for (Row row : rows) {
-                switch (row.getString("datastatus")) {
-                    case "0":
-                        row.put("datastatusStr", "正常");
-                    case "1":
-                        row.put("datastatusStr", "作废");
-                    case "2":
-                        row.put("datastatusStr", "锁定");
-                }
-            }
-            rows.getFieldList().remove("datastatus");
-            rows.getFieldList().add("datastatusStr");
-            rows.getFieldList().remove("province");
-            rows.getFieldList().remove("city");
-            rows.getFieldList().remove("county");
-            rows.getFieldList().remove("address");
-            rows.getFieldList().remove("taxno");
-            rows.getFieldList().remove("phonenumber");
-            rows.getFieldList().remove("contact");
-
-
-            Rows uploadRows = uploadExcelToObs("1111", "客户列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不要的导出项
+//            rows.getFieldList().remove("sa_customersid");
+//            rows.getFieldList().remove("parentid");
+//            rows.getFieldList().remove("sys_enterpriseid");
+//            rows.getFieldList().remove("sa_customerpoolid");
+//            for (Row row : rows) {
+//                switch (row.getString("datastatus")) {
+//                    case "0":
+//                        row.put("datastatusStr", "正常");
+//                    case "1":
+//                        row.put("datastatusStr", "作废");
+//                    case "2":
+//                        row.put("datastatusStr", "锁定");
+//                }
+//            }
+//            rows.getFieldList().remove("datastatus");
+//            rows.getFieldList().add("datastatusStr");
+//            rows.getFieldList().remove("province");
+//            rows.getFieldList().remove("city");
+//            rows.getFieldList().remove("county");
+//            rows.getFieldList().remove("address");
+//            rows.getFieldList().remove("taxno");
+//            rows.getFieldList().remove("phonenumber");
+//            rows.getFieldList().remove("contact");
+//
+//
+//            Rows uploadRows = uploadExcelToObs("1111", "客户列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
         return getSucReturnObject().setData(rows).toString();
     }
 
@@ -648,36 +648,36 @@ public class Customer extends Controller {
         for (Row row : rows) {
             row.put("leader", leaderRows.get(row.getString("sa_customersid")));
         }
-        if (isExport) {
-            //去除不要的导出项
-            rows.getFieldList().remove("sa_customersid");
-            rows.getFieldList().remove("parentid");
-            rows.getFieldList().remove("sys_enterpriseid");
-            rows.getFieldList().remove("sa_customerpoolid");
-            for (Row row : rows) {
-                switch (row.getString("datastatus")) {
-                    case "0":
-                        row.put("datastatusStr", "正常");
-                    case "1":
-                        row.put("datastatusStr", "作废");
-                    case "2":
-                        row.put("datastatusStr", "锁定");
-                }
-            }
-            rows.getFieldList().remove("datastatus");
-            rows.getFieldList().add("datastatusStr");
-            rows.getFieldList().remove("province");
-            rows.getFieldList().remove("city");
-            rows.getFieldList().remove("county");
-            rows.getFieldList().remove("address");
-            rows.getFieldList().remove("taxno");
-            rows.getFieldList().remove("phonenumber");
-            rows.getFieldList().remove("contact");
-
-
-            Rows uploadRows = uploadExcelToObs("1111", "客户列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不要的导出项
+//            rows.getFieldList().remove("sa_customersid");
+//            rows.getFieldList().remove("parentid");
+//            rows.getFieldList().remove("sys_enterpriseid");
+//            rows.getFieldList().remove("sa_customerpoolid");
+//            for (Row row : rows) {
+//                switch (row.getString("datastatus")) {
+//                    case "0":
+//                        row.put("datastatusStr", "正常");
+//                    case "1":
+//                        row.put("datastatusStr", "作废");
+//                    case "2":
+//                        row.put("datastatusStr", "锁定");
+//                }
+//            }
+//            rows.getFieldList().remove("datastatus");
+//            rows.getFieldList().add("datastatusStr");
+//            rows.getFieldList().remove("province");
+//            rows.getFieldList().remove("city");
+//            rows.getFieldList().remove("county");
+//            rows.getFieldList().remove("address");
+//            rows.getFieldList().remove("taxno");
+//            rows.getFieldList().remove("phonenumber");
+//            rows.getFieldList().remove("contact");
+//
+//
+//            Rows uploadRows = uploadExcelToObs("1111", "客户列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
         return getSucReturnObject().setData(rows).toString();
     }
 

src/custom/restcontroller/sale/order/Order.java

@@ -89,19 +89,19 @@ public class Order extends Controller {
             }
         }
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_orderid");
-            rows.getFieldList().remove("submitdate");
-            rows.getFieldList().remove("checkdate");
-            rows.getFieldList().remove("typemx");
-            rows.getFieldList().remove("sys_enterpriseid");
-            //添加
-            rows.getFieldList().add("amount");
-            rows.getFieldList().add("qty");
-            Rows uploadRows = uploadExcelToObs("order", "订单列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_orderid");
+//            rows.getFieldList().remove("submitdate");
+//            rows.getFieldList().remove("checkdate");
+//            rows.getFieldList().remove("typemx");
+//            rows.getFieldList().remove("sys_enterpriseid");
+//            //添加
+//            rows.getFieldList().add("amount");
+//            rows.getFieldList().add("qty");
+//            Rows uploadRows = uploadExcelToObs("order", "订单列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
         if (systemclient.equalsIgnoreCase("web")) {
             return getSucReturnObject().setData(rows).toString();
         }

src/custom/restcontroller/sale/shoppingcart/ShoppingCart.java

@@ -186,16 +186,16 @@ public class ShoppingCart extends Controller {
             }
             row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
         }
-        if (isExport) {
-            //去除不需要导出项
-            String[] removeFieldList = {"sa_shoppingcartid", "sa_brandid", "itemid", "unitgroupname", "orderminqty", "orderaddqty", "orderminqty_auxunit", "orderaddqty_auxunit"};
-            for (String key : removeFieldList) {
-                rows.getFieldList().remove(key);
-            }
-
-            Rows uploadRows = uploadExcelToObs("order", "订单商品明细_列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            String[] removeFieldList = {"sa_shoppingcartid", "sa_brandid", "itemid", "unitgroupname", "orderminqty", "orderaddqty", "orderminqty_auxunit", "orderaddqty_auxunit"};
+//            for (String key : removeFieldList) {
+//                rows.getFieldList().remove(key);
+//            }
+//
+//            Rows uploadRows = uploadExcelToObs("order", "订单商品明细_列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
         return getSucReturnObject().setData(rows).toString();
     }
 

src/custom/restcontroller/saletool/orderclue/web/orderclue.java

@@ -162,10 +162,10 @@ public class orderclue extends Controller {
             }
         }
 
-        if (isAll) {
-            Rows uploadRows = uploadExcelToObs("1111", "线索池", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isAll) {
+//            Rows uploadRows = uploadExcelToObs("1111", "线索池", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         return getSucReturnObject().setData(rows).toString();
     }

src/custom/restcontroller/webmanage/sale/competitor/Competitor.java

@@ -142,10 +142,10 @@ public class Competitor extends Controller {
         sqlFactory.addParameter_SQL("where", where);
         String sql = sqlFactory.getSQL();
         Rows rows = dbConnect.runSqlQuery(sql);
-        if (isExport) {
-            Rows uploadRows = uploadExcelToObs("1111", "竞争对手列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            Rows uploadRows = uploadExcelToObs("1111", "竞争对手列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
         return getSucReturnObject().setData(rows).toString();
     }
 

src/custom/restcontroller/webmanage/sale/databoard/databoard.java

@@ -177,6 +177,10 @@ public class databoard extends Controller {
         String begindate = "";
         String enddate = "";
         switch (datetype) {
+            case "日":
+                begindate =getDate_Str();
+                enddate = getDate_Str();
+                break;
             case "月":
                 begindate = getMonthFirstDay();
                 enddate = getMonthLastDay();
@@ -193,6 +197,10 @@ public class databoard extends Controller {
                 begindate = new SimpleDateFormat("yyyy").format(new Date()) + "-01-01";
                 enddate = new SimpleDateFormat("yyyy").format(new Date()) + "-06-30";
                 break;
+            case "下半年":
+                begindate = new SimpleDateFormat("yyyy").format(new Date()) + "-07-01";
+                enddate = new SimpleDateFormat("yyyy").format(new Date()) + "-12-31";
+                break;
             default:
                 break;
         }

src/custom/restcontroller/webmanage/sale/dispatch/dispatchItems.java

@@ -421,28 +421,28 @@ public class dispatchItems extends Controller {
             }
         }
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_dispatch_itemsid");
-            rows.getFieldList().remove("sa_dispatchid");
-            rows.getFieldList().remove("sa_orderitemsid");
-            rows.getFieldList().remove("sa_orderid");
-            rows.getFieldList().remove("sys_enterpriseid");
-            rows.getFieldList().remove("isclose");
-            rows.getFieldList().remove("rowno");
-            rows.getFieldList().remove("itemid");
-            rows.getFieldList().remove("batchno");
-            Rows rowsrolename= dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid="+userid);
-            if(!rowsrolename.isEmpty()){
-                rows.getFieldList().remove("price");
-                rows.getFieldList().remove("amount");
-            }
-            rows.getFieldList().remove("undeliqty");
-            rows.getFieldList().remove("deliedqty");
-            rows.getFieldList().remove("outwarehousedate");
-            Rows uploadRows = uploadExcelToObs("dispatch", "发货单明细列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_dispatch_itemsid");
+//            rows.getFieldList().remove("sa_dispatchid");
+//            rows.getFieldList().remove("sa_orderitemsid");
+//            rows.getFieldList().remove("sa_orderid");
+//            rows.getFieldList().remove("sys_enterpriseid");
+//            rows.getFieldList().remove("isclose");
+//            rows.getFieldList().remove("rowno");
+//            rows.getFieldList().remove("itemid");
+//            rows.getFieldList().remove("batchno");
+//            Rows rowsrolename= dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid="+userid);
+//            if(!rowsrolename.isEmpty()){
+//                rows.getFieldList().remove("price");
+//                rows.getFieldList().remove("amount");
+//            }
+//            rows.getFieldList().remove("undeliqty");
+//            rows.getFieldList().remove("deliedqty");
+//            rows.getFieldList().remove("outwarehousedate");
+//            Rows uploadRows = uploadExcelToObs("dispatch", "发货单明细列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
         return getSucReturnObject().setData(rows).toString();
     }
 

src/custom/restcontroller/webmanage/sale/invbal/invbal.java

@@ -281,22 +281,22 @@ public class invbal extends Controller {
 				System.out.println(row.toJsonObject().toJSONString());
 			}
 		}
-		if(isExport){
-			//去除不需要导出项
-			rows.getFieldList().remove("itemid");
-			rows.getFieldList().remove("packageqty");
-			rows.getFieldList().remove("qty");
-			for (Row row:rows) {
-				if(row.getString("itemno").equals("10901371")){
-					System.out.println(row.getString("canbesent"));
-					System.out.println(row.getString("canbesale"));
-					 System.out.println(row.toJsonObject().toJSONString());
-				}
-
-			}
-			Rows uploadRows = uploadExcelToObs("invbal", "库存列表", rows, getTitleMap());
-			return getSucReturnObject().setData(uploadRows).toString();
-		}
+//		if(isExport){
+//			//去除不需要导出项
+//			rows.getFieldList().remove("itemid");
+//			rows.getFieldList().remove("packageqty");
+//			rows.getFieldList().remove("qty");
+//			for (Row row:rows) {
+//				if(row.getString("itemno").equals("10901371")){
+//					System.out.println(row.getString("canbesent"));
+//					System.out.println(row.getString("canbesale"));
+//					 System.out.println(row.toJsonObject().toJSONString());
+//				}
+//
+//			}
+//			Rows uploadRows = uploadExcelToObs("invbal", "库存列表", rows, getTitleMap());
+//			return getSucReturnObject().setData(uploadRows).toString();
+//		}
 		return getSucReturnObject().setData(rows).toString();
 	}
 

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -441,91 +441,91 @@ public class Item extends Controller {
         }
 
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("itemid");
-            rows.getFieldList().remove("marketprice");
-            rows.getFieldList().remove("unitid");
-            rows.getFieldList().remove("createdate");
-            rows.getFieldList().remove("barcode");
-            rows.getFieldList().remove("skucontrol");
-            rows.getFieldList().remove("batchcontrol");
-            rows.getFieldList().remove("grossweight");
-            rows.getFieldList().remove("weight");
-            rows.getFieldList().remove("height");
-            rows.getFieldList().remove("width");
-            rows.getFieldList().remove("length");
-            rows.getFieldList().remove("delivery");
-            rows.getFieldList().remove("istool");
-            rows.getFieldList().remove("volume");
-            rows.getFieldList().remove("marketingcategory");
-            rows.getFieldList().remove("ismodule");
-            rows.getFieldList().remove("cheek");
-            rows.getFieldList().remove("material");
-            rows.getFieldList().remove("iswoodproducts");
-            rows.getFieldList().remove("financeclasstype");
-            rows.getFieldList().remove("delistingstatus");
-            rows.getFieldList().remove("stockno");
-            rows.getFieldList().remove("widthschemeid");
-            rows.getFieldList().remove("lengthschemeid");
-            rows.getFieldList().remove("iscustomsize");
-            rows.getFieldList().remove("customprice");
-            rows.getFieldList().remove("auxunitid");
-            rows.getFieldList().remove("unitgroupname");
-            rows.getFieldList().remove("axunitname");
-            rows.getFieldList().remove("caliber");
-            rows.getFieldList().remove("pressure");
-            rows.getFieldList().remove("butterflyplatedrive");
-            rows.getFieldList().remove("valveplatematerial");
-            rows.getFieldList().remove("bodymaterial");
-            rows.getFieldList().remove("actuatortype");
-            rows.getFieldList().remove("actuatorbrand");
-            rows.getFieldList().remove("isbutterfly");
-            rows.getFieldList().remove("erpitemno");
-            rows.getFieldList().remove("erpitemname");
-            rows.getFieldList().remove("specalnote");
-            rows.getFieldList().remove("prodline");
-            rows.getFieldList().remove("device");
-            rows.getFieldList().remove("widthschemename");
-            rows.getFieldList().remove("lengthschemename");
-            rows.getFieldList().remove("brand");
-            rows.getFieldList().remove("connection");
-            rows.getFieldList().remove("siteid");
-            rows.getFieldList().remove("createby");
-            rows.getFieldList().remove("changeuserid");
-            rows.getFieldList().remove("changeby");
-            rows.getFieldList().remove("changedate");
-            rows.getFieldList().remove("isauxunit");
-            rows.getFieldList().remove("unitgroupid");
-
-            rows.getFieldList().remove("status");
-            rows.getFieldList().remove("orderminqty_auxunit");
-            rows.getFieldList().remove("orderaddqty_auxunit");
-            rows.getFieldList().remove("checkby");
-            rows.getFieldList().remove("checkdate");
-            rows.getFieldList().remove("onsaledate");
-            rows.getFieldList().remove("onsaleby");
-            rows.getFieldList().remove("remarks");
-            rows.getFieldList().remove("standards");
-            rows.getFieldList().remove("stockstatus2");
-            rows.getFieldList().remove("stockstatus1");
-            rows.getFieldList().remove("warrantyday");
-            rows.getFieldList().remove("iswuliao");
-            rows.getFieldList().remove("isservice");
-            rows.getFieldList().remove("sa_agentsid");
-            rows.getFieldList().remove("sa_customschemeid");
-            rows.getFieldList().remove("k3outcode");
-            rows.getFieldList().remove("description");
-            rows.getFieldList().remove("price1");
-            rows.getFieldList().remove("price2");
-            rows.getFieldList().remove("price3");
-            rows.getFieldList().remove("price4");
-            rows.getFieldList().remove("price5");
-
-
-            Rows uploadRows = uploadExcelToObs("item", "商品列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("itemid");
+//            rows.getFieldList().remove("marketprice");
+//            rows.getFieldList().remove("unitid");
+//            rows.getFieldList().remove("createdate");
+//            rows.getFieldList().remove("barcode");
+//            rows.getFieldList().remove("skucontrol");
+//            rows.getFieldList().remove("batchcontrol");
+//            rows.getFieldList().remove("grossweight");
+//            rows.getFieldList().remove("weight");
+//            rows.getFieldList().remove("height");
+//            rows.getFieldList().remove("width");
+//            rows.getFieldList().remove("length");
+//            rows.getFieldList().remove("delivery");
+//            rows.getFieldList().remove("istool");
+//            rows.getFieldList().remove("volume");
+//            rows.getFieldList().remove("marketingcategory");
+//            rows.getFieldList().remove("ismodule");
+//            rows.getFieldList().remove("cheek");
+//            rows.getFieldList().remove("material");
+//            rows.getFieldList().remove("iswoodproducts");
+//            rows.getFieldList().remove("financeclasstype");
+//            rows.getFieldList().remove("delistingstatus");
+//            rows.getFieldList().remove("stockno");
+//            rows.getFieldList().remove("widthschemeid");
+//            rows.getFieldList().remove("lengthschemeid");
+//            rows.getFieldList().remove("iscustomsize");
+//            rows.getFieldList().remove("customprice");
+//            rows.getFieldList().remove("auxunitid");
+//            rows.getFieldList().remove("unitgroupname");
+//            rows.getFieldList().remove("axunitname");
+//            rows.getFieldList().remove("caliber");
+//            rows.getFieldList().remove("pressure");
+//            rows.getFieldList().remove("butterflyplatedrive");
+//            rows.getFieldList().remove("valveplatematerial");
+//            rows.getFieldList().remove("bodymaterial");
+//            rows.getFieldList().remove("actuatortype");
+//            rows.getFieldList().remove("actuatorbrand");
+//            rows.getFieldList().remove("isbutterfly");
+//            rows.getFieldList().remove("erpitemno");
+//            rows.getFieldList().remove("erpitemname");
+//            rows.getFieldList().remove("specalnote");
+//            rows.getFieldList().remove("prodline");
+//            rows.getFieldList().remove("device");
+//            rows.getFieldList().remove("widthschemename");
+//            rows.getFieldList().remove("lengthschemename");
+//            rows.getFieldList().remove("brand");
+//            rows.getFieldList().remove("connection");
+//            rows.getFieldList().remove("siteid");
+//            rows.getFieldList().remove("createby");
+//            rows.getFieldList().remove("changeuserid");
+//            rows.getFieldList().remove("changeby");
+//            rows.getFieldList().remove("changedate");
+//            rows.getFieldList().remove("isauxunit");
+//            rows.getFieldList().remove("unitgroupid");
+//
+//            rows.getFieldList().remove("status");
+//            rows.getFieldList().remove("orderminqty_auxunit");
+//            rows.getFieldList().remove("orderaddqty_auxunit");
+//            rows.getFieldList().remove("checkby");
+//            rows.getFieldList().remove("checkdate");
+//            rows.getFieldList().remove("onsaledate");
+//            rows.getFieldList().remove("onsaleby");
+//            rows.getFieldList().remove("remarks");
+//            rows.getFieldList().remove("standards");
+//            rows.getFieldList().remove("stockstatus2");
+//            rows.getFieldList().remove("stockstatus1");
+//            rows.getFieldList().remove("warrantyday");
+//            rows.getFieldList().remove("iswuliao");
+//            rows.getFieldList().remove("isservice");
+//            rows.getFieldList().remove("sa_agentsid");
+//            rows.getFieldList().remove("sa_customschemeid");
+//            rows.getFieldList().remove("k3outcode");
+//            rows.getFieldList().remove("description");
+//            rows.getFieldList().remove("price1");
+//            rows.getFieldList().remove("price2");
+//            rows.getFieldList().remove("price3");
+//            rows.getFieldList().remove("price4");
+//            rows.getFieldList().remove("price5");
+//
+//
+//            Rows uploadRows = uploadExcelToObs("item", "商品列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         return getSucReturnObject().setData(rows).toString();
     }

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

@@ -716,65 +716,65 @@ public class Order extends Controller {
 
         }
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_orderid");
-            rows.getFieldList().remove("submitdate");
-            rows.getFieldList().remove("checkdate");
-            rows.getFieldList().remove("typemx");
-            rows.getFieldList().remove("sys_enterpriseid");
-
-            rows.getFieldList().remove("erpbillno");
-            rows.getFieldList().remove("agentnum");
-            rows.getFieldList().remove("projectname");
-            rows.getFieldList().remove("siteid");
-            rows.getFieldList().remove("billdate");
-            rows.getFieldList().remove("createuserid");
-            rows.getFieldList().remove("changeuserid");
-            rows.getFieldList().remove("createby");
-            rows.getFieldList().remove("changeby");
-            rows.getFieldList().remove("changedate");
-            rows.getFieldList().remove("checkby");
-            rows.getFieldList().remove("submitby");
-            rows.getFieldList().remove("closeby");
-            rows.getFieldList().remove("closedate");
-//            rows.getFieldList().remove("rec_contactsid");
-//            rows.getFieldList().remove("sa_contractid");
-//            rows.getFieldList().remove("sa_projectid");
-//            rows.getFieldList().remove("sa_accountclassid");
-//            rows.getFieldList().remove("sa_accountclassinfos");
-//            rows.getFieldList().remove("sa_brandid");
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_orderid");
+//            rows.getFieldList().remove("submitdate");
+//            rows.getFieldList().remove("checkdate");
+//            rows.getFieldList().remove("typemx");
+//            rows.getFieldList().remove("sys_enterpriseid");
 //
+//            rows.getFieldList().remove("erpbillno");
+//            rows.getFieldList().remove("agentnum");
+//            rows.getFieldList().remove("projectname");
+//            rows.getFieldList().remove("siteid");
+//            rows.getFieldList().remove("billdate");
+//            rows.getFieldList().remove("createuserid");
+//            rows.getFieldList().remove("changeuserid");
+//            rows.getFieldList().remove("createby");
+//            rows.getFieldList().remove("changeby");
+//            rows.getFieldList().remove("changedate");
+//            rows.getFieldList().remove("checkby");
+//            rows.getFieldList().remove("submitby");
+//            rows.getFieldList().remove("closeby");
+//            rows.getFieldList().remove("closedate");
+////            rows.getFieldList().remove("rec_contactsid");
+////            rows.getFieldList().remove("sa_contractid");
+////            rows.getFieldList().remove("sa_projectid");
+////            rows.getFieldList().remove("sa_accountclassid");
+////            rows.getFieldList().remove("sa_accountclassinfos");
+////            rows.getFieldList().remove("sa_brandid");
+////
+////
+////            rows.getFieldList().remove("sys_enterprise_financeid");
+////            rows.getFieldList().remove("sa_logiscompid");
+////            rows.getFieldList().remove("saler_hrid");
+////            rows.getFieldList().remove("createflag");
+////            rows.getFieldList().remove("pay_enterpriseid");
+////            rows.getFieldList().remove("signbacknum");
+////            rows.getFieldList().remove("rebate_used");
+////            rows.getFieldList().remove("rebate_userate");
+////            rows.getFieldList().remove("sa_promotionid");
+////            rows.getFieldList().remove("tradefieldmx");
+////            rows.getFieldList().remove("reviewtype");
+////            rows.getFieldList().remove("freightstatus");
+////            rows.getFieldList().remove("toolcount");
+////            rows.getFieldList().remove("rebateamount");
+////            rows.getFieldList().remove("signbackstatus");
+////            rows.getFieldList().remove("saletype");
 //
-//            rows.getFieldList().remove("sys_enterprise_financeid");
-//            rows.getFieldList().remove("sa_logiscompid");
-//            rows.getFieldList().remove("saler_hrid");
-//            rows.getFieldList().remove("createflag");
-//            rows.getFieldList().remove("pay_enterpriseid");
-//            rows.getFieldList().remove("signbacknum");
-//            rows.getFieldList().remove("rebate_used");
-//            rows.getFieldList().remove("rebate_userate");
-//            rows.getFieldList().remove("sa_promotionid");
-//            rows.getFieldList().remove("tradefieldmx");
-//            rows.getFieldList().remove("reviewtype");
-//            rows.getFieldList().remove("freightstatus");
-//            rows.getFieldList().remove("toolcount");
-//            rows.getFieldList().remove("rebateamount");
-//            rows.getFieldList().remove("signbackstatus");
-//            rows.getFieldList().remove("saletype");
-
-//            rows.getFieldList().remove("oldid");
-//            rows.getFieldList().remove("projectnote");
-//            rows.getFieldList().remove("deleted");
-//            rows.getFieldList().remove("abstract");
-//            rows.getFieldList().remove("accountclassinfos");
-//            rows.getFieldList().remove("updatek3flag");
-//            rows.getFieldList().remove("salename");
-            rows.getFieldList().remove("ischange");
-
-            Rows uploadRows = uploadExcelToObs("order", "订单列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+////            rows.getFieldList().remove("oldid");
+////            rows.getFieldList().remove("projectnote");
+////            rows.getFieldList().remove("deleted");
+////            rows.getFieldList().remove("abstract");
+////            rows.getFieldList().remove("accountclassinfos");
+////            rows.getFieldList().remove("updatek3flag");
+////            rows.getFieldList().remove("salename");
+//            rows.getFieldList().remove("ischange");
+//
+//            Rows uploadRows = uploadExcelToObs("order", "订单列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         return getSucReturnObject().setData(rows).toString();
     }
@@ -930,16 +930,16 @@ public class Order extends Controller {
 
         }
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_orderid");
-            rows.getFieldList().remove("submitdate");
-            rows.getFieldList().remove("checkdate");
-            rows.getFieldList().remove("typemx");
-            rows.getFieldList().remove("sys_enterpriseid");
-            Rows uploadRows = uploadExcelToObs("order", "订单列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_orderid");
+//            rows.getFieldList().remove("submitdate");
+//            rows.getFieldList().remove("checkdate");
+//            rows.getFieldList().remove("typemx");
+//            rows.getFieldList().remove("sys_enterpriseid");
+//            Rows uploadRows = uploadExcelToObs("order", "订单列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         sqlFactory = new SQLFactory(this, "订单-查询筛选出的价格");
         sqlFactory.addParameter("siteid", siteid);

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

@@ -587,18 +587,18 @@ public class OrderItems extends Controller {
             row.putIfAbsent("deliverydate", "");
         }
 
-        if (isExport) {
-            //去除不需要导出项
-            String[] removeFieldList = {"sa_orderitemsid", "itemid", "sa_orderid", "candispatchqty", "cansaleqty",
-                    "totalaty", "orderminqty_auxunit", "orderminqty", "orderaddqty_auxunit", "orderaddqty",
-                    "spec", "delivery", "erpitemno", "erpitemname", "material", "standards", "stockstatus"};
-            for (String key : removeFieldList) {
-                rows.getFieldList().remove(key);
-            }
-
-            Rows uploadRows = uploadExcelToObs("order", "订单商品明细_列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            String[] removeFieldList = {"sa_orderitemsid", "itemid", "sa_orderid", "candispatchqty", "cansaleqty",
+//                    "totalaty", "orderminqty_auxunit", "orderminqty", "orderaddqty_auxunit", "orderaddqty",
+//                    "spec", "delivery", "erpitemno", "erpitemname", "material", "standards", "stockstatus"};
+//            for (String key : removeFieldList) {
+//                rows.getFieldList().remove(key);
+//            }
+//
+//            Rows uploadRows = uploadExcelToObs("order", "订单商品明细_列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
 
         return getSucReturnObject().setData(rows).toString();
@@ -759,62 +759,62 @@ public class OrderItems extends Controller {
             row.put("contractprice", 0);
         }
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_orderitemsid");
-            rows.getFieldList().remove("itemid");
-            rows.getFieldList().remove("batchcontrol");
-            rows.getFieldList().remove("model");
-            rows.getFieldList().remove("conversionrate");
-            rows.getFieldList().remove("marketprice");
-            rows.getFieldList().remove("defaultprice");
-            rows.getFieldList().remove("defaultamount");
-            rows.getFieldList().remove("auxqty");
-            rows.getFieldList().remove("needdate");
-            rows.getFieldList().remove("deliedqty");
-            rows.getFieldList().remove("rebateamount");
-            rows.getFieldList().remove("invoiceamount");
-            rows.getFieldList().remove("writeoffamount");
-            rows.getFieldList().remove("auxunit");
-            rows.getFieldList().remove("sa_orderid");
-            rows.getFieldList().remove("deliverydate");
-            rows.getFieldList().remove("returnqty");
-            rows.getFieldList().remove("stockno");
-            rows.getFieldList().remove("position");
-            rows.getFieldList().remove("batchno");
-            rows.getFieldList().remove("isfreeze");
-            rows.getFieldList().remove("candispatchqty");
-            rows.getFieldList().remove("cansaleqty");
-            rows.getFieldList().remove("totalaty");
-            rows.getFieldList().remove("orderminqty_auxunit");
-            rows.getFieldList().remove("orderminqty");
-            rows.getFieldList().remove("orderaddqty_auxunit");
-            rows.getFieldList().remove("orderaddqty");
-            rows.getFieldList().remove("spec");
-            rows.getFieldList().remove("packageqty");
-            rows.getFieldList().remove("delivery");
-            rows.getFieldList().remove("erpitemno");
-            rows.getFieldList().remove("erpitemname");
-            rows.getFieldList().remove("prodline");
-            rows.getFieldList().remove("material");
-            rows.getFieldList().remove("device");
-            rows.getFieldList().remove("specalnote");
-            rows.getFieldList().remove("standards");
-            rows.getFieldList().remove("agentnum");
-            rows.getFieldList().remove("enterprisename");
-            rows.getFieldList().remove("agentnum");
-            rows.getFieldList().remove("stockstatus");
-            rows.getFieldList().remove("submitdate");
-            rows.getFieldList().remove("checkdate");
-            Rows rowsrolename = dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid=" + userid);
-            if (!rowsrolename.isEmpty()) {
-                rows.getFieldList().remove("price");
-                rows.getFieldList().remove("amount");
-            }
-
-            Rows uploadRows = uploadExcelToObs("orderdetail", "订单明细列表", rows, getTitleMapAgent());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_orderitemsid");
+//            rows.getFieldList().remove("itemid");
+//            rows.getFieldList().remove("batchcontrol");
+//            rows.getFieldList().remove("model");
+//            rows.getFieldList().remove("conversionrate");
+//            rows.getFieldList().remove("marketprice");
+//            rows.getFieldList().remove("defaultprice");
+//            rows.getFieldList().remove("defaultamount");
+//            rows.getFieldList().remove("auxqty");
+//            rows.getFieldList().remove("needdate");
+//            rows.getFieldList().remove("deliedqty");
+//            rows.getFieldList().remove("rebateamount");
+//            rows.getFieldList().remove("invoiceamount");
+//            rows.getFieldList().remove("writeoffamount");
+//            rows.getFieldList().remove("auxunit");
+//            rows.getFieldList().remove("sa_orderid");
+//            rows.getFieldList().remove("deliverydate");
+//            rows.getFieldList().remove("returnqty");
+//            rows.getFieldList().remove("stockno");
+//            rows.getFieldList().remove("position");
+//            rows.getFieldList().remove("batchno");
+//            rows.getFieldList().remove("isfreeze");
+//            rows.getFieldList().remove("candispatchqty");
+//            rows.getFieldList().remove("cansaleqty");
+//            rows.getFieldList().remove("totalaty");
+//            rows.getFieldList().remove("orderminqty_auxunit");
+//            rows.getFieldList().remove("orderminqty");
+//            rows.getFieldList().remove("orderaddqty_auxunit");
+//            rows.getFieldList().remove("orderaddqty");
+//            rows.getFieldList().remove("spec");
+//            rows.getFieldList().remove("packageqty");
+//            rows.getFieldList().remove("delivery");
+//            rows.getFieldList().remove("erpitemno");
+//            rows.getFieldList().remove("erpitemname");
+//            rows.getFieldList().remove("prodline");
+//            rows.getFieldList().remove("material");
+//            rows.getFieldList().remove("device");
+//            rows.getFieldList().remove("specalnote");
+//            rows.getFieldList().remove("standards");
+//            rows.getFieldList().remove("agentnum");
+//            rows.getFieldList().remove("enterprisename");
+//            rows.getFieldList().remove("agentnum");
+//            rows.getFieldList().remove("stockstatus");
+//            rows.getFieldList().remove("submitdate");
+//            rows.getFieldList().remove("checkdate");
+//            Rows rowsrolename = dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid=" + userid);
+//            if (!rowsrolename.isEmpty()) {
+//                rows.getFieldList().remove("price");
+//                rows.getFieldList().remove("amount");
+//            }
+//
+//            Rows uploadRows = uploadExcelToObs("orderdetail", "订单明细列表", rows, getTitleMapAgent());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
 
         return getSucReturnObject().setData(rows).toString();

src/custom/restcontroller/webmanage/sale/paybill/Paybill.java

@@ -81,31 +81,31 @@ public class Paybill extends Controller {
         }
         Rows rows = querySQL.query();
 
-        if (isExport) {
-            //去除不需要导出项
-            rows.getFieldList().remove("sa_paybillid");
-            rows.getFieldList().remove("sys_enterpriseid");
-            rows.getFieldList().remove("checkby");
-            rows.getFieldList().remove("checkdate");
-            rows.getFieldList().remove("remarks");
-            rows.getFieldList().remove("enterprisename");
-            rows.getFieldList().remove("createby");
-            rows.getFieldList().remove("createdate");
-
-            rows.getFieldList().remove("sa_paybillid");
-            rows.getFieldList().remove("changeuserid");
-            rows.getFieldList().remove("changeby");
-            rows.getFieldList().remove("changedate");
-            rows.getFieldList().remove("bank");
-            rows.getFieldList().remove("bankcardno");
-            rows.getFieldList().remove("submitdate");
-            rows.getFieldList().remove("submitby");
-            rows.getFieldList().remove("inbank");
-            rows.getFieldList().remove("inbankcardno");
-
-            Rows uploadRows = uploadExcelToObs("cashBill", "打款凭证列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            rows.getFieldList().remove("sa_paybillid");
+//            rows.getFieldList().remove("sys_enterpriseid");
+//            rows.getFieldList().remove("checkby");
+//            rows.getFieldList().remove("checkdate");
+//            rows.getFieldList().remove("remarks");
+//            rows.getFieldList().remove("enterprisename");
+//            rows.getFieldList().remove("createby");
+//            rows.getFieldList().remove("createdate");
+//
+//            rows.getFieldList().remove("sa_paybillid");
+//            rows.getFieldList().remove("changeuserid");
+//            rows.getFieldList().remove("changeby");
+//            rows.getFieldList().remove("changedate");
+//            rows.getFieldList().remove("bank");
+//            rows.getFieldList().remove("bankcardno");
+//            rows.getFieldList().remove("submitdate");
+//            rows.getFieldList().remove("submitby");
+//            rows.getFieldList().remove("inbank");
+//            rows.getFieldList().remove("inbankcardno");
+//
+//            Rows uploadRows = uploadExcelToObs("cashBill", "打款凭证列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         return getSucReturnObject().setData(rows).toString();
     }

src/custom/restcontroller/webmanage/sale/rebateaccount/rebateaccounthead.java

@@ -72,15 +72,15 @@ public class rebateaccounthead extends Controller {
         Rows rows = dbConnect.runSqlQuery(sqlFactory);
         Row row = rows.isNotEmpty() ? rows.get(0) : new Row();
 
-        if(isExport){
-             System.out.println(1111);
-            sqlFactory = new SQLFactory(this, "返利结算单导出数据查询");
-            sqlFactory.addParameter("sa_rebateaccountheadid", sa_rebateaccountheadid);
-            sqlFactory.addParameter("siteid", siteid);
-            rows = dbConnect.runSqlQuery(sqlFactory);
-            Rows uploadRows = uploadExcelToObs("rebateaccount", " 返利结算单数据列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if(isExport){
+//             System.out.println(1111);
+//            sqlFactory = new SQLFactory(this, "返利结算单导出数据查询");
+//            sqlFactory.addParameter("sa_rebateaccountheadid", sa_rebateaccountheadid);
+//            sqlFactory.addParameter("siteid", siteid);
+//            rows = dbConnect.runSqlQuery(sqlFactory);
+//            Rows uploadRows = uploadExcelToObs("rebateaccount", " 返利结算单数据列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         return getSucReturnObject().setData(row).toString();
     }

src/custom/restcontroller/webmanage/sale/salearea/salearea.java

@@ -394,17 +394,17 @@ public class salearea extends Controller {
         }
 
 
-        if (isExport) {
-            //去除不需要导出项
-            String[] removeFieldList = {"sa_agentsid", "sys_enterpriseid", "createdate", "limitreturnday", "freefreightamount",
-                    "invoicingpoint", "userid"};
-            for (String key : removeFieldList) {
-                rows.getFieldList().remove(key);
-            }
-
-            Rows uploadRows = uploadExcelToObs("经销商档案", "经销商档案", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            String[] removeFieldList = {"sa_agentsid", "sys_enterpriseid", "createdate", "limitreturnday", "freefreightamount",
+//                    "invoicingpoint", "userid"};
+//            for (String key : removeFieldList) {
+//                rows.getFieldList().remove(key);
+//            }
+//
+//            Rows uploadRows = uploadExcelToObs("经销商档案", "经销商档案", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         return getSucReturnObject().setData(rows).toString();
     }

src/custom/restcontroller/webmanage/sale/toolbill/ToolBilItem.java

@@ -276,18 +276,18 @@ public class ToolBilItem extends Controller {
             }
         }
 
-        if (isExport) {
-            //去除不需要导出项
-            String[] removeFieldList = {"sa_orderitemsid", "itemid", "sa_orderid", "candispatchqty", "cansaleqty",
-                    "totalaty", "orderminqty_auxunit", "orderminqty", "orderaddqty_auxunit", "orderaddqty",
-                    "spec", "delivery", "erpitemno", "erpitemname", "material", "standards", "stockstatus"};
-            for (String key : removeFieldList) {
-                rows.getFieldList().remove(key);
-            }
-
-            Rows uploadRows = uploadExcelToObs("order", "订单商品明细_列表", rows, getTitleMap());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            //去除不需要导出项
+//            String[] removeFieldList = {"sa_orderitemsid", "itemid", "sa_orderid", "candispatchqty", "cansaleqty",
+//                    "totalaty", "orderminqty_auxunit", "orderminqty", "orderaddqty_auxunit", "orderaddqty",
+//                    "spec", "delivery", "erpitemno", "erpitemname", "material", "standards", "stockstatus"};
+//            for (String key : removeFieldList) {
+//                rows.getFieldList().remove(key);
+//            }
+//
+//            Rows uploadRows = uploadExcelToObs("order", "订单商品明细_列表", rows, getTitleMap());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
 
         return getSucReturnObject().setData(rows).toString();

src/custom/restcontroller/webmanage/sale/toolbill/ToolBill.java

@@ -289,10 +289,10 @@ public class ToolBill extends Controller {
 
         }
 
-        if (isExport) {
-            Rows uploadRows = uploadExcelToObs("order", "工具借用单列表", rows, new HashMap<>());
-            return getSucReturnObject().setData(uploadRows).toString();
-        }
+//        if (isExport) {
+//            Rows uploadRows = uploadExcelToObs("order", "工具借用单列表", rows, new HashMap<>());
+//            return getSucReturnObject().setData(uploadRows).toString();
+//        }
 
         return getSucReturnObject().setData(rows).toString();