订单明细查询（总部）和发货单明细查询（总部） 增加经销商和商品查询

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

@@ -280,10 +280,18 @@ public class dispatchItems extends Controller {
                 where.append(" and(");
                 where.append(" t4.billno like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t8.sonum like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t2.itemno like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t2.itemname like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or  t9.agentnum like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t10.enterprisename like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("agentinfo") && !"".equals(whereObject.getString("agentinfo"))) {
+                where.append(" and(");
+                where.append("t9.agentnum like'%").append(whereObject.getString("agentinfo")).append("%' ");
+                where.append("or t10.enterprisename like'%").append(whereObject.getString("agentinfo")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("iteminfo") && !"".equals(whereObject.getString("iteminfo"))) {
+                where.append(" and(");
+                where.append("t2.itemno like'%").append(whereObject.getString("iteminfo")).append("%' ");
+                where.append("or t2.itemname like'%").append(whereObject.getString("iteminfo")).append("%' ");
                 where.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {

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

@@ -538,11 +538,19 @@ public class OrderItems extends Controller {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
                 where.append(" and(");
-                where.append("t1.itemno like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t1.itemname like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t6.agentnum like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t7.enterprisename like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t5.sonum like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(" t5.sonum like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("iteminfo") && !"".equals(whereObject.getString("iteminfo"))) {
+                where.append(" and(");
+                where.append("t1.itemno like'%").append(whereObject.getString("iteminfo")).append("%' ");
+                where.append("or t1.itemname like'%").append(whereObject.getString("iteminfo")).append("%' ");
+                where.append(")");
+            }
+            if (whereObject.containsKey("agentinfo") && !"".equals(whereObject.getString("agentinfo"))) {
+                where.append(" and(");
+                where.append("t6.agentnum like'%").append(whereObject.getString("agentinfo")).append("%' ");
+                where.append("or t7.enterprisename like'%").append(whereObject.getString("agentinfo")).append("%' ");
                 where.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {