Stringsql="select distinct a.* from tSalesOrder a, tSalesOrderSub b where a.sSalesOrderID = b.sSalesOrderID and a.sShopNO = '"+shopNo+"' and a.sOrgNO = '"+orgNo+"'";
Stringsql="select distinct a.* from tSalesOrder a left join tSalesOrderSub b on a.sSalesOrderID = b.sSalesOrderID where a.sShopNO = '"+shopNo+"' and a.sOrgNO = '"+orgNo+"'";
if(status==0){
if(status==0){
sql+="";
sql+="";
}elseif(status==1){
}elseif(status==1){
...
@@ -166,7 +166,7 @@ public class OrderServiceImpl implements OrderService {
...
@@ -166,7 +166,7 @@ public class OrderServiceImpl implements OrderService {
}elseif(status==6){
}elseif(status==6){
sql+=" and a.nOrderStatus&1 = 1";
sql+=" and a.nOrderStatus&1 = 1";
}elseif(status==7){
}elseif(status==7){
sql+=" and b.sSalesOrderTypeID = '0'and b.nDebtAmount > 0 ";
sql+=" and b.sSalesOrderTypeID = '0'and b.nDebtAmount > 0 ";