svn commit: r729199 - in /ofbiz/trunk/applications/manufacturing: src/org/ofbiz/manufacturing/bom/BOMNode.java webapp/manufacturing/bom/BomSimulation.ftl

[hansbak-2]

Author: hansbak
Date: Tue Dec 23 18:45:25 2008
New Revision: 729199

URL: http://svn.apache.org/viewvc?rev=729199&view=rev
Log:
sort bom simulation by productId if no sequence number provided, indent the productId in the listing too

Modified:
    ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl

Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=729199&r1=729198&r2=729199&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Tue Dec 23 18:45:25 2008
@@ -98,7 +98,7 @@
         List rows = delegator.findByAnd("ProductAssoc",
                                             UtilMisc.toMap("productId", product.get("productId"),
                                                        "productAssocTypeId", partBomTypeId),
-                                            UtilMisc.toList("sequenceNum"));
+                                            UtilMisc.toList("sequenceNum","productIdTo ASC"));
         rows = EntityUtil.filterByDate(rows, inDate);
         if ((UtilValidate.isEmpty(rows)) && substitutedNode != null) {
             // If no child is found and this is a substituted node

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?rev=729199&r1=729198&r2=729199&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Tue Dec 23 18:45:25 2008
@@ -44,7 +44,7 @@
         <tr class="header-row">
           <td width="10%">${uiLabelMap.ManufacturingProductLevel}</td>
           <td width="20%">${uiLabelMap.ProductProductId}</td>
-          <td width="10%">&nbsp;</td>
+          <td width="10%">${uiLabelMap.ManufacturingProductVirtual}</td>
           <td width="40%">${uiLabelMap.ProductProductName}</td>
           <td width="10%" align="right">${uiLabelMap.CommonQuantity}</td>
           <td width="10%" align="right">&nbsp;</td>
@@ -63,10 +63,21 @@
               </tr>
               </table>
               </td>
-              <td>${node.product.productId}</td>
+              <td>
+              <table cellspacing="1">
+              <tr>
+              <#list 0..(node.depth) as level>
+              <td>&nbsp;&nbsp;</td>
+              </#list>
+              <td>
+                ${node.product.productId}
+              </td>
+              </tr>
+              </table>
+              </td>
               <td>
                 <#if node.product.isVirtual?default("N") == "Y">
-                    ${uiLabelMap.ManufacturingProductVirtualVirtual}
+                    ${node.product.isVirtual}
                 </#if>
                 ${(node.ruleApplied.ruleId)?if_exists}
               </td>