|
@@ -324,7 +324,7 @@ public class orderform extends Controller {
|
|
|
//factory.addParameter("fsaler", content.getString("fsaler"));
|
|
//factory.addParameter("fsaler", content.getString("fsaler"));
|
|
|
factory.addParameter("fagentnum", fagentnum);
|
|
factory.addParameter("fagentnum", fagentnum);
|
|
|
factory.addParameter("siteid", content.getString("siteid"));
|
|
factory.addParameter("siteid", content.getString("siteid"));
|
|
|
- where = where + " and (t2.frateamount-isnull(t7.fwriteoffamount,0))>0";
|
|
|
|
|
|
|
+ where = where + " and (sainvoicedetail.famount-isnull(sainvoicedetail.FWRITEOFFAMOUNT1,0))>0";
|
|
|
factory.addParameter_SQL("where", where);
|
|
factory.addParameter_SQL("where", where);
|
|
|
Rows rows = connect.runSqlQuery(factory.getSQL());
|
|
Rows rows = connect.runSqlQuery(factory.getSQL());
|
|
|
return getReturnObject_suc_page(rows, true, 1).toString();
|
|
return getReturnObject_suc_page(rows, true, 1).toString();
|
|
@@ -332,7 +332,7 @@ public class orderform extends Controller {
|
|
|
SQLFactory factory = new SQLFactory(this, "¶©µ¥³ö»õÃ÷ϸ1");
|
|
SQLFactory factory = new SQLFactory(this, "¶©µ¥³ö»õÃ÷ϸ1");
|
|
|
factory.addParameter("fagentnum", fagentnum);
|
|
factory.addParameter("fagentnum", fagentnum);
|
|
|
factory.addParameter("siteid", content.getString("siteid"));
|
|
factory.addParameter("siteid", content.getString("siteid"));
|
|
|
- where = where + " and (t2.frateamount-isnull(t7.finvoiceamount,0))>0";
|
|
|
|
|
|
|
+ where = where + " and (sainvoicedetail.famount-isnull(sainvoicedetail.finvoiceamount,0))>0";
|
|
|
factory.addParameter_SQL("where", where);
|
|
factory.addParameter_SQL("where", where);
|
|
|
Rows rows = connect.runSqlQuery(factory.getSQL());
|
|
Rows rows = connect.runSqlQuery(factory.getSQL());
|
|
|
return getReturnObject_suc_page(rows, true, 1).toString();
|
|
return getReturnObject_suc_page(rows, true, 1).toString();
|