You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/08/26 19:36:42 UTC
svn commit: r1806323 - in
/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts: bom/
jobshopmgt/ mrp/ reports/ routing/
Author: deepak
Date: Sat Aug 26 19:36:42 2017
New Revision: 1806323
URL: http://svn.apache.org/viewvc?rev=1806323&view=rev
Log:
Manufacturing : Remove unused imports from groovy files for code optimization.
Applied slightly modified patch from jira issue (OFBIZ-9510)
Thanks Suraj Khurana and Pradeep Choudhary for your contribution.
Modified:
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunContent.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunCosts.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ViewProductionRun.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsComponentsByFeature.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsInfoAndOrder.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsProductsStacks.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PackageContentsAndOrder.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/ShipmentPlanStockReport.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionDay.groovy
ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionWeek.groovy
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy Sat Aug 26 19:36:42 2017
@@ -17,8 +17,9 @@
* under the License.
*/
-import org.apache.ofbiz.entity.util.*
-import org.apache.ofbiz.entity.condition.*
+import org.apache.ofbiz.entity.util.EntityQuery
+import org.apache.ofbiz.entity.condition.EntityCondition
+import org.apache.ofbiz.entity.condition.EntityOperator
condList = []
if (parameters.productId) {
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunContent.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunContent.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunContent.groovy Sat Aug 26 19:36:42 2017
@@ -18,7 +18,6 @@
*/
import org.apache.ofbiz.content.content.ContentWorker
-import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.entity.GenericValue
productionRunId = parameters.productionRunId ?: parameters.workEffortId
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunCosts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunCosts.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunCosts.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunCosts.groovy Sat Aug 26 19:36:42 2017
@@ -17,8 +17,6 @@
* under the License.
*/
-import org.apache.ofbiz.entity.util.EntityUtil
-
productionRunId = parameters.productionRunId ?: parameters.workEffortId
taskInfoList = []
tasks = from("WorkEffort").where("workEffortParentId", productionRunId, "workEffortTypeId", "PROD_ORDER_TASK").orderBy("workEffortId").queryList()
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy Sat Aug 26 19:36:42 2017
@@ -19,13 +19,9 @@
// The only required parameter is "productionRunId".
-import java.util.*
-import org.apache.ofbiz.entity.*
-import org.apache.ofbiz.entity.util.EntityUtil
-import org.apache.ofbiz.base.util.*
-import org.apache.ofbiz.base.util.Debug
+import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.base.util.UtilValidate
-import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
delegator = request.getAttribute("delegator")
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ViewProductionRun.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ViewProductionRun.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ViewProductionRun.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ViewProductionRun.groovy Sat Aug 26 19:36:42 2017
@@ -20,7 +20,6 @@
// The only required parameter is "productionRunId".
// The "actionForm" parameter triggers actions (see "ProductionRunSimpleEvents.xml").
-import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
productionRunId = parameters.productionRunId
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy Sat Aug 26 19:36:42 2017
@@ -20,7 +20,6 @@
import org.apache.ofbiz.base.util.ObjectType
import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.entity.condition.EntityCondition
-import org.apache.ofbiz.entity.util.EntityUtilProperties
productId = parameters.productId
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy Sat Aug 26 19:36:42 2017
@@ -18,7 +18,7 @@
*/
import java.awt.Dimension
-import org.apache.ofbiz.entity.util.*
+import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRunHelper
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsComponentsByFeature.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsComponentsByFeature.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsComponentsByFeature.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsComponentsByFeature.groovy Sat Aug 26 19:36:42 2017
@@ -20,8 +20,6 @@
// PRunsComponentsByFeature
// ReportF
-import org.apache.ofbiz.entity.util.EntityUtil
-import org.apache.ofbiz.product.category.CategoryWorker
if (productCategoryIdPar) {
category = from("ProductCategory").where("productCategoryId", productCategoryIdPar).queryOne()
@@ -33,7 +31,6 @@ if (productFeatureTypeIdPar) {
}
allProductionRuns = from("WorkEffortAndGoods").where("workEffortName", planName).orderBy("productId").queryList()
-productionRuns = []
features = [:] // each entry is a productFeatureId|{productFeature,products}
products = [:] // each entry is a productId|{product,quantity}
if (!productFeatureTypeIdPar) {
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsInfoAndOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsInfoAndOrder.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsInfoAndOrder.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsInfoAndOrder.groovy Sat Aug 26 19:36:42 2017
@@ -20,7 +20,6 @@
// PRunsInfoAndOrder
// ReportG
-import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRunHelper
import org.apache.ofbiz.order.order.OrderReadHelper
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsProductsStacks.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsProductsStacks.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsProductsStacks.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PRunsProductsStacks.groovy Sat Aug 26 19:36:42 2017
@@ -20,7 +20,6 @@
// PRunsProductsStacks
// ReportC
-import org.apache.ofbiz.entity.util.EntityUtil
if (productCategoryIdPar) {
category = from("ProductCategory").where("productCategoryId", productCategoryIdPar).queryOne()
@@ -33,8 +32,6 @@ if (productFeatureTypeIdPar) {
allProductionRuns = from("WorkEffortAndGoods").where("workEffortName", planName).orderBy("productId").queryList()
productionRuns = []
-features = [:]
-products = [:]
if (allProductionRuns) {
allProductionRuns.each { productionRun ->
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PackageContentsAndOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PackageContentsAndOrder.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PackageContentsAndOrder.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/PackageContentsAndOrder.groovy Sat Aug 26 19:36:42 2017
@@ -20,7 +20,6 @@
// PackageContentsAndOrder
// ReportB
-import org.apache.ofbiz.entity.util.EntityUtil
import org.apache.ofbiz.order.order.OrderReadHelper
import org.apache.ofbiz.order.order.OrderContentWrapper
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/ShipmentPlanStockReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/ShipmentPlanStockReport.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/ShipmentPlanStockReport.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/ShipmentPlanStockReport.groovy Sat Aug 26 19:36:42 2017
@@ -17,8 +17,6 @@
* under the License.
*/
-import org.apache.ofbiz.entity.*
-import org.apache.ofbiz.base.util.*
inventoryStock = [:]
shipmentId = parameters.shipmentId
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionDay.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionDay.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionDay.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionDay.groovy Sat Aug 26 19:36:42 2017
@@ -18,9 +18,7 @@
*/
-import java.util.*
-import org.apache.ofbiz.base.util.*
-import org.apache.ofbiz.entity.*
+import org.apache.ofbiz.base.util.ObjectType
if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) {
context.hasPermission = Boolean.TRUE
@@ -28,7 +26,6 @@ if (security.hasEntityPermission("MANUFA
context.hasPermission = Boolean.FALSE
}
techDataCalendar = [:]
-calendarExceptionDays = []
calendarId = parameters.calendarId ?: request.getAttribute("calendarId")
if (calendarId) {
Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionWeek.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionWeek.groovy?rev=1806323&r1=1806322&r2=1806323&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionWeek.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionWeek.groovy Sat Aug 26 19:36:42 2017
@@ -18,7 +18,7 @@
*/
-import org.apache.ofbiz.base.util.*
+import org.apache.ofbiz.base.util.ObjectType
if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) {
context.hasPermission = Boolean.TRUE