|
@@ -55,15 +55,17 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService{
|
|
|
+ " 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.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.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 from erp$prodiodetail p where enuu = ?";
|
|
+ " p.pi_receivename receiveName from erp$prodiodetail p where enuu = ?";
|
|
|
- String[] strs = keyword.split("-");
|
|
|
|
|
- if(strs.length == 1 ) {
|
|
|
|
|
- sql = sql + " and custname = '" + strs[0] +"'";
|
|
|
|
|
- }
|
|
|
|
|
- if(strs.length == 2 ) {
|
|
|
|
|
- if(strs[0].length() != 0) {
|
|
|
|
|
|
|
+ if(keyword != "") {
|
|
|
|
|
+ String[] strs = keyword.split("-");
|
|
|
|
|
+ if(strs.length == 1 ) {
|
|
|
sql = sql + " and custname = '" + strs[0] +"'";
|
|
sql = sql + " and custname = '" + strs[0] +"'";
|
|
|
}
|
|
}
|
|
|
- sql = sql + " and pi_receivename = '" + strs[1] +"'";
|
|
|
|
|
|
|
+ if(strs.length == 2 ) {
|
|
|
|
|
+ if(strs[0].length() != 0) {
|
|
|
|
|
+ sql = sql + " and custname = '" + strs[0] +"'";
|
|
|
|
|
+ }
|
|
|
|
|
+ sql = sql + " and pi_receivename = '" + strs[1] +"'";
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if(fromDate != null) {
|
|
if(fromDate != null) {
|
|
|
sql = sql + " and pi_date>" + "to_date('" + new java.sql.Date(new Date(fromDate).getTime()) + "','yyyy-mm-dd')";
|
|
sql = sql + " and pi_date>" + "to_date('" + new java.sql.Date(new Date(fromDate).getTime()) + "','yyyy-mm-dd')";
|