Преглед на файлове

订单出货未开票统计将按订单审核时间改为发货日期

hu преди 4 години
родител
ревизия
c25d488dcd

+ 12 - 12
src/rest/openapi/restcontroller/wechatapp/orderform/SQL/订单出货未开票账期统计查询.sql

@@ -7,14 +7,14 @@ select  t1.fagentnum,t1.fsaler,sum(t4.famount) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) group by t1.fagentnum,fsaler) t1
+where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) group by t1.fagentnum,fsaler) t1
 inner join (
 inner join (
 select fagentnum,sum(t.famount) famount,fsaler from
 select fagentnum,sum(t.famount) famount,fsaler from
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
+where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
 ) t7 on t1.fagentnum=t7.fagentnum and isnull(t7.famount6,0)>=0
 ) t7 on t1.fagentnum=t7.fagentnum and isnull(t7.famount6,0)>=0
 left join
 left join
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount1 from (
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount1 from (
@@ -22,14 +22,14 @@ select  t1.fagentnum,t1.fsaler,sum(isnull(t4.famount,0)) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) group by t1.fagentnum,fsaler) t1
+where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) group by t1.fagentnum,fsaler) t1
 left join (
 left join (
 select fagentnum,sum(t.famount) famount,fsaler from
 select fagentnum,sum(t.famount) famount,fsaler from
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
+where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
 ) t2 on t7.fagentnum=t2.fagentnum and t7.fsaler=t2.fsaler and isnull(t2.famount1,0)>=0
 ) t2 on t7.fagentnum=t2.fagentnum and t7.fsaler=t2.fsaler and isnull(t2.famount1,0)>=0
 left join
 left join
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount2 from (
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount2 from (
@@ -37,14 +37,14 @@ select  t1.fagentnum,t1.fsaler,sum(t4.famount) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) group by t1.fagentnum,fsaler) t1
+where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) group by t1.fagentnum,fsaler) t1
 inner join (
 inner join (
 select fagentnum,sum(t.famount) famount,fsaler from
 select fagentnum,sum(t.famount) famount,fsaler from
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
+where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
 ) t3 on t7.fagentnum=t3.fagentnum and t7.fsaler=t3.fsaler and isnull(t3.famount2,0)>=0
 ) t3 on t7.fagentnum=t3.fagentnum and t7.fsaler=t3.fsaler and isnull(t3.famount2,0)>=0
 left join
 left join
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount3 from (
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount3 from (
@@ -52,14 +52,14 @@ select  t1.fagentnum,t1.fsaler,sum(t4.famount) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) group by t1.fagentnum,fsaler) t1
+where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) group by t1.fagentnum,fsaler) t1
 inner join (
 inner join (
 select fagentnum,sum(t.famount) famount,fsaler from
 select fagentnum,sum(t.famount) famount,fsaler from
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
+where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
 ) t4 on t7.fagentnum=t4.fagentnum and t7.fsaler=t4.fsaler and isnull(t4.famount3,0)>=0
 ) t4 on t7.fagentnum=t4.fagentnum and t7.fsaler=t4.fsaler and isnull(t4.famount3,0)>=0
 left join
 left join
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount4 from (
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount4 from (
@@ -67,14 +67,14 @@ select  t1.fagentnum,t1.fsaler,sum(t4.famount) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid  and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) group by t1.fagentnum,fsaler) t1
+where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid  and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) group by t1.fagentnum,fsaler) t1
 inner join (
 inner join (
 select fagentnum,sum(t.famount) famount,fsaler from
 select fagentnum,sum(t.famount) famount,fsaler from
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
+where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
 ) t5 on t7.fagentnum=t5.fagentnum and t7.fsaler=t5.fsaler and isnull(t5.famount4,0)>=0
 ) t5 on t7.fagentnum=t5.fagentnum and t7.fsaler=t5.fsaler and isnull(t5.famount4,0)>=0
 left join
 left join
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount5 from (
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount5 from (
@@ -82,14 +82,14 @@ select  t1.fagentnum,t1.fsaler,sum(t4.famount) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 inner join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid  and CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) group by t1.fagentnum,fsaler) t1
+where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid  and CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) group by t1.fagentnum,fsaler) t1
 inner join (
 inner join (
 select fagentnum,sum(t.famount) famount,fsaler from
 select fagentnum,sum(t.famount) famount,fsaler from
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 (select distinct t2.saorderdetailid,t1.fagentnum,t1.fsaler,isnull(finvoiceamount,0) famount from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 inner join sainvoicedetail t4 on t4.fsourceid=t2.saorderdetailid and t4.siteid=t2.siteid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
 left join sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
-where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
+where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120)) t group by fagentnum,FSALER) t2 on t1.fagentnum=t2.fagentnum and t1.fsaler=t2.fsaler
 ) t6 on t7.fagentnum=t6.fagentnum and t7.fsaler=t6.fsaler and isnull(t6.famount5,0)>=0
 ) t6 on t7.fagentnum=t6.fagentnum and t7.fsaler=t6.fsaler and isnull(t6.famount5,0)>=0
 
 
 left join pp_hr on pp_hr.hrid=t7.fsaler where  $where$ order by  ftotalamount desc
 left join pp_hr on pp_hr.hrid=t7.fsaler where  $where$ order by  ftotalamount desc

+ 36 - 16
src/rest/openapi/restcontroller/wechatapp/orderform/orderform.java

@@ -21,24 +21,44 @@ public class orderform extends Controller {
 		 * 创建数据库连接
 		 * 创建数据库连接
 		 */
 		 */
 		//System.out.println(111);
 		//System.out.println(111);
-		
+		String type = content.getString("type");
 		DBConnect connect = new DBConnect();
 		DBConnect connect = new DBConnect();
 		 String where = " 1=1 ";
 		 String where = " 1=1 ";
-		if(content.getInt("daynum")==0) {
-			where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) ";
-		}else if(content.getInt("daynum")==30) {
-			where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) ";
-		}else if(content.getInt("daynum")==90) {
-			where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) ";
-		}else if(content.getInt("daynum")==180) {
-			where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) ";
-		}else if(content.getInt("daynum")==365) {
-			where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) ";
-		}else if(content.getInt("daynum")==999) {
-			where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) ";
-		}else {
-			return getReturnObject_err("daynum参数数值不正确").toString();
+		 if (type.equals("订单审核未收款")||type.equals("订单开票未收款")||type.equals("订单审核未收款")) {
+			 if(content.getInt("daynum")==0) {
+					where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) ";
+				}else if(content.getInt("daynum")==30) {
+					where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) ";
+				}else if(content.getInt("daynum")==90) {
+					where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) ";
+				}else if(content.getInt("daynum")==180) {
+					where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) ";
+				}else if(content.getInt("daynum")==365) {
+					where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) and  CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) ";
+				}else if(content.getInt("daynum")==999) {
+					where=where +" and CONVERT(VARCHAR(10),t1.checkdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) ";
+				}else {
+					return getReturnObject_err("daynum参数数值不正确").toString();
+				}
+		}else if(type.equals("订单出货未开票")) {
+			if(content.getInt("daynum")==0) {
+				where=where +" and CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) ";
+			}else if(content.getInt("daynum")==30) {
+				where=where +" and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,0,getdate()),120) ";
+			}else if(content.getInt("daynum")==90) {
+				where=where +" and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-1,getdate()),120) ";
+			}else if(content.getInt("daynum")==180) {
+				where=where +" and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-3,getdate()),120) ";
+			}else if(content.getInt("daynum")==365) {
+				where=where +" and CONVERT(VARCHAR(10),t3.fdate,120)>=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) and  CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-6,getdate()),120) ";
+			}else if(content.getInt("daynum")==999) {
+				where=where +" and CONVERT(VARCHAR(10),t3.fdate,120)<=CONVERT(VARCHAR(10),DATEADD(mm,-12,getdate()),120) ";
+			}else {
+				return getReturnObject_err("daynum参数数值不正确").toString();
+			}
 		}
 		}
+		
+		 
 //	        /**
 //	        /**
 //	         *排序条件设置
 //	         *排序条件设置
 //	         */
 //	         */
@@ -68,7 +88,7 @@ public class orderform extends Controller {
 		/**
 		/**
 		 * SQL查询参数设置并查询
 		 * SQL查询参数设置并查询
 		 */
 		 */
-		String type = content.getString("type");
+		
 		if (type.equals("订单审核未收款")) {
 		if (type.equals("订单审核未收款")) {
 			//System.out.println(55);
 			//System.out.println(55);
 			//System.out.println(siteid);
 			//System.out.println(siteid);