Merge branch 'develop_green' into develop

src/custom/restcontroller/webmanage/sale/dispatch/SQL/工厂发货及退货明细(区域经理).sql

@@ -54,4 +54,4 @@ FROM st_stockbill_items t1
          left join plm_itemextend t6 on t2.siteid = t6.siteid and t2.itemid = t6.itemid
          left join sa_agents t7 on t7.sys_enterpriseid=t8.sys_enterpriseid and t7.siteid=t8.siteid
          left join sys_enterprise t9 on t9.sys_enterpriseid=t8.sys_enterpriseid and t9.siteid=t8.siteid
-where t4.rb=0 and  t1.siteid = $siteid$ and $where$ and t4.sys_enterpriseid in (select sys_enterpriseid from sys_enterprise_tradefield where sa_saleareaid in $sa_saleareaids$)) t
+where t4.rb=0 and  t1.siteid = $siteid$ and $where$ and t4.sys_enterpriseid in (select sys_enterpriseid from sys_enterprise_tradefield where sa_saleareaid in $sa_saleareaids$)) t where $where1$

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

@@ -563,31 +563,31 @@ public class dispatchItems extends Controller {
          * 过滤条件设置
          */
         StringBuffer where = new StringBuffer(" 1=1 ");
-
+        StringBuffer where1 = new StringBuffer(" 1=1 ");
 
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
-                where.append(" and(");
-                where.append("t.sonum like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t.itemno like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t.itemname like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t.remarks like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append(")");
+                where1.append(" and(");
+                where1.append("t.sonum like'%").append(whereObject.getString("condition")).append("%' ");
+                where1.append("or t.itemno like'%").append(whereObject.getString("condition")).append("%' ");
+                where1.append("or t.itemname like'%").append(whereObject.getString("condition")).append("%' ");
+                where1.append("or t.remarks like'%").append(whereObject.getString("condition")).append("%' ");
+                where1.append(")");
             }
             if (whereObject.containsKey("type") && !"".equals(whereObject.getString("type"))) {
-                where.append(" and(");
-                where.append("t.type ='").append(whereObject.getString("type")).append("' ");
-                where.append(")");
+                where1.append(" and(");
+                where1.append("t.type ='").append(whereObject.getString("type")).append("' ");
+                where1.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and DATE_FORMAT(t.date, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
+                where1.append(" and DATE_FORMAT(t.date, '%Y-%m-%d') >='").append(whereObject.getString("begindate")).append("' ");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and DATE_FORMAT(t.date, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
+                where1.append(" and DATE_FORMAT(t.date, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
-                where.append(" and t.status ='").append(whereObject.getString("status")).append("' ");
+                where1.append(" and t.status ='").append(whereObject.getString("status")).append("' ");
             }
             if (whereObject.containsKey("agentinfo") && !"".equals(whereObject.getString("agentinfo"))) {
                 where.append(" and(");
@@ -615,6 +615,7 @@ public class dispatchItems extends Controller {
         SQLFactory sqlFactory = new SQLFactory(this, "工厂发货及退货明细(区域经理)", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_in("sa_saleareaids", arrayList);
         sqlFactory.addParameter_SQL("where", where);
+        sqlFactory.addParameter_SQL("where1", where1);
         sqlFactory.addParameter("siteid", siteid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);