发货单查询优化

src/custom/restcontroller/sale/cashbill/SQL/资金流水账查询导出.sql

@@ -4,10 +4,10 @@ select t1.billno,
        t4.accountname,
        t1.amount,
        ifnull(t1.balance,0) balance,
-       t1.remarks,
        t1.source,
-       t1.createby,
-       t1.createdate,
+       t1.class,
+       t1.subclass,
+       t1.remarks,
        t1.checkby,
        t1.checkdate 
 from sa_cashbill t1

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -935,8 +935,6 @@ public class cashbill extends Controller {
         if (isExport) {
             //去除不需要导出项
             rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("createby");
-            rows.getFieldList().remove("createdate");
             Rows uploadRows = uploadExcelToObs("cashBill", "资金流水账列表", rows, getTitleMap());
             return getSucReturnObject().setData(uploadRows).toString();
         }
@@ -1157,9 +1155,12 @@ public class cashbill extends Controller {
         titleMap.put("amount", "收支金额");
         titleMap.put("balance", "账户结余");
         titleMap.put("source", "凭证来源");
+        titleMap.put("class", "分类");
+        titleMap.put("subclass", "分类明细");
+        titleMap.put("remarks", "备注");
         titleMap.put("checkby", "审核人");
         titleMap.put("checkdate", "审核时间");
-        titleMap.put("remarks", "备注");
+
         return titleMap;
     }
 }

src/custom/restcontroller/webmanage/sale/dispatch/SQL/发货单列表查询.sql

@@ -27,15 +27,11 @@ SELECT t1.billno,
        t1.closedate,
        t1.billdate,
        t7.agentnum,
-       t8.erpbillno,
-       case when t3.type='项目订单' then t9.projectname else t3.projectnote end projectname,
        t1.isreport
 FROM sa_dispatch t1
          LEFT JOIN sys_enterprise t2 ON t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid
          LEFT JOIN sa_order t3 ON t1.sa_orderid = t3.sa_orderid AND t1.siteid = t3.siteid
          LEFT JOIN sys_enterprise_contacts t5 ON t1.rec_contactsid = t5.contactsid AND t1.siteid = t5.siteid
          LEFT JOIN sa_agents t7 ON t7.sys_enterpriseid = t1.sys_enterpriseid AND t1.siteid = t7.siteid
-         LEFT JOIN sys_dataextend t8 ON t8.ownertable = 'sa_dispatch' and t8.ownerid = t1.sa_dispatchid AND t1.siteid = t8.siteid
-         LEFT JOIN sa_project t9 ON t9.sa_projectid = t3.sa_projectid AND t9.siteid = t3.siteid 
 where t1.siteid = $siteid$
   and $where$

src/custom/restcontroller/webmanage/sale/dispatch/dispatch.java

@@ -20,6 +20,7 @@ import restcontroller.sale.cashbill.cashbill;
 import restcontroller.webmanage.executorService.Executor;
 import restcontroller.webmanage.sale.order.Order;
 import restcontroller.webmanage.sale.order.OrderItems;
+import sun.awt.AWTIcon32_security_icon_yellow32_png;
 import utility.ERPDocking;
 import utility.tools.WebRequest;
 
@@ -274,16 +275,12 @@ public class dispatch extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid",
                 "enterprisename", "abbreviation");
         querySQL.addQueryFields("enterprisephonenumber", "t2.phonenumber");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t3", "t1.sa_orderid = t3.sa_orderid AND t1.siteid = t3.siteid");
-        querySQL.addQueryFields("projectname", "case when t3.type='项目订单' then t9.projectname else t3.projectnote end ");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t3", "t1.sa_orderid = t3.sa_orderid AND t1.siteid = t3.siteid", "sonum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_contacts", "t5", "t1.rec_contactsid = t5.contactsid AND t1.siteid = t5.siteid",
                 "province", "city", "county", "address");
         querySQL.addQueryFields("contactsphonenumber", "t5.phonenumber");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t7", "t7.sys_enterpriseid = t1.sys_enterpriseid AND t1.siteid = t7.siteid",
                 "agentnum");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t8", "t8.ownertable = 'sa_dispatch' and t8.ownerid = t1.sa_dispatchid AND t1.siteid = t8.siteid",
-                "erpbillno");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_project", "t9", "t9.sa_projectid = t3.sa_projectid AND t9.siteid = t3.siteid");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         return querySQL;