|
@@ -479,7 +479,7 @@ public class itemgroup extends Controller {
|
|
|
}
|
|
|
}
|
|
|
factory.addParameter_SQL("where1", where1);
|
|
|
- Rows customschemeItems = dbConnect.runSqlQuery("select distinct value,description,isonlydisplay from sa_customscheme_items where sa_customschemeid in(select t2.sa_customschemeid from sa_itemgroupmx t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.siteid='" + siteid + "' and t1.sa_itemgroupid=" + content.getString("sa_itemgroupid") + ")");
|
|
|
+ Rows customschemeItems = dbConnect.runSqlQuery("select * from (select distinct value,description,isonlydisplay,sequence from sa_customscheme_items where sa_customschemeid in(select t2.sa_customschemeid from sa_itemgroupmx t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.siteid='" + siteid + "' and t1.sa_itemgroupid=" + content.getString("sa_itemgroupid") + "))t order by t.sequence asc");
|
|
|
if (!customschemeItems.isEmpty()) {
|
|
|
for (Row row : customschemeItems) {
|
|
|
|
|
@@ -1079,6 +1079,7 @@ public class itemgroup extends Controller {
|
|
|
row.put("brand", brandRowsMap.get(row.getString("itemid")));
|
|
|
}
|
|
|
JSONObject oject = new JSONObject();
|
|
|
+ oject.put("customschemeItems", customschemeItems);
|
|
|
oject.put("colorRows", colorList);
|
|
|
oject.put("specRows", specList);
|
|
|
oject.put("materialRows", materialList);
|