Browse Source

发货单选择订单过滤条件更新

hu 2 years ago
parent
commit
0d91266ab8

+ 1 - 0
src/custom/restcontroller/webmanage/sale/dispatch/SQL/审核订单列表查询.sql

@@ -10,6 +10,7 @@ FROM sa_order t1
          LEFT JOIN sys_enterprise t2 ON t1.sys_enterpriseid = t2.sys_enterpriseid
     AND t1.siteid = t2.siteid
 WHERE t1.STATUS = '审核'
+  and t1.sys_enterpriseid=$sys_enterpriseid$
   and  exists (select 1 from sa_orderitems where (ifnull(undeliqty, 0)!=0 and ifnull(isclose, 0 )= 0) and sa_orderid=t1.sa_orderid)
   AND t1.siteid = $siteid$
   and $where$

+ 1 - 0
src/custom/restcontroller/webmanage/sale/dispatch/dispatchItems.java

@@ -54,6 +54,7 @@ public class dispatchItems extends Controller {
 //		String hrid = content.getString("hrid");
         SQLFactory sqlFactory = new SQLFactory(this, "审核订单列表查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);
+        sqlFactory.addParameter("sys_enterpriseid", content.getLong("sys_enterpriseid"));
         sqlFactory.addParameter("siteid", siteid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);