|
@@ -479,7 +479,7 @@ public class itemgroup extends Controller {
|
|
|
}
|
|
|
}
|
|
|
factory.addParameter_SQL("where1", where1);
|
|
|
- Rows customschemeItems = dbConnect.runSqlQuery("select distinct value,description 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 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") + ")");
|
|
|
if (!customschemeItems.isEmpty()) {
|
|
|
for (Row row : customschemeItems) {
|
|
|
|
|
@@ -971,6 +971,7 @@ public class itemgroup extends Controller {
|
|
|
sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
|
|
|
Rows itemrows = dbConnect.runSqlQuery(sqlFactory.getSQL());
|
|
|
for (Row row : itemrows) {
|
|
|
+ row.put("customschemeItems",customschemeItems);
|
|
|
ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, row.getLong("itemid"));
|
|
|
row.put("oldprice", itemPrice.getPrice());
|
|
|
if (sys_enterpriseid > 0 || (usertype == 21 || usertype == 22)) {
|