优化

src/custom/restcontroller/sale/cashbill/SQL/资金流水账查询.sql

@@ -1,4 +1,5 @@
 select t1.billno,
+       t1.sa_cashbillid,
        t1.type,
        t1.sa_accountclassid,
        t4.accountname,

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

@@ -853,6 +853,10 @@ public class cashbill extends Controller {
                 where = where + " and DATE_FORMAT(t1.checkdate,'%Y-%m-%d') <=DATE_FORMAT('" + whereObject.getString("enddate") + "','%Y-%m-%d')";
 
             }
+            if (whereObject.containsKey("type") && !"".equals(whereObject.getString("type"))) {
+                where = where + " and t1.type ='" + whereObject.getString("type") + "' ";
+
+            }
 
         }
 
@@ -873,7 +877,6 @@ public class cashbill extends Controller {
         if (isExport) {
             //去除不需要导出项
             rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("balance");
             rows.getFieldList().remove("createby");
             rows.getFieldList().remove("createdate");
             Rows uploadRows = uploadExcelToObs("cashBill", "资金流水账列表", rows, getTitleMap());
@@ -1094,6 +1097,7 @@ public class cashbill extends Controller {
         titleMap.put("type", "收支类型");
         titleMap.put("accountname", "账户名称");
         titleMap.put("amount", "收支金额");
+        titleMap.put("balance", "账户结余");
         titleMap.put("source", "凭证来源");
         titleMap.put("checkby", "审核人");
         titleMap.put("checkdate", "审核时间");

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

@@ -65,6 +65,9 @@ public class OrderItems extends Controller {
 
         String type = orderRows.get(0).getString("type");
         JSONArray items = content.getJSONArray("items");
+        if(items.size()>100){
+            return getErrReturnObject().setErrMsg("最多选择100条，您已超过100条，请重新选择").toString();
+        }
         Long sa_promotionid = orderRows.get(0).getLong("sa_promotionid");