midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2562 BOM Drop does not show items in correct position / IDEMPIERE-2551 BOM Drop Form: wrong sorting / IDEMPIERE-2546 BOM Drop Form does not show big Structures (Scrolling not enabled)

This commit is contained in:
hriess 2015-04-13 19:14:20 -05:00
parent 9ac075d5be
commit 9cd68b58a6
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java
View File

@ -413,6 +413,7 @@ public class WBOMDrop extends ADForm implements EventListener<Event>
this.appendChild(confirmPanel); this.appendChild(confirmPanel);
this.appendChild(new Separator()); this.appendChild(new Separator());
this.setBorder("normal"); this.setBorder("normal");
this.setContentStyle("overflow: auto");
Caption title = new Caption(Msg.getMsg(Env.getCtx(), "SelectProduct")); Caption title = new Caption(Msg.getMsg(Env.getCtx(), "SelectProduct"));
@ -467,6 +468,17 @@ public class WBOMDrop extends ADForm implements EventListener<Event>
} }
}); });
// 2nd sort by Line Number in order to correspond with BOM Structure, patch 2015-03-31
Arrays.sort(bomLines, new Comparator<MProductBOM>() {
@Override
public int compare(MProductBOM arg0, MProductBOM arg1) {
String t1 = String.valueOf(arg0.getLine()+100000);
String t2 = String.valueOf(arg1.getLine()+100000);
return t1.compareTo(t2);
}
});
for (int i = 0; i < bomLines.length; i++) for (int i = 0; i < bomLines.length; i++)
{ {
addBOMLine (bomLines[i], qty, parentPanel, bomLevel); addBOMLine (bomLines[i], qty, parentPanel, bomLevel);
@ -592,7 +604,8 @@ public class WBOMDrop extends ADForm implements EventListener<Event>
if (MProductBOM.BOMTYPE_StandardPart.equals(bomType) || MProductBOM.BOMTYPE_OptionalPart.equals(bomType)) { if (MProductBOM.BOMTYPE_StandardPart.equals(bomType) || MProductBOM.BOMTYPE_OptionalPart.equals(bomType)) {
outerContainer.appendChild(outerProductPanel); outerContainer.appendChild(outerProductPanel);
} else { } else {
String groupName = String.valueOf(parentM_Product_ID) + "_" + bomType; // String groupName = String.valueOf(parentM_Product_ID) + "_" + bomType;
String groupName = String.valueOf(parentM_Product_ID) + "_" + bomType + "_" + parentPanel.toString();
Radiogroup group = m_buttonGroups.get(groupName); Radiogroup group = m_buttonGroups.get(groupName);
if (group == null) { if (group == null) {