发货商品列表添加时间筛选,订单状态筛选bug修复，发货单列表子查询添加商品名称

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

@@ -217,7 +217,7 @@ public class dispatch extends Controller {
             }
             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")+"')");
+                       "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.itemname like '%"+whereObject.getString("param")+"%' or t4.itemno like '%"+whereObject.getString("param")+"%' or t3.sonum='"+whereObject.getString("param")+"')");
 
                if(rowsDispatchid.toJsonArray("sa_dispatchid").isEmpty()){
                    where.append(" and t1.sa_dispatchid in (0)");

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

@@ -88,6 +88,12 @@ public class dispatchItems extends Controller {
             if (whereObject.containsKey("sa_orderid") && !"".equals(whereObject.getString("sa_orderid"))) {
                 where.append("  and t1.sa_orderid ='").append(whereObject.getString("sa_orderid")).append("' ");
             }
+            if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
+                where.append(" and t3.checkdate >='").append(whereObject.getString("begindate")).append("' ");
+            }
+            if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
+                where.append(" and t3.checkdate <='").append(whereObject.getString("enddate")).append("' ");
+            }
         }
         SQLFactory sqlFactory = new SQLFactory(this, "发货商品列表查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);

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

@@ -511,7 +511,7 @@ public class Order extends Controller {
             //状态
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and(");
-                where.append("t1.status like'%").append(whereObject.getString("status")).append("%' ");
+                where.append("t1.status ='").append(whereObject.getString("status")).append("' ");
                 where.append(")");
             }
             if (whereObject.containsKey("type") && !"".equals(whereObject.getString("type"))) {