|
|
@@ -717,6 +717,56 @@ public class Order extends Controller {
|
|
|
rows.getFieldList().remove("checkdate");
|
|
|
rows.getFieldList().remove("typemx");
|
|
|
rows.getFieldList().remove("sys_enterpriseid");
|
|
|
+
|
|
|
+ rows.getFieldList().remove("erpbillno");
|
|
|
+ rows.getFieldList().remove("agentnum");
|
|
|
+ rows.getFieldList().remove("projectname");
|
|
|
+ rows.getFieldList().remove("siteid");
|
|
|
+ rows.getFieldList().remove("createuserid");
|
|
|
+ rows.getFieldList().remove("changeuserid");
|
|
|
+ rows.getFieldList().remove("createby");
|
|
|
+ rows.getFieldList().remove("changeby");
|
|
|
+ rows.getFieldList().remove("changedate");
|
|
|
+ rows.getFieldList().remove("checkby");
|
|
|
+ rows.getFieldList().remove("submitby");
|
|
|
+ rows.getFieldList().remove("closeby");
|
|
|
+ rows.getFieldList().remove("closedate");
|
|
|
+ rows.getFieldList().remove("rec_contactsid");
|
|
|
+ rows.getFieldList().remove("sa_contractid");
|
|
|
+ rows.getFieldList().remove("sa_projectid");
|
|
|
+ rows.getFieldList().remove("sa_accountclassid");
|
|
|
+ rows.getFieldList().remove("sa_accountclassinfos");
|
|
|
+ rows.getFieldList().remove("sa_brandid");
|
|
|
+
|
|
|
+
|
|
|
+ rows.getFieldList().remove("sys_enterprise_financeid");
|
|
|
+ rows.getFieldList().remove("sa_logiscompid");
|
|
|
+ rows.getFieldList().remove("saler_hrid");
|
|
|
+ rows.getFieldList().remove("createflag");
|
|
|
+ rows.getFieldList().remove("pay_enterpriseid");
|
|
|
+ rows.getFieldList().remove("signbacknum");
|
|
|
+ rows.getFieldList().remove("rebate_used");
|
|
|
+ rows.getFieldList().remove("rebate_userate");
|
|
|
+ rows.getFieldList().remove("billdate");
|
|
|
+ rows.getFieldList().remove("sa_promotionid");
|
|
|
+ rows.getFieldList().remove("tradefieldmx");
|
|
|
+ rows.getFieldList().remove("reviewtype");
|
|
|
+ rows.getFieldList().remove("freightstatus");
|
|
|
+ rows.getFieldList().remove("toolcount");
|
|
|
+ rows.getFieldList().remove("rebateamount");
|
|
|
+ rows.getFieldList().remove("signbackstatus");
|
|
|
+ rows.getFieldList().remove("saletype");
|
|
|
+
|
|
|
+ rows.getFieldList().remove("oldid");
|
|
|
+ rows.getFieldList().remove("projectnote");
|
|
|
+ rows.getFieldList().remove("deleted");
|
|
|
+ rows.getFieldList().remove("abstract");
|
|
|
+ rows.getFieldList().remove("accountclassinfos");
|
|
|
+ rows.getFieldList().remove("updatek3flag");
|
|
|
+ rows.getFieldList().remove("salename");
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
//添加
|
|
|
rows.getFieldList().add("amount");
|
|
|
rows.getFieldList().add("qty");
|
|
|
@@ -732,7 +782,7 @@ public class Order extends Controller {
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order");
|
|
|
querySQL.setTableAlias("t1");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t2.sys_enterpriseid = t1.sys_enterpriseid and t2.siteid = t1.siteid",
|
|
|
- "enterprisename", "abbreviation");
|
|
|
+ "enterprisename", "abbreviation","abbreviation as amount","abbreviation as qty");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_brand", "t3", "t3.sa_brandid = t1.sa_brandid",
|
|
|
"brandname");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_contacts", "t4", "t4.contactsid = t1.rec_contactsid and t4.siteid = t1.siteid",
|