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

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

@@ -589,6 +589,18 @@ public class dispatchItems extends Controller {
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and t.status ='").append(whereObject.getString("status")).append("' ");
             }
+            if (whereObject.containsKey("agentinfo") && !"".equals(whereObject.getString("agentinfo"))) {
+                where.append(" and(");
+                where.append("t7.agentnum like'%").append(whereObject.getString("agentinfo")).append("%' ");
+                where.append("or t9.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(")");
+            }
         }
         boolean isExport = content.getBooleanValue("isExport");