svn commit: r577724 - in /ofbiz/trunk/applications/manufacturing: config/ webapp/manufacturing/WEB-INF/ webapp/manufacturing/WEB-INF/actions/jobshopmgt/ webapp/manufacturing/jobshopmgt/ widget/manufacturing/

jacopoc Thu, 20 Sep 2007 05:47:48 -0700

Author: jacopoc
Date: Thu Sep 20 05:47:26 2007
New Revision: 577724

URL: http://svn.apache.org/viewvc?rev=577724&view=rev
Log:
Misc improvements to the 'manage production run' screen.
Added ui to specify the location from where the each material required by the 
running task will be isued.


Modified:
    
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
    
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml

Modified: 
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?rev=577724&r1=577723&r2=577724&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties 
(original)
+++ 
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties 
Thu Sep 20 05:47:26 2007
@@ -128,6 +128,7 @@
 ManufacturingMandatoryWorkEfforts=Mandatory Production Runs
 ManufacturingManufacturingRules=Manufacturing Rules
 ManufacturingMaterials=Materials
+ManufacturingMaterialsRequiredByRunningTask=Materials Required By The Running 
Task
 ManufacturingMrp=MRP
 ManufacturingMrpJobLastExecuted=Last Job
 ManufacturingMrpJobIsRunning=An Mrp Job is Running
@@ -180,6 +181,7 @@
 ManufacturingQuickRunTask=Quick Run Task
 ManufacturingReason=Reason
 ManufacturingReturnedQuantity=Returned
+ManufacturingReturnMaterials=Return Unused Materials To Warehouse
 ManufacturingReports=Reports
 ManufacturingRouting=Routing
 ManufacturingRoutings=Routings

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh?rev=577724&r1=577723&r2=577724&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh
 Thu Sep 20 05:47:26 2007
@@ -29,6 +29,7 @@
 import org.ofbiz.widget.html.HtmlFormWrapper;
 import org.ofbiz.manufacturing.jobshopmgt.ProductionRun;
 
+import javolution.util.FastList;
 
 userLogin = request.getAttribute("userLogin");
 
@@ -191,7 +192,9 @@
 
         //  Product components list
         List productionRunComponents = 
productionRun.getProductionRunComponents();
-        List productionRunComponentsData = new LinkedList();
+        List productionRunComponentsData = FastList.newInstance();
+        List productionRunComponentsDataReadyForIssuance = 
FastList.newInstance();
+        List productionRunComponentsAlreadyIssued = FastList.newInstance();
         if (productionRunComponents != null){
             GenericValue component;
             for (Iterator iter=productionRunComponents.iterator(); 
iter.hasNext();){
@@ -203,6 +206,7 @@
                 Map componentData = component.getAllFields();
                 componentData.put("internalName", componentName);
                 componentData.put("workEffortName", workEffortName);
+                componentData.put("facilityId", 
productionRunTask.getString("facilityId"));
                 Iterator issuances = 
(delegator.findByAnd("WorkEffortAndInventoryAssign", 
UtilMisc.toMap("workEffortId", component.getString("workEffortId"), 
"productId", product.getString("productId")))).iterator();
                 double totalIssued = 0.0;
                 while (issuances.hasNext()) {
@@ -233,9 +237,17 @@
                     componentData.put("isRunning", "null");
                 }
                 productionRunComponentsData.add(componentData);
+                if (component.getString("workEffortId").equals(issueTaskId)) {
+                    
productionRunComponentsDataReadyForIssuance.add(componentData);
+                }
+                if (totalIssued > 0.0) {
+                    productionRunComponentsAlreadyIssued.add(componentData);
+                }
             }
         }
         context.put("productionRunComponentsData", 
productionRunComponentsData);
+        context.put("productionRunComponentsDataReadyForIssuance", 
productionRunComponentsDataReadyForIssuance);
+        context.put("productionRunComponentsAlreadyIssued", 
productionRunComponentsAlreadyIssued);
 
         // Fixed assets list
         List productionRunFixedAssetsData = new LinkedList();

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=577724&r1=577723&r2=577724&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
 Thu Sep 20 05:47:26 2007
@@ -648,6 +648,12 @@
         <response name="success" type="view" value="ProductionRunDeclaration"/>
         <response name="error" type="view" value="ProductionRunDeclaration"/>
     </request-map>
+    <request-map uri="issueProductionRunTaskComponents">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="issueProductionRunTaskComponent"/>
+        <response name="success" type="view" value="ProductionRunDeclaration"/>
+        <response name="error" type="view" value="ProductionRunDeclaration"/>
+    </request-map>
     <request-map uri="createProductionRunTaskProduct">
         <security https="true" auth="true"/>
         <event type="service" invoke="productionRunTaskProduce"/>

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=577724&r1=577723&r2=577724&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
 Thu Sep 20 05:47:26 2007
@@ -268,25 +268,46 @@
             <hyperlink 
target="changeProductionRunTaskStatus?workEffortId=${workEffortId}&amp;productionRunId=${workEffortParentId}"
 description="${uiLabelMap.ManufacturingCompleteProductionRunTask}" 
also-hidden="false"/>
         </field>
     </form>
-   <form name="ListProductionRunDeclComponents" type="multi" 
use-row-submit="true" 
target="productionRunTaskReturnMaterials?productionRunId=${productionRunId}" 
title="" list-name="productionRunComponentsData">
-        <field name="actionForm"><hidden value="EditProductComponent"/></field>
+    <form name="ListIssueProductionRunDeclComponents" type="multi" 
target="issueProductionRunTaskComponents?productionRunId=${productionRunId}" 
title="" list-name="productionRunComponentsDataReadyForIssuance">
         <field name="productId"><hidden/></field>
         <field name="productionRunId"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
         <field name="task" entry-name="workEffortId" 
title="${uiLabelMap.ManufacturingRoutingTaskId}">
             <display description="${workEffortName} [${workEffortId}]"/>
         </field>
         <field name="internalName" title="${uiLabelMap.ProductProductName}">
-            <display description="${productName} [${productId}]"/>
+            <display description="${productName} [${productId}]" 
also-hidden="false"/>
         </field> 
-        <field name="estimatedQuantity" 
title="${uiLabelMap.ManufacturingQuantity}"><display/></field>
-        <field name="issuedQuantity" 
title="${uiLabelMap.ManufacturingIssuedQuantity}"><display/></field>
-        <field name="returnedQuantity" 
title="${uiLabelMap.ManufacturingReturnedQuantity}"><display/></field>
+        <field name="estimatedQuantity" 
title="${uiLabelMap.ManufacturingQuantity}"><display 
also-hidden="false"/></field>
+        <field name="issuedQuantity" 
title="${uiLabelMap.ManufacturingIssuedQuantity}"><display 
also-hidden="false"/></field>
+        <field name="locationSeqId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ProductFacilityLocation" 
description="${locationSeqId}">
+                    <entity-constraint name="productId" env-name="productId"/>
+                    <entity-constraint name="facilityId" 
env-name="facilityId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" 
title="${uiLabelMap.CommonSubmit}"><submit/></field>
+    </form>
+    <form name="ListReturnProductionRunDeclComponents" type="multi" 
use-row-submit="true" 
target="productionRunTaskReturnMaterials?productionRunId=${productionRunId}" 
title="" list-name="productionRunComponentsAlreadyIssued">
+        <field name="productId"><hidden/></field>
+        <field name="productionRunId"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="task" entry-name="workEffortId" 
title="${uiLabelMap.ManufacturingRoutingTaskId}">
+            <display description="${workEffortName} [${workEffortId}]"/>
+        </field>
+        <field name="internalName" title="${uiLabelMap.ProductProductName}">
+            <display description="${productName} [${productId}]" 
also-hidden="false"/>
+        </field> 
+        <field name="estimatedQuantity" 
title="${uiLabelMap.ManufacturingQuantity}"><display 
also-hidden="false"/></field>
+        <field name="issuedQuantity" 
title="${uiLabelMap.ManufacturingIssuedQuantity}"><display 
also-hidden="false"/></field>
+        <field name="returnedQuantity" 
title="${uiLabelMap.ManufacturingReturnedQuantity}"><display 
also-hidden="false"/></field>
         <field name="quantity" 
title="${uiLabelMap.CommonQuantity}"><text/></field>
         <field name="_rowSubmit" 
title="${uiLabelMap.CommonSelected}"><check/></field>
         <field name="submitButton" 
title="${uiLabelMap.CommonSubmit}"><submit/></field>
-        <!--<field name="quantity" 
use-when="&quot;PRUN_RUNNING&quot;.equals(&quot;${currentStatusId}&quot;)" 
title="${uiLabelMap.CommonQuantity}"><text/></field>
-        <field name="quantity2" 
use-when="&quot;PRUN_CREATED&quot;.equals(&quot;${currentStatusId}&quot;)" 
title="${uiLabelMap.CommonQuantity}"><display/></field>-->
     </form>
     
      <form name="EditProductionRunDeclRoutingTask" type="single" 
target="updateProductionRunTask" title="" default-map-name="routingTaskData">

Modified: 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=577724&r1=577723&r2=577724&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml 
(original)
+++ 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml 
Thu Sep 20 05:47:26 2007
@@ -197,9 +197,13 @@
                             <html><html-template 
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl"/></html>
                         </platform-specific>
                         <container>
-                            <label 
style="head2">${uiLabelMap.ManufacturingMaterials}</label>
+                            <label 
style="head2">${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}</label>
                         </container>
-                        <include-form name="ListProductionRunDeclComponents" 
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+                        <include-form 
name="ListIssueProductionRunDeclComponents" 
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
+                        <container>
+                            <label 
style="head2">${uiLabelMap.ManufacturingReturnMaterials}</label>
+                        </container>
+                        <include-form 
name="ListReturnProductionRunDeclComponents" 
location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
                         <container>
                             <label 
style="head2">${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}</label>
                         </container>

svn commit: r577724 - in /ofbiz/trunk/applications/manufacturing: config/ webapp/manufacturing/WEB-INF/ webapp/manufacturing/WEB-INF/actions/jobshopmgt/ webapp/manufacturing/jobshopmgt/ widget/manufacturing/

Reply via email to