【商务平台】 财务对账时如果没有增肌时间过滤，默认设置近八个的数据，与默认设置最多显示近八个月数据保持一致

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@6802 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/ErpProdIODetailServiceImpl.java

@@ -25,7 +25,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 				+ " p.pd_prodcode prodCode,p.pr_spec prodSpec, p.pr_title prodTitle,p.pd_qty qty, p.pi_date piDate, p.pd_orderprice  orderPrice, p.pi_currency currency, p.pd_taxrate taxrate,p.whname whname, p.pd_ycheckqty yCheckQty,"
 				+ " p.pd_thischeckqty thisCheckQty, p.custuu custUu, p.custname custName, p.enuu enUu, p.sourceid sourceId, p.pi_sourcetable sourceTable, p.pi_rate rate, p.pi_receivecode receiveCode,"
 				+ " p.pi_receivename receiveName, p.pd_factory factory, p.sendcode sendcode from erp$prodiodetail p where enuu = ?";
-		// 查询近三个月的数据
+		// 查询近八个月的数据
 		sql = sql + " and p.pi_date between add_months(sysdate,-8) and sysdate ";
 		Object[] args = new Object[] { enUu };
 		if (!CollectionUtils.isEmpty(filter)) {
@@ -106,13 +106,18 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 				sql = sql + " and pr_spec = '" + strs[4] + "'";
 			}
 		}
+		// 如果没有时间筛选，默认为近八个月的数据
 		if (fromDate != null) {
 			sql = sql + " and pi_date>" + "to_date('" + new java.sql.Date(new Date(fromDate).getTime())
 					+ "','yyyy-mm-dd')";
+		} else {
+			sql = sql + "and pi_date > to_date (add_months(sysdate,-8))";
 		}
 		if (endDate != null) {
 			sql = sql + " and pi_date<" + "to_date('" + new java.sql.Date(new Date(endDate).getTime())
 					+ "','yyyy-mm-dd')";
+		} else {
+			sql = sql + "and pi_date < to_date (sysdate)";
 		}
 
 		Object[] args = new Object[] { enUu };