发货单列表查询添加根据发货品号和订单查询

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

@@ -212,6 +212,14 @@ public class dispatch extends Controller {
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
                 where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
             }
+            if (whereObject.containsKey("param") && !"".equals(whereObject.getString("param"))) {
+               Rows rowsDispatchid = dbConnect.runSqlQuery("select t1.sa_dispatchid from sa_dispatch_items t1 left join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid " +
+                       "left join sa_order t3 on t2.sa_orderid=t3.sa_orderid and t2.siteid=t3.siteid left join plm_item t4 on t1.itemid=t4.itemid and t1.siteid=t4.siteid where t1.siteid='"+siteid+"' and (t4.itemno like '%"+whereObject.getString("param")+"%' or t3.sonum='"+whereObject.getString("param")+"')");
+                String str = rowsDispatchid.toJsonArray("sa_dispatchid").toJSONString();
+                str = str.replace("[", "(").replace("]", ")");
+                where.append(" and t1.sa_dispatchid  in" ).append(str);
+
+            }
         }
         SQLFactory sqlFactory = new SQLFactory(this, "发货单列表查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter("siteid", siteid);