Sfoglia il codice sorgente

订单管理优化

eganwu 2 anni fa
parent
commit
9b31697320

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

@@ -545,7 +545,7 @@ public class Order extends Controller {
                 where.append("t1.sonum like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.enterprisename like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.abbreviation like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t5.erpbillno like'%").append(whereObject.getString("condition")).append("%' ");
+//                where.append("or t5.erpbillno like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t1.remarks like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
@@ -792,18 +792,18 @@ public class Order extends Controller {
                 "brandname");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_contacts", "t4", "t4.contactsid = t1.rec_contactsid and t4.siteid = t1.siteid",
                 "name");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t5", "t5.ownerid = t1.sa_orderid AND t1.siteid = t5.siteid and t5.erpbillno is not null and t5.ownertable = 'sa_order' ",
-                "erpbillno");
+//        querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t5", "t5.ownerid = t1.sa_orderid AND t1.siteid = t5.siteid and t5.erpbillno is not null and t5.ownertable = 'sa_order' ",
+//                "erpbillno");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t6.sys_enterpriseid=t1.sys_enterpriseid and t6.siteid = t1.siteid",
                 "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_hr", "t7", "t7.hrid = t1.saler_hrid and t7.siteid = t1.siteid");
         //设置别名
         querySQL.addQueryFields("salename", "t7.name");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_project", "t8", "t8.sa_projectid = t1.sa_projectid and t8.siteid = t1.siteid",
-                "projectname");
+//        querySQL.addJoinTable(JOINTYPE.left, "sa_project", "t8", "t8.sa_projectid = t1.sa_projectid and t8.siteid = t1.siteid",
+//                "projectname");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
-        querySQL.setWhere("t1.type!='工具借用单'");
+//        querySQL.setWhere("t1.type!='工具借用单'");
         querySQL.setWhere("t1.deleted=0");
         querySQL.setWhere("(t1.status!='新建' or t1.createuserid =$userid$ or t1.createflag=1)");
         querySQL.addParameter("userid", userid);