Selaa lähdekoodia

经销商端与(小程序)通用搜索需要支持如下字段

hu 2 vuotta sitten
vanhempi
commit
db3f97d7c3

+ 4 - 2
src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -937,8 +937,10 @@ public class cashbill extends Controller {
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
-                where = where + " and (t1.billno like '%" + whereObject.getString("condition") + "%') ";
-
+                where = where + " and(t1.class like '%" + whereObject.getString("condition")
+                        + "%' or t1.subclass like '%" + whereObject.getString("condition")
+                        + "%' or t1.billno like '%" + whereObject.getString("condition")
+                        + "%' or t1.remarks like '%" + whereObject.getString("condition") + "%')";
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
                 where = where + " and DATE_FORMAT(t1.checkdate,'%Y-%m-%d') >=DATE_FORMAT('" + whereObject.getString("begindate") + "','%Y-%m-%d')";

+ 3 - 0
src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -112,6 +112,9 @@ public class itemgroup extends Controller {
                         + "%' or t1.groupnum like'%" + whereObject.getString("condition")
                         + "%' or exists(select 1 from sa_itemgroupmx s1 left join plm_item s2 on s1.itemid=s2.itemid and  s1.siteid=s2.siteid where (s2.itemname like '%"
                         + whereObject.getString("condition") + "%' or s2.itemno like '%" + whereObject.getString("condition")
+                        + "%' or s2.standards like '%" + whereObject.getString("condition")
+                        + "%' or s2.spec like '%" + whereObject.getString("condition")
+                        + "%' or s2.model like '%" + whereObject.getString("condition")
                         + "%') and s1.sa_itemgroupid=t1.sa_itemgroupid) ) ";
             }
             if (whereObject.containsKey("tradefield") && !"".equals(whereObject.getString("tradefield"))) {

+ 1 - 0
src/custom/restcontroller/sale/order/Order.java

@@ -30,6 +30,7 @@ public class Order extends Controller {
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
                 where.append(" and(");
                 where.append("t1.sonum like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t4.name like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t1.remarks like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }

+ 1 - 0
src/custom/restcontroller/webmanage/sale/dispatch/dispatchItems.java

@@ -481,6 +481,7 @@ public class dispatchItems extends Controller {
                 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(")");
             }
             if (whereObject.containsKey("type") && !"".equals(whereObject.getString("type"))) {

+ 2 - 0
src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -473,6 +473,7 @@ public class OrderItems extends Controller {
                 where.append("or t1.itemname like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t1.model like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t3.spec like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.remarks like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
         }
@@ -606,6 +607,7 @@ public class OrderItems extends Controller {
                 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 t1.remarks like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
             if (whereObject.containsKey("iteminfo") && !"".equals(whereObject.getString("iteminfo"))) {