Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/R.java

@@ -6706,6 +6706,16 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2025090809202003 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID2025090909115603 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/sale/creditbill/creditbill.java

@@ -94,7 +94,7 @@ public class creditbill extends Controller {
 //        SQLFactory sqlFactory = new SQLFactory(this, "合作企业档案列表查询", pageSize, pageNumber, pageSorting);
 //        sqlFactory.addParameter_SQL("where", where);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory);
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise", "sys_enterpriseid", "enterprisename",
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise", "sys_enterpriseid", "enterprisename","abbreviation",
                 "province","city","county","address","contact","phonenumber","taxno");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t2", "t1.sys_enterpriseid = t2.ownerid and t2.ownertable = 'sys_enterprise' and t1.siteid = t2.siteid","erpagentnum");

src/custom/restcontroller/webmanage/sale/accountclass/SQL/营销账户余额查询.sql

@@ -8,6 +8,7 @@ SELECT t1.sa_accountbalanceid,
        t1.changedate,
        t1.sys_enterpriseid,
        t3.enterprisename,
+       t3.abbreviation,
        t3.province,
        t3.city,
        t3.county,

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

@@ -335,7 +335,7 @@ public class aftersalesmag extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_aftersalesmag", "*");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename","abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid","name","phonenumber","address",
                 "stockdate","enddate","model","unitname","itemname","itemno","duty","demand","machinecode","qty","itemid");

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

@@ -62,7 +62,7 @@ public class agents extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents", "sys_enterpriseid", "isservice",
                 "sa_agentsid","agentnum","priceadjustment","type","signdate","createby","createdate","status");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid","enterprisename"
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid","enterprisename","abbreviation"
                 ,"contact","address","phonenumber","province","city","county","grade","saleclassauth");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());

src/custom/restcontroller/webmanage/sale/customer/Customer.java

@@ -968,6 +968,76 @@ public class Customer extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
+    @API(title = "终端客户档案", apiversion = R.ID2025090809202003.v1.class)
+    @CACHEING
+    public String queryMdCustomers() throws YosException {
+        StringBuffer where = new StringBuffer(" 1=1 ");
+        if (content.containsKey("where")) {
+            JSONObject whereObject = content.getJSONObject("where");
+            if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
+                where.append(" and(");
+                where.append("t1.name like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+        }
+        QuerySQL querySQL;
+        querySQL = SQLFactory.createQuerySQL(this, "sa_customers", "sa_customersid","name","phonenumber","province","city","county","address","createdate","sa_agentsid","sa_agentsid_to");
+        querySQL.setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t2", "t1.sa_agentsid = t2.sa_agentsid AND t1.siteid = t2.siteid","agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t2.sys_enterpriseid = t3.sys_enterpriseid AND t2.siteid = t3.siteid","enterprisename","abbreviation");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t1.sa_agentsid_to = t4.sa_agentsid AND t1.siteid = t4.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t4.sys_enterpriseid = t5.sys_enterpriseid AND t4.siteid = t3.siteid");
+        querySQL.addQueryFields("agentnum_to","t4.agentnum");
+        querySQL.addQueryFields("enterprisename_to","t5.enterprisename");
+        querySQL.addQueryFields("abbreviation_to","t5.abbreviation");
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere(where.toString());
+
+        querySQL.setOrderBy(pageSorting);
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+        return getSucReturnObject().setData(rows).toString();
+    }
+
+
+
+
+    @API(title = "经销商查询终端客户档案", apiversion = R.ID2025090909115603.v1.class)
+    @CACHEING
+    public String queryAgentMdCustomers() throws YosException {
+        long sa_agentsid=0;
+        Rows agentrows = dbConnect.runSqlQuery("select sa_agentsid from sa_agents where sys_enterpriseid="+sys_enterpriseid);
+        if(agentrows.isNotEmpty()){
+            sa_agentsid=agentrows.get(0).getLong("sa_agentsid");
+        }
+        StringBuffer where = new StringBuffer(" 1=1 ");
+        if (content.containsKey("where")) {
+            JSONObject whereObject = content.getJSONObject("where");
+            if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
+                where.append(" and(");
+                where.append("t1.name like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+        }
+        QuerySQL querySQL;
+        querySQL = SQLFactory.createQuerySQL(this, "sa_customers", "sa_customersid","name","phonenumber","province","city","county","address","createdate","sa_agentsid","sa_agentsid_to");
+        querySQL.setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t2", "t1.sa_agentsid = t2.sa_agentsid AND t1.siteid = t2.siteid","agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t2.sys_enterpriseid = t3.sys_enterpriseid AND t2.siteid = t3.siteid","enterprisename","abbreviation");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t1.sa_agentsid_to = t4.sa_agentsid AND t1.siteid = t4.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t4.sys_enterpriseid = t5.sys_enterpriseid AND t4.siteid = t3.siteid");
+        querySQL.addQueryFields("agentnum_to","t4.agentnum");
+        querySQL.addQueryFields("enterprisename_to","t5.enterprisename");
+        querySQL.addQueryFields("abbreviation_to","t5.abbreviation");
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere(where.toString());
+        querySQL.setWhere("(t1.sa_agentsid="+sa_agentsid+" or t1.sa_agentsid_to="+sa_agentsid+")");
+
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+        return getSucReturnObject().setData(rows).toString();
+    }
+
 
     /**
      * 获取客户名称

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1097,7 +1097,7 @@ public class Order extends Controller {
                 "sa_orderid", "sonum", "type", "status", "submitdate", "checkdate", "remarks", "createby", "checkby", "billdate", "tradefield", "rec_contactsid", "delivery", "tracknumber", "mailno");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t2.sys_enterpriseid = t1.sys_enterpriseid and t2.siteid = t1.siteid",
-                "enterprisename");
+                "enterprisename","abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t6.sys_enterpriseid=t1.sys_enterpriseid and t6.siteid = t1.siteid",
                 "agentnum");
         querySQL.addQueryFields("amount", "CAST(0 AS CHAR(20))");

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -895,7 +895,6 @@ public class OrderItems extends Controller {
             }
         }
 
-        boolean isExport = content.getBooleanValue("isExport");
         QuerySQL querySQL = queryAllListManage(where.toString());
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
@@ -976,7 +975,7 @@ public class OrderItems extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t6.sys_enterpriseid = t5.sys_enterpriseid and t6.siteid = t5.siteid",
                 "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t7", "t7.sys_enterpriseid = t5.sys_enterpriseid and t7.siteid = t5.siteid",
-                "enterprisename");
+                "enterprisename","abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "plm_itemclass", "t8", "t8.itemclassid = t3.marketingcategory and t8.siteid = t3.siteid",
                 "itemclassname");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_tradefield", "t9", "t9.sys_enterpriseid = t5.sys_enterpriseid and t9.tradefield=t5.tradefield and t9.siteid = t5.siteid",

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

@@ -108,6 +108,10 @@ public class period extends Controller {
         querySQL.setTableAlias("t1");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
+        if (pageSorting.equals("''")) {
+            pageSorting = "concat(t1.year,'-', LPAD(t1.month, 2, '0')) desc";
+        }
+        querySQL.setOrderBy(pageSorting);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
 

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

@@ -456,7 +456,7 @@ public class salearea extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid",
-                "enterprisename", "phonenumber", "contact", "province", "city", "county", "address", "limitreturnday", "freefreightamount", "invoicingpoint","saleclassauth");
+                "enterprisename","abbreviation", "phonenumber", "contact", "province", "city", "county", "address", "limitreturnday", "freefreightamount", "invoicingpoint","saleclassauth");
         querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t4", "t1.sys_enterpriseid = t4.ownerid and ownertable = 'sys_enterprise' and t1.siteid = t4.siteid",
                 "erpagentnum");
         querySQL.setWhere("t1.siteid", siteid);