hu 2 лет назад
Родитель
Сommit
7380f39b62

+ 33 - 0
src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -472,6 +472,39 @@ public class Item extends Controller {
             rows.getFieldList().remove("widthschemename");
             rows.getFieldList().remove("lengthschemename");
             rows.getFieldList().remove("brand");
+            rows.getFieldList().remove("connection");
+            rows.getFieldList().remove("siteid");
+            rows.getFieldList().remove("createby");
+            rows.getFieldList().remove("changeuserid");
+            rows.getFieldList().remove("changeby");
+            rows.getFieldList().remove("changedate");
+            rows.getFieldList().remove("isauxunit");
+            rows.getFieldList().remove("unitgroupid");
+
+            rows.getFieldList().remove("status");
+            rows.getFieldList().remove("orderminqty_auxunit");
+            rows.getFieldList().remove("orderaddqty_auxunit");
+            rows.getFieldList().remove("checkby");
+            rows.getFieldList().remove("checkdate");
+            rows.getFieldList().remove("onsaledate");
+            rows.getFieldList().remove("onsaleby");
+            rows.getFieldList().remove("remarks");
+            rows.getFieldList().remove("standards");
+            rows.getFieldList().remove("stockstatus2");
+            rows.getFieldList().remove("stockstatus1");
+            rows.getFieldList().remove("warrantyday");
+            rows.getFieldList().remove("iswuliao");
+            rows.getFieldList().remove("isservice");
+            rows.getFieldList().remove("sa_agentsid");
+            rows.getFieldList().remove("sa_customschemeid");
+            rows.getFieldList().remove("k3outcode");
+            rows.getFieldList().remove("description");
+            rows.getFieldList().remove("price1");
+            rows.getFieldList().remove("price2");
+            rows.getFieldList().remove("price3");
+            rows.getFieldList().remove("price4");
+            rows.getFieldList().remove("price5");
+
 
             Rows uploadRows = uploadExcelToObs("item", "商品列表", rows, getTitleMap());
             return getSucReturnObject().setData(uploadRows).toString();

+ 51 - 1
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -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",

+ 11 - 0
src/custom/restcontroller/webmanage/sale/paybill/Paybill.java

@@ -91,6 +91,17 @@ public class Paybill extends Controller {
             rows.getFieldList().remove("createby");
             rows.getFieldList().remove("createdate");
 
+            rows.getFieldList().remove("sa_paybillid");
+            rows.getFieldList().remove("changeuserid");
+            rows.getFieldList().remove("changeby");
+            rows.getFieldList().remove("changedate");
+            rows.getFieldList().remove("bank");
+            rows.getFieldList().remove("bankcardno");
+            rows.getFieldList().remove("submitdate");
+            rows.getFieldList().remove("submitby");
+            rows.getFieldList().remove("inbank");
+            rows.getFieldList().remove("inbankcardno");
+
             Rows uploadRows = uploadExcelToObs("cashBill", "打款凭证列表", rows, getTitleMap());
             return getSucReturnObject().setData(uploadRows).toString();
         }

+ 4 - 4
src/custom/restcontroller/webmanage/sale/paybill/SQL/打款凭证列表.sql

@@ -1,15 +1,15 @@
 select t1.sa_paybillid,
        t1.sys_enterpriseid,
        t1.billno,
+       t1.status,
+       t2.agentnum,
+       t3.enterprisename,
+       t3.abbreviation,
        t1.payer,
        t1.paydate,
        t1.period,
        t1.amount,
-       t1.status,
        t1.remarks,
-       t2.agentnum,
-       t3.enterprisename,
-       t3.abbreviation,
        t1.checkby,
        t1.checkdate,
        t1.createby,