|
|
@@ -912,7 +912,7 @@ public class cashbill extends Controller {
|
|
|
// sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
|
|
|
// sqlFactory.addParameter("siteid", siteid);
|
|
|
// Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
|
|
|
- QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_cashbill", "billno", "type", "amount", "remarks", "balance", "source", "checkby", "checkdate", "sa_accountclassid");
|
|
|
+ QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_cashbill", "billno", "type", "amount","discountamount", "remarks", "balance", "source", "checkby", "checkdate", "sa_accountclassid");
|
|
|
querySQL.setTableAlias("t1");
|
|
|
querySQL.addQueryFields("type_ch", "if(t1.type=1,'收入','支出')");
|
|
|
querySQL.addQueryFields("unwriteoffamount", "t1.amount - t1.writeoffamount");
|