From 4270624897d958cfcb829840555b4209f7051c65 Mon Sep 17 00:00:00 2001 From: zzs Date: Mon, 17 Mar 2025 11:18:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E8=B4=B8=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=9B=E6=95=B4=E6=9C=BA=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompleteShipDetailReportPlugin.java | 44 ++++++++++++++++--- .../ITCOrderDetailsReportPlugin.java | 10 +++++ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java index 2678ec17..8d1bb4ac 100644 --- a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java @@ -58,19 +58,48 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin .finish(); FilterInfo filter = param.getFilter(); - Date start = filter.getDate("yem_fshipdate_start"); - Date end = filter.getDate("yem_fshipdate_end"); + Date fshipdataStart = filter.getDate("yem_fshipdate_start"); + 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"); StringBuilder sb = new StringBuilder(); sb.append("1=1"); - if (YEM.isNotEmpty(start)) { - sb.append(" AND TO_DATE(yem_shipdate, 'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(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(fshipdataStart))); } - 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))); + if (YEM.isNotEmpty(fshipdataEnd)) { + 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 ("A".equals(fisshiped)) {//已发货 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 = ''"); } } + if (YEM.isNotEmpty(fcountry)) { + sb.append(" AND yem_clientcountry = ").append(fcountry); + } dataSet = dataSet.where(sb.toString()); diff --git a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java index 89a9c8da..9a0836e0 100644 --- a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java @@ -74,6 +74,10 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { long fcustomer = filter.getLong("yem_fcustomer");//客户 Date forderdateStart = filter.getDate("yem_forderdate_start"); 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");//产品分类 StringBuilder sb = new StringBuilder(); @@ -96,6 +100,12 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { if (YEM.isNotEmpty(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) { sb.append(" AND yem_products = ").append(producttype);