Author: jacopoc
Date: Thu Jun 10 06:59:22 2010
New Revision: 953228
URL: http://svn.apache.org/viewvc?rev=953228&view=rev
Log:
Removed code that is not needed after my last commit (refactoring of
dependent/mandatory pruns diplayed in the overview page)
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=953228&r1=953227&r2=953228&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
Thu Jun 10 06:59:22 2010
@@ -41,17 +41,6 @@ if (productionRunId) {
context.orderItems = orderItems;
}
- // Find all the work efforts that must be completed before this one.
- mandatoryWorkEfforts =
EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", [workEffortIdTo
: productionRunId, workEffortAssocTypeId : "WORK_EFF_PRECEDENCY"]));
- if (mandatoryWorkEfforts) {
- context.mandatoryWorkEfforts = mandatoryWorkEfforts;
- }
- // Find all the work efforts that can start after this one.
- dependentWorkEfforts =
EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc",
[workEffortIdFrom : productionRunId, workEffortAssocTypeId :
"WORK_EFF_PRECEDENCY"]));
- if (dependentWorkEfforts) {
- context.dependentWorkEfforts = dependentWorkEfforts;
- }
-
quantityToProduce =
productionRun.getGenericValue().get("quantityToProduce") ?: 0.0;
// Find the inventory items produced
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy?rev=953228&r1=953227&r2=953228&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy
Thu Jun 10 06:59:22 2010
@@ -48,16 +48,6 @@ if (productionRunId) {
if (orderItems) {
context.orderItems = orderItems;
}
- // Find all the work efforts that must be completed before this one.
- mandatoryWorkEfforts =
EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", [workEffortIdTo
: productionRunId, workEffortAssocTypeId : "WORK_EFF_PRECEDENCY"]));
- if (mandatoryWorkEfforts) {
- context.mandatoryWorkEfforts = mandatoryWorkEfforts;
- }
- // Find all the work efforts that can start after this one.
- dependentWorkEfforts =
EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc",
[workEffortIdFrom : productionRunId, workEffortAssocTypeId :
"WORK_EFF_PRECEDENCY"]));
- if (dependentWorkEfforts) {
- context.dependentWorkEfforts = dependentWorkEfforts;
- }
// RoutingTasks list
context.productionRunRoutingTasks =
productionRun.getProductionRunRoutingTasks();
context.quantity = productionRun.getQuantity(); // this is useful to
compute the total estimates runtime in the form