【 对账单导出，增加仓库名称】

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

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

@@ -642,7 +642,6 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		Set<Enterprise> enterprises = new HashSet<Enterprise>();
 		Set<String> keys = SearchKeyUtils.splitToKeys(name, true);
 		for (String key : keys) {
-			System.out.println(key);
 			enterprises.addAll(enterpriseDao.findByEnName(key));
 		}
 		return enterprises;

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

@@ -22,7 +22,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 	public List<ErpProdIODetail> findAllApChecks(List<Long> filter) {
 		Long enUu = SystemSession.getUser().getEnterprise().getUu();
 		String sql = "select p.pi_inoutno inOutNo,p.pd_detno detno ,p.pi_class piClass, p.pd_ordercode orderCode, p.pd_orderdetno  orderDetno,"
-				+ " 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.pd_ycheckqty yCheckQty,"
+				+ " 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 = ?";
 		Object[] args = new Object[] { enUu };
@@ -52,7 +52,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 	public List<ErpProdIODetail> findXlsApChecks(List<Long> filter, String keyword, Long fromDate, Long endDate) {
 		Long enUu = SystemSession.getUser().getEnterprise().getUu();
 		String sql = "select p.pi_inoutno inOutNo,p.pd_detno detno ,p.pi_class piClass, p.pd_ordercode orderCode, p.pd_orderdetno  orderDetno,"
-				+ " p.pd_prodcode prodCode, 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.pd_ycheckqty yCheckQty,"
+				+ " p.pd_prodcode prodCode, 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 = ?";
 		if (!StringUtils.isEmpty(keyword)) {