violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change:整机发运明细表

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-09-06 10:22:15 +08:00
parent a97d42f812
commit b5900ccd56
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
View File

@ -60,6 +60,8 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
Date start = filter.getDate("yem_fshipdate_start"); Date start = filter.getDate("yem_fshipdate_start");
Date end = filter.getDate("yem_fshipdate_end"); Date end = filter.getDate("yem_fshipdate_end");
String fisshiped = filter.getString("yem_fisshiped");
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("1=1"); sb.append("1=1");
if (YEM.isNotEmpty(start)) { if (YEM.isNotEmpty(start)) {
@ -68,6 +70,14 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
if (YEM.isNotEmpty(end)) { if (YEM.isNotEmpty(end)) {
sb.append(" AND TO_DATE(yem_shipdate, 'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(end))); sb.append(" AND TO_DATE(yem_shipdate, 'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(end)));
} }
if (YEM.isNotEmpty(fisshiped)) {
if ("A".equals(fisshiped)) {//已发货
sb.append(" AND yem_dnbillno IS NOT NULL AND yem_dnbillno != '' ");
}
if ("B".equals(fisshiped)) {//未发货
sb.append(" AND yem_dnbillno IS NULL OR yem_dnbillno = ''");
}
}
dataSet = dataSet.where(sb.toString()); dataSet = dataSet.where(sb.toString());