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

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

@@ -796,7 +796,7 @@ public class cashbill extends Controller {
         //SQLFactory sqlFactoryquery = new SQLFactory(this, "信用额度调整单状态查询");
         //sqlFactoryquery.addParameter("siteid", siteid);
         //sqlFactoryquery.addParameter_in("sa_creditbillids", stringArray);
-        Rows rows = dbConnect.runSqlQuery("select sa_cashbillid,sys_enterpriseid,sa_accountclassid,status,billno,amount,type,ownerid from sa_cashbill where sa_cashbillid ='" + sa_cashbillid + "' and  siteid='" + siteid + "'");
+        Rows rows = dbConnect.runSqlQuery("select checkdate,sa_cashbillid,sys_enterpriseid,sa_accountclassid,status,billno,amount,type,ownerid from sa_cashbill where sa_cashbillid ='" + sa_cashbillid + "' and  siteid='" + siteid + "'");
         Date date = new Date();
         for (Row row : rows) {
             if (!row.getString("status").equals("审核")) {

src/custom/restcontroller/webmanage/sale/dispatch/SQL/商品发货数量汇总.sql

@@ -1,7 +1,6 @@
 SELECT  t3.itemno,
-        SUM(t1.qty-ifnull(t4.qty,0)) qty
+        SUM(t1.qty-ifnull(t1.outwarehouseqty,0)) qty
 FROM sa_dispatch_items t1
          inner join sa_dispatch t2 on t1.siteid = t2.siteid and t1.sa_dispatchid = t2.sa_dispatchid
          left join plm_item t3 on t1.siteid = t3.siteid and t1.itemid = t3.itemid
-         LEFT JOIN (select t1.sa_dispatch_itemsid,t1.siteid,sum(t1.qty) qty from st_stockbill_items t1 inner join st_stockbill t2 on t1.st_stockbillid=t2.st_stockbillid and t1.siteid=t2.siteid where t2.status='审核' group by t1.sa_dispatch_itemsid,t1.siteid) t4 on t4.sa_dispatch_itemsid=t1.sa_dispatch_itemsid and t1.siteid=t4.siteid
 WHERE t2.STATUS in ('审核','复核') and t1.siteid=$siteid$ and t3.itemno in $itemnos$ group by t3.itemno

src/custom/restcontroller/webmanage/sale/invbal/SQL/商品发货数量汇总.sql

@@ -1,9 +1,8 @@
 SELECT  t3.itemno,
-        SUM(t1.qty-ifnull(t4.qty,0)) qty
+        SUM(t1.qty-ifnull(t1.outwarehouseqty,0)) qty
 FROM sa_dispatch_items t1
          inner join sa_dispatch t2 on t1.siteid = t2.siteid and t1.sa_dispatchid = t2.sa_dispatchid
          inner join plm_item t3 on t1.siteid = t3.siteid and t1.itemid = t3.itemid
          left join sys_enterprise t5 on t2.sys_enterpriseid=t5.sys_enterpriseid and t2.siteid=t5.siteid
          left join  sa_agents t6 on t6.sys_enterpriseid=t2.sys_enterpriseid and t2.siteid=t6.siteid
-				 LEFT JOIN (select t1.sa_dispatch_itemsid,t1.siteid,sum(t1.qty) qty from st_stockbill_items t1 inner join st_stockbill t2 on t1.st_stockbillid=t2.st_stockbillid and t1.siteid=t2.siteid where t2.status='审核' group by t1.sa_dispatch_itemsid,t1.siteid) t4 on t4.sa_dispatch_itemsid=t1.sa_dispatch_itemsid and t1.siteid=t4.siteid
 WHERE t2.STATUS in ('审核','复核') and t1.siteid=$siteid$ and $where$ group by t3.itemno

src/custom/restcontroller/webmanage/sale/order/SQL/商品发货数量汇总.sql

@@ -1,7 +1,6 @@
 SELECT  t3.itemno,
-        SUM(t1.qty-ifnull(t4.qty,0)) qty
+        SUM(t1.qty-ifnull(t1.outwarehouseqty,0)) qty
 FROM sa_dispatch_items t1
          inner join sa_dispatch t2 on t1.siteid = t2.siteid and t1.sa_dispatchid = t2.sa_dispatchid
          left join plm_item t3 on t1.siteid = t3.siteid and t1.itemid = t3.itemid
-         LEFT JOIN (select t1.sa_dispatch_itemsid,t1.siteid,sum(t1.qty) qty from st_stockbill_items t1 inner join st_stockbill t2 on t1.st_stockbillid=t2.st_stockbillid and t1.siteid=t2.siteid where t2.status='审核' group by t1.sa_dispatch_itemsid,t1.siteid) t4 on t4.sa_dispatch_itemsid=t1.sa_dispatch_itemsid and t1.siteid=t4.siteid
 WHERE t2.STATUS in ('审核','复核') and t1.siteid=$siteid$ and t3.itemno in $itemnos$ group by t3.itemno