工厂发退明细支持搜索单据编号

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

@@ -525,6 +525,7 @@ public class dispatchItems extends Controller {
                 where.append("or t.itemno like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t.itemname like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t.remarks like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t.billno like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
             if (whereObject.containsKey("type") && !"".equals(whereObject.getString("type"))) {
@@ -542,39 +543,14 @@ public class dispatchItems extends Controller {
                 where.append(" and t.status ='").append(whereObject.getString("status")).append("' ");
             }
         }
-        boolean isExport = content.getBooleanValue("isExport");
         SQLFactory sqlFactory = new SQLFactory(this, "工厂发货及退货明细(经销商)", pageSize, pageNumber, pageSorting);
-//        if (isExport) {
-//            sqlFactory = new SQLFactory(this, "工厂发货及退货明细(经销商)");
-//        }
         sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter("siteid", siteid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);
 
 
-//        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();
     }