出货明细查询条件变更

src/rest/openapi/restcontroller/wechatapp/orderform/SQL/订单出货明细1.sql

@@ -0,0 +1,26 @@
+declare @siteid varchar(20)
+set @siteid =$siteid$
+select t1.fsonum,t2.frownum,fpayagentnum,t1.frecagentnum,pp_hr.displayname,t2.fitemname,t2.fspec,t2.fmodel,tunit.fname,t2.fqty,t2.fprice,t2.frateamount,(t2.frateamount-isnull(t7.fwriteoffamount,0)) fwriteoffamount,t1.checkdate,t6.fdate,t3.fmaterial,t3.fdevice,t3.fspecalnote,t3.fitemno,t3.fnotes,TPROJECT.fprojectname,t4.kaipiaodate,(t2.frateamount-isnull(t7.finvoiceamount,0)) finvoiceamount from saorder t1
+inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid 
+left join pp_hr on pp_hr.hrid=t1.fsaler and pp_hr.siteid=t1.siteid
+inner join tunit on tunit.FUNITID=t2.FUNITID
+inner join titem t3 on  t2.fitemno=t3.fitemno and t2.siteid=t3.siteid
+left join TPROJECT on TPROJECT.fprojectnum=t1.fprojectnum and TPROJECT.siteid=t1.siteid
+inner join(select t2.siteid,t2.saorderdetailid,sum(t4.famount) famount from saorder t1
+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 sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
+where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid group by t2.saorderdetailid,t2.siteid) t5 on t5.saorderdetailid=t2.saorderdetailid and t5.siteid=t2.siteid
+inner join (select  t2.saorderdetailid,t1.siteid,max(SAINVOICE.fdate) fdate from saorder t1
+inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid 
+inner join SAINVOICEDETAIL  on SAINVOICEDETAIL.FSOURCEID=t2.SAORDERDETAILID and SAINVOICEDETAIL.siteid=t2.siteid
+inner join SAINVOICE on SAINVOICEDETAIL.fparentid=SAINVOICE.sainvoiceid and SAINVOICEDETAIL.siteid=SAINVOICE.siteid group by t2.saorderdetailid,t1.siteid) t6 on t6.saorderdetailid=t2.saorderdetailid and t6.siteid=t2.siteid
+inner join (select distinct t2.siteid,t2.saorderdetailid,isnull(t2.finvoiceamount,0) finvoiceamount,isnull(t2.fwriteoffamount,0) fwriteoffamount from saorder t1
+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 sainvoice t3 on t4.siteid=t3.siteid and t4.fparentid=t3.sainvoiceid
+where t1.fstatus in('审核','关闭') and t3.fstatus='关闭' and t1.siteid=@siteid) t7 on t7.saorderdetailid=t2.saorderdetailid and t7.siteid=t2.siteid
+left join (select saorderdetail.SAORDERDETAILID,max(TINVOICEAPPLY.checkdate) kaipiaodate from  saorderdetail left join TINVOICEAPPLYORDER  on saorderdetail.SAORDERDETAILID=TINVOICEAPPLYORDER.SAORDERDETAILID and saorderdetail.siteid=TINVOICEAPPLYORDER.siteid 
+                             left join TINVOICEAPPLY on TINVOICEAPPLY.TINVOICEAPPLYID=TINVOICEAPPLYORDER.TINVOICEAPPLYID and TINVOICEAPPLY.siteid=TINVOICEAPPLYORDER.siteid where TINVOICEAPPLY.checkdate is not null  group by saorderdetail.SAORDERDETAILID ) t4 on t2.saorderdetailid=t4.saorderdetailid
+where t1.fstatus in('审核','关闭') and t1.siteid=@siteid and  DateDiff(dd,t1.checkdate,getdate())<=365 and t1.fagentnum=$fagentnum$ and $where$ order by t1.fsonum desc,t2.frownum asc
+

src/rest/openapi/restcontroller/wechatapp/orderform/orderform.java

@@ -329,7 +329,7 @@ public class orderform extends Controller {
 				Rows rows = connect.runSqlQuery(factory.getSQL());
 				return getReturnObject_suc_page(rows, true, 1).toString();
 			} else if (type.equals("땐데놔새灌역튿")) {
-				SQLFactory factory = new SQLFactory(this, "땐데놔새츠玖");
+				SQLFactory factory = new SQLFactory(this, "땐데놔새츠玖1");
 				factory.addParameter("fagentnum", fagentnum);
 		        factory.addParameter("siteid", content.getString("siteid"));
 		        where = where + " and (t2.frateamount-isnull(t7.finvoiceamount,0))>0";