20230508113003,20221010102903,20221009102903三个接口增加区域名称

src/custom/restcontroller/sale/cashbill/SQL/收支凭证关联区域列表查询.sql

@@ -0,0 +1,7 @@
+select t3.areaname,t1.sys_enterpriseid,t1.siteid from sa_agents t1
+left join sys_enterprise_tradefield t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid
+left join sa_salearea t3 on t2.sa_saleareaid=t3.sa_saleareaid and t2.siteid=t3.siteid
+ WHERE
+	t1.siteid = $siteid$
+	AND t1.sys_enterpriseid IN $sys_enterpriseids$
+	

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

@@ -462,6 +462,13 @@ public class cashbill extends Controller {
             querySQL.setPage(pageSize, pageNumber);
 //        }
         Rows rows = querySQL.query();
+
+        SQLFactory areasqlFactory = new SQLFactory(this, "收支凭证关联区域列表查询");
+        areasqlFactory.addParameter("siteid", siteid);
+        areasqlFactory.addParameter_in("sys_enterpriseids", rows.toArrayList("sys_enterpriseid",new ArrayList<>()));
+        Rows areaRows = dbConnect.runSqlQuery(areasqlFactory);
+        RowsMap areaRowsMap =areaRows.toRowsMap("sys_enterpriseid");
+
         ArrayList sa_cashbillids = rows.toArrayList("sa_cashbillid", new ArrayList<>());
         sa_cashbillids.add(0L);
 
@@ -473,6 +480,11 @@ public class cashbill extends Controller {
                 row.put("offsettingbillno", offsettingRowsMap.get(row.getString("sa_cashbillid")).get(0).getString("billno"));
             }
             row.put("amount", row.getBigDecimal("amount"));
+            if(areaRowsMap.containsKey(row.getString("sys_enterpriseid"))){
+                row.put("areaname",areaRowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areaname"));
+            }else{
+                row.put("areaname","");
+            }
         }
 
 //        if (isExport) {
@@ -554,6 +566,8 @@ public class cashbill extends Controller {
                         + ")";
             }
         }
+
+
         if (pageSorting.equals("''")) {
             pageSorting = "status desc, createdate desc";
         }
@@ -561,8 +575,20 @@ public class cashbill extends Controller {
         querySQL.setOrderBy(pageSorting);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
+
+        SQLFactory areasqlFactory = new SQLFactory(this, "收支凭证关联区域列表查询");
+        areasqlFactory.addParameter("siteid", siteid);
+        areasqlFactory.addParameter_in("sys_enterpriseids", rows.toArrayList("sys_enterpriseid",new ArrayList<>()));
+        Rows areaRows = dbConnect.runSqlQuery(areasqlFactory);
+        RowsMap areaRowsMap =areaRows.toRowsMap("sys_enterpriseid");
+
         for (Row row : rows) {
             row.put("amount", row.getBigDecimal("amount"));
+            if(areaRowsMap.containsKey(row.getString("sys_enterpriseid"))){
+                row.put("areaname",areaRowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areaname"));
+            }else{
+                row.put("areaname","");
+            }
         }
 //        if (isExport) {
 //            //去除不需要导出项
@@ -599,7 +625,7 @@ public class cashbill extends Controller {
         querySQL.setTableAlias("t1");
         querySQL.addQueryFields("unwriteoffamount", "t1.amount - t1.writeoffamount");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid and t1.siteid = t2.siteid",
-                "enterprisename", "abbreviation");
+                "enterprisename", "abbreviation","sys_enterpriseid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sys_enterpriseid = t2.sys_enterpriseid and t4.siteid = t2.siteid",
                 "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_accountclass", "t3", "t1.sa_accountclassid = t3.sa_accountclassid and t1.siteid = t3.siteid and t3.isused = 1",

src/custom/restcontroller/webmanage/sale/dispatch/SQL/发货单明细关联区域列表查询.sql

@@ -0,0 +1,7 @@
+select t3.areaname,t1.sys_enterpriseid,t1.siteid from sa_agents t1
+left join sys_enterprise_tradefield t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid
+left join sa_salearea t3 on t2.sa_saleareaid=t3.sa_saleareaid and t2.siteid=t3.siteid
+ WHERE
+	t1.siteid = $siteid$
+	AND t1.sys_enterpriseid IN $sys_enterpriseids$
+	

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

@@ -354,6 +354,12 @@ public class dispatchItems extends Controller {
 
         rows = querySQL.query();
 
+        SQLFactory areasqlFactory = new SQLFactory(this, "发货单明细关联区域列表查询");
+        areasqlFactory.addParameter("siteid", siteid);
+        areasqlFactory.addParameter_in("sys_enterpriseids", rows.toArrayList("sys_enterpriseid",new ArrayList<>()));
+        Rows areaRows = dbConnect.runSqlQuery(areasqlFactory);
+        RowsMap areaRowsMap =areaRows.toRowsMap("sys_enterpriseid");
+
         SQLFactory itemsqlFactory = new SQLFactory(this, "发货单明细关联商品列表查询");
         itemsqlFactory.addParameter("siteid", siteid);
         itemsqlFactory.addParameter_in("itemids", rows.toArrayList("itemid",new ArrayList<>()));
@@ -382,6 +388,11 @@ public class dispatchItems extends Controller {
                 row.put("itemname",itemRowsMap.get(row.getString("itemid")).get(0).getString("itemname"));
                 row.put("unitname",itemRowsMap.get(row.getString("itemid")).get(0).getString("unitname"));
             }
+            if(areaRowsMap.containsKey(row.getString("sys_enterpriseid"))){
+                row.put("areaname",areaRowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areaname"));
+            }else{
+                row.put("areaname","");
+            }
         }
 
         RowsMap rowsMap = rows.toRowsMap("itemno");
@@ -463,7 +474,7 @@ public class dispatchItems extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t9", "t9.sys_enterpriseid = t4.sys_enterpriseid and t9.siteid = t4.siteid",
                 "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t10", "t10.sys_enterpriseid = t4.sys_enterpriseid and t10.siteid = t4.siteid",
-                "enterprisename");
+                "enterprisename","sys_enterpriseid");
         querySQL.addQueryFields("qty","ifnull(t1.qty, 0)");
         querySQL.addQueryFields("outwarehouseqty","ifnull(t1.outwarehouseqty, 0)");
         querySQL.setWhere("t1.siteid", siteid);