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

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表.sql

@@ -38,7 +38,6 @@ WHERE t1.siteid = $siteid$
   and t1.isonsale = 1
   and t1.istool = 0
   and $where$
-  and $tablefilter$
   and t1.itemid in (SELECT t1.itemid
                     from sa_itemsaleclass t1
                              INNER JOIN plm_itemclass t2 ON t1.itemclassid = t2.itemclassid and t1.siteid = t2.siteid

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表_总部订单.sql

@@ -33,5 +33,4 @@ from plm_item t1
          LEFT JOIN plm_unit t5 ON t5.unitid = t2.auxunitid AND t5.siteid = t2.siteid
 WHERE t1.siteid = $siteid$
   and t1.status = '审核'
-  and $where$
-  and $tablefilter$
+  and $where$

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表_特殊订单.sql

@@ -37,7 +37,6 @@ from plm_item t1
 WHERE t1.siteid = $siteid$
   and t1.status = '审核'
   and $where$
-  and $tablefilter$
   and t1.itemid in (SELECT t1.itemid
                     from plm_item_tradefield t1 WHERE t1.tradefield =  $tradefield$
                      and t1.siteid = $siteid$)