|
|
@@ -92,7 +92,7 @@ public class UASCustDataService implements CustDataService {
|
|
|
final String brandsWithFix = StringUtils.collectionToDelimitedString(Arrays.asList(brands.split(",")), ",", "'", "'");
|
|
|
StringBuffer sql = new StringBuffer(
|
|
|
"select pr_brand as brand,nvl(pr_orispeccode,pr_spec) as org_item,pr_detail as item_desc,pr_spec as item_spec,pr_unit as item_unit,to_char(sa_date,'yyyy-mm-dd') as \"DATE\",sd_qty as qty from sale left join saledetail on sa_id=sd_said left join product on sd_prodcode=pr_code where ");
|
|
|
- sql.append("sa_statuscode='AUDITED' and sa_date > to_date('").append(startDate).append("','yyyy-mm-dd')");
|
|
|
+ sql.append("sa_statuscode='AUDITED' and sa_date >= to_date('").append(startDate).append("','yyyy-mm-dd')");
|
|
|
if (StringUtils.hasText(code))
|
|
|
sql.append(" and pr_orispeccode='").append(code).append("'");
|
|
|
sql.append(" and pr_brand in (").append(brandsWithFix).append(")");
|
|
|
@@ -120,7 +120,7 @@ public class UASCustDataService implements CustDataService {
|
|
|
int month = DateUtils.getYearmonth(startDate);
|
|
|
StringBuffer sql = new StringBuffer(
|
|
|
"select case when nvl(pd_inqty,0)<>0 then null else cu_kind end as end_item_fld,pr_brand as brand,nvl(pr_orispeccode,pr_spec) as org_item,pr_detail as item_desc,pr_spec as item_spec,pr_unit as item_unit,to_char(pi_date,'yyyy-mm-dd') as \"DATE\",nvl(pd_inqty,0)+nvl(pd_outqty,0) as qty,case when nvl(pd_inqty,0)<>0 then 'in' else 'out' end as type,(select pm_beginqty from v$productmonth where pr_code=pm_prodcode and pm_yearmonth=?) as beginStock from prodinout left join prodiodetail on pi_id=pd_piid left join customer on pi_cardcode=cu_code left join product on pd_prodcode=pr_code where ");
|
|
|
- sql.append("pi_statuscode='POSTED' and pi_date > to_date('").append(startDate).append("','yyyy-mm-dd')");
|
|
|
+ sql.append("pi_statuscode='POSTED' and pi_date >= to_date('").append(startDate).append("','yyyy-mm-dd')");
|
|
|
if (StringUtils.hasText(code))
|
|
|
sql.append(" and pr_orispeccode='").append(code).append("'");
|
|
|
sql.append(" and pr_brand in (").append(brandsWithFix).append(")");
|
|
|
@@ -154,7 +154,7 @@ public class UASCustDataService implements CustDataService {
|
|
|
final String brandsWithFix = StringUtils.collectionToDelimitedString(Arrays.asList(brands.split(",")), ",", "'", "'");
|
|
|
StringBuffer sql = new StringBuffer(
|
|
|
"select pr_brand as brand,nvl(pr_orispeccode,pr_spec) as org_item,pr_detail as item_desc,pr_spec as item_spec,pr_unit as item_unit,to_char(sf_date,'yyyy-mm-dd') as \"DATE\",sd_qty as qty,to_char(sd_needdate,'yyyy-mm-dd') as needDate,to_char(sd_enddate,'yyyy-mm-dd') as endDate from saleforecast left join saleforecastdetail on sf_id=sd_sfid left join customer on sd_custcode=cu_code left join product on sd_prodcode=pr_code where ");
|
|
|
- sql.append("sf_statuscode='AUDITED' and sf_date > to_date('").append(startDate).append("','yyyy-mm-dd')");
|
|
|
+ sql.append("sf_statuscode='AUDITED' and sf_date >= to_date('").append(startDate).append("','yyyy-mm-dd')");
|
|
|
if (StringUtils.hasText(code))
|
|
|
sql.append(" and pr_orispeccode='").append(code).append("'");
|
|
|
sql.append(" and pr_brand in (").append(brandsWithFix).append(")");
|
yingp