|
@@ -338,7 +338,7 @@ public class cashbill extends Controller {
|
|
|
@API(title = "k3获取收入凭证", apiversion = R.ID20230714164903.v1.class,accesstoken = false)
|
|
@API(title = "k3获取收入凭证", apiversion = R.ID20230714164903.v1.class,accesstoken = false)
|
|
|
public String getcashbill() throws YosException{
|
|
public String getcashbill() throws YosException{
|
|
|
|
|
|
|
|
- Rows rows = dbConnect.runSqlQuery("select t2.k3outcode fk3outcode,t1.billno fbillnum,t1.sa_cashbillid ficashbillid,t1.createby,ifnull(t1.billdate,CURRENT_DATE) fdate,t3.accountno faccclsnum,t2.agentnum fagentnum,t1.amount famount,t1.remarks fnotes,t1.updatek3flag fupdatek3flag from sa_cashbill t1 inner join sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t2.siteid=t2.siteid left join sa_accountclass t3 on t1.sa_accountclassid=t3.sa_accountclassid and t1.siteid=t3.siteid where t3.accountno!='03' and (updatek3flag='0' or updatek3flag='2') and t1.type=1 and ifnull(t1.amount,0)!=0 and t1.status='审核' and ifnull(t1.description,'')!='K3' and t1.siteid='lsa' and t1.createby !='LSA总0001'");
|
|
|
|
|
|
|
+ Rows rows = dbConnect.runSqlQuery("select t2.k3outcode fk3outcode,t1.billno fbillnum,t1.sa_cashbillid ficashbillid,t1.createby,ifnull(t1.period,CURRENT_DATE) fdate,t3.accountno faccclsnum,t2.agentnum fagentnum,t1.amount famount,t1.remarks fnotes,t1.updatek3flag fupdatek3flag from sa_cashbill t1 inner join sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t2.siteid=t2.siteid left join sa_accountclass t3 on t1.sa_accountclassid=t3.sa_accountclassid and t1.siteid=t3.siteid where t3.accountno!='03' and (updatek3flag='0' or updatek3flag='2') and t1.type=1 and ifnull(t1.amount,0)!=0 and t1.status='审核' and ifnull(t1.description,'')!='K3' and t1.siteid='lsa' and t1.createby !='LSA总0001'");
|
|
|
if (rows.isEmpty()) {
|
|
if (rows.isEmpty()) {
|
|
|
JSONArray array = new JSONArray();
|
|
JSONArray array = new JSONArray();
|
|
|
return array.toString();
|
|
return array.toString();
|