Преглед на файлове

申请试用明细列表bug修复

wu преди 1 месец
родител
ревизия
38c323c01c
променени са 1 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 4 2
      src/custom/restcontroller/prsx/trial/trialitems.java

+ 4 - 2
src/custom/restcontroller/prsx/trial/trialitems.java

@@ -162,6 +162,8 @@ public class trialitems extends Controller {
                 where.append("or t2.itemname like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.model like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.spec like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t2.explains like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t2.assistance like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
         }
@@ -169,8 +171,8 @@ public class trialitems extends Controller {
 
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_trialitems",
-                "*");
-        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid = t1.itemid and t3.siteid = t1.siteid and t3.isshow=1",
+                "*").setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t2.itemid = t1.itemid and t2.siteid = t1.siteid and t2.isshow=1",
                 "orderminqty_auxunit", "orderminqty", "orderaddqty_auxunit", "orderaddqty", "assistance", "goodstype", "explains","model","spec","marketprice","itemname","itemno");
         querySQL.addJoinTable(JOINTYPE.left, "plm_itemextend", "t4", "t4.itemid = t1.itemid and t4.siteid = t1.siteid",
                 "erpitemname", "erpitemno");