查询订单所有明细列表返回出库数量

src/custom/restcontroller/webmanage/sale/agents/SQL/商户档案修改.sql

@@ -6,6 +6,7 @@ set changeuserid=$changeuserid$,
     freefreightamount=$freefreightamount$,
     invoicingpoint=$invoicingpoint$,
     saleclassauth=$saleclassauth$,
-    grade = $grade$
+    grade = $grade$,
+    isrebate=$isrebate$
 where siteid = $siteid$
   and sys_enterpriseid = $sys_enterpriseid$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商详情查询.sql

@@ -24,7 +24,8 @@ select t1.sys_enterpriseid,
        t2.isservice,
        t1.limitreturnday,
        t1.freefreightamount,
-       t1.invoicingpoint
+       t1.invoicingpoint,
+       t1.isrebate
 from sys_enterprise t1
          inner join sa_agents t2 on t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid
          LEFT JOIN sys_dataextend t4 ON t1.sys_enterpriseid = t4.ownerid  and ownertable='sys_enterprise' and  t1.siteid = t4.siteid

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

@@ -190,6 +190,7 @@ public class agents extends Controller {
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("username", username);
         sqlFactory.addParameter("changeuserid", userid);
+        sqlFactory.addParameter("isrebate", content.getBooleanValue("isrebate") == false ? 0 : 1);
         sqllist.add(sqlFactory.getSQL());
 
 

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

@@ -919,6 +919,13 @@ public class OrderItems extends Controller {
 
     //查询订单列表(管理端)
     public QuerySQL queryAllListManage(String where) throws YosException {
+
+        QuerySQL t11= SQLFactory.createQuerySQL(this,"sa_dispatch_items",
+                "sa_orderitemsid","siteid");
+        t11.addQueryFields("outwarehouseqty","sum(outwarehouseqty)");
+        t11.addGroupBy("sa_orderitemsid,siteid");
+
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_orderitems",
                 "sa_orderitemsid", "itemid", "rowno", "itemno", "itemname", "unit", "qty", "undeliqty", "saleprice", "defaultprice", "price", "amount", "remarks", "customproperties", "batchcontrol", "model",
                 "conversionrate", "marketprice", "defaultprice", "defaultamount", "auxqty", "needdate", "deliedqty", "rebateamount", "invoiceamount", "writeoffamount", "auxunit", "sa_orderid",
@@ -938,9 +945,9 @@ public class OrderItems extends Controller {
                 "sys_enterprise_tradefieldid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t10", "t10.sa_saleareaid = t9.sa_saleareaid and t10.siteid = t9.siteid",
                 "areaname");
-        querySQL.addJoinTable(JOINTYPE.left, "st_stockbill_items", "t11", "t11.sa_orderitemsid = t1.sa_orderitemsid and t11.siteid = t1.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, t11, "t11", "t11.sa_orderitemsid = t1.sa_orderitemsid and t11.siteid = t1.siteid");
         querySQL.addQueryFields("orderremarks", "t5.remarks");
-        querySQL.addQueryFields("transportqty","ifnull(t11.transportqty,0)");
+        querySQL.addQueryFields("outwarehouseqty","ifnull(t11.outwarehouseqty,0)");
         //querySQL.addQueryFields("accountclassinfos", "REPLACE(SUBSTRING(JSON_EXTRACT(t5.sa_accountclassinfos, '$[*].accountname'), 2, CHAR_LENGTH(JSON_EXTRACT(t5.sa_accountclassinfos, '$[*].accountname'))-2),'\"','')");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);