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

Merge remote-tracking branch 'orinin/test' into test

Browse Source
This commit is contained in:
25655 2025-03-17 18:04:00 +08:00
commit 23d8a3e126
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,19 +58,48 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
.finish(); .finish();
FilterInfo filter = param.getFilter(); FilterInfo filter = param.getFilter();
Date start = filter.getDate("yem_fshipdate_start"); Date fshipdataStart = filter.getDate("yem_fshipdate_start");
Date end = filter.getDate("yem_fshipdate_end"); Date fshipdataEnd = filter.getDate("yem_fshipdate_end");
Date finvoicedateStart = filter.getDate("yem_finvoicedate_start");
Date finvoicedateEnd = filter.getDate("yem_finvoicedate_end");
Date fladingdateStart = filter.getDate("yem_fladingdate_start");
Date fladingdateEnd = filter.getDate("yem_fladingdate_end");
String compno = filter.getString("yem_compno");
long fcountry = filter.getLong("yem_fcountry");
String fisshiped = filter.getString("yem_fisshiped"); 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(fshipdataStart)) {
sb.append(" AND TO_DATE(yem_shipdate, 'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(start))); sb.append(" AND TO_DATE(yem_shipdate, 'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fshipdataStart)));
} }
if (YEM.isNotEmpty(end)) { if (YEM.isNotEmpty(fshipdataEnd)) {
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(fshipdataEnd)));
} }
if (YEM.isNotEmpty(finvoicedateStart)) {
sb.append(" AND TO_DATE(yem_invoicedate, 'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(finvoicedateStart)));
}
if (YEM.isNotEmpty(finvoicedateEnd)) {
sb.append(" AND TO_DATE(yem_invoicedate, 'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(finvoicedateEnd)));
}
if (YEM.isNotEmpty(fladingdateStart)) {
sb.append(" AND TO_DATE(yem_ladingdate, 'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fladingdateStart)));
}
if (YEM.isNotEmpty(fladingdateEnd)) {
sb.append(" AND TO_DATE(yem_ladingdate, 'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fladingdateEnd)));
}
if (YEM.isNotEmpty(compno)) {
sb.append(" AND yem_vehicleno LIKE '%").append(compno).append("%'");
}
if (YEM.isNotEmpty(fisshiped)) { if (YEM.isNotEmpty(fisshiped)) {
if ("A".equals(fisshiped)) {//已发货 if ("A".equals(fisshiped)) {//已发货
sb.append(" AND yem_dnbillno IS NOT NULL AND yem_dnbillno != '' "); sb.append(" AND yem_dnbillno IS NOT NULL AND yem_dnbillno != '' ");
@ -79,6 +108,9 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
sb.append(" AND yem_dnbillno IS NULL OR yem_dnbillno = ''"); sb.append(" AND yem_dnbillno IS NULL OR yem_dnbillno = ''");
} }
} }
if (YEM.isNotEmpty(fcountry)) {
sb.append(" AND yem_clientcountry = ").append(fcountry);
}
dataSet = dataSet.where(sb.toString()); dataSet = dataSet.where(sb.toString());

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

@ -74,6 +74,10 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
long fcustomer = filter.getLong("yem_fcustomer");//客户 long fcustomer = filter.getLong("yem_fcustomer");//客户
Date forderdateStart = filter.getDate("yem_forderdate_start"); Date forderdateStart = filter.getDate("yem_forderdate_start");
Date forderdateEnd = filter.getDate("yem_forderdate_end"); Date forderdateEnd = filter.getDate("yem_forderdate_end");
Date fstockdateStart = filter.getDate("yem_fstockdate_start");
Date fstockdateEnd = filter.getDate("yem_fstockdate_end");
long producttype = filter.getLong("yem_bd_producttype");//产品分类 long producttype = filter.getLong("yem_bd_producttype");//产品分类
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -96,6 +100,12 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
if (YEM.isNotEmpty(forderdateEnd)) { if (YEM.isNotEmpty(forderdateEnd)) {
sb.append(" AND forderdate <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(forderdateEnd))); sb.append(" AND forderdate <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(forderdateEnd)));
} }
if (YEM.isNotEmpty(fstockdateStart)) {
sb.append(" AND TO_DATE(yem_accinventorydate,'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fstockdateStart)));
}
if (YEM.isNotEmpty(fstockdateEnd)) {
sb.append(" AND TO_DATE(yem_accinventorydate,'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fstockdateEnd)));
}
if (producttype > 0) { if (producttype > 0) {
sb.append(" AND yem_products = ").append(producttype); sb.append(" AND yem_products = ").append(producttype);