svn commit: r1661323 - in /ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt: ProductionRunDeclaration.groovy ViewProductionRun.groovy

[jleroux]

Author: jleroux
Date: Sat Feb 21 11:10:06 2015
New Revision: 1661323

URL: http://svn.apache.org/r1661323
Log:
Fixes a bug introduced by r1659914 for OFBIZ-5706 & OFBIZ-5709

Thanks to Deepak's report on dev ML:

> +        manufacturer = 
> from("WorkEffortPartyAssignment").where("workEffortId", productionRunId, 
> "roleTypeId", "MANUFACTURER").queryOne();
Here we need to use filterByDate for “ WorkEffortPartyAssignment”.

Actually it was a bit more because WorkEffortPartyAssignment PK is 
      <prim-key field="workEffortId"/>
      <prim-key field="partyId"/>
      <prim-key field="roleTypeId"/>
      <prim-key field="fromDate"/>

So I have also replaced .queryOne() by .queryFirst()


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=1661323&r1=1661322&r2=1661323&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
 Sat Feb 21 11:10:06 2015
@@ -84,8 +84,8 @@ if (productionRunId) {
         productionRunData.actualCompletionDate = 
productionRun.getGenericValue().getTimestamp("actualCompletionDate");
         productionRunData.currentStatusId = 
productionRun.getGenericValue().currentStatusId;
         productionRunData.facilityId = 
productionRun.getGenericValue().facilityId;
-        
-        manufacturer = from("WorkEffortPartyAssignment").where("workEffortId", 
productionRunId, "roleTypeId", "MANUFACTURER").queryOne();
+
+        manufacturer = from("WorkEffortPartyAssignment").where("workEffortId", 
productionRunId, "roleTypeId", "MANUFACTURER").filterByDate().queryFirst();
         if (manufacturer){
             productionRunData.manufacturerId = manufacturer.partyId;
         }

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=1661323&r1=1661322&r2=1661323&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
 Sat Feb 21 11:10:06 2015
@@ -42,7 +42,7 @@ if (productionRunId) {
         productionRunData.estimatedStartDate = 
productionRun.getEstimatedStartDate();
         productionRunData.estimatedCompletionDate = 
productionRun.getEstimatedCompletionDate();
 
-        manufacturer = from("WorkEffortPartyAssignment").where("workEffortId", 
productionRunId, "roleTypeId", "MANUFACTURER").queryOne();
+               manufacturer = 
from("WorkEffortPartyAssignment").where("workEffortId", productionRunId, 
"roleTypeId", "MANUFACTURER").filterByDate().queryFirst();
         if (manufacturer){
             productionRunData.manufacturerId = manufacturer.partyId;
         }