svn commit: r451270 - in /incubator/ofbiz/trunk/applica
Locked
svn commit: r451270 - in /incubator/ofbiz/trunk/applica
 
|
Author: jacopoc
Date: Fri Sep 29 05:52:17 2006 New Revision: 451270 URL: http://svn.apache.org/viewvc?view=rev&rev=451270 Log: Conversion of all the manufacturing reports from JasperReports to Screen Fop; plus some misc bu fixes. Really thanks to Marco Risaliti for this great contribution (OFBIZ-338). Added: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.bsh (with props) incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh (with props) incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh (with props) incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (with props) incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl (with props) incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl (with props) Removed: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShipmentLabel.xml incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShipmentLabelPrepare.bsh incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShipmentPlanStockReport.xml incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShipmentPlanStockReportPrepare.bsh incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShipmentWorkEffortTasks.xml incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShipmentWorkEffortTasksPrepare.bsh Modified: incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels_it.properties incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Modified: incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels_it.properties?view=diff&rev=451270&r1=451269&r2=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels_it.properties Fri Sep 29 05:52:17 2006 @@ -26,10 +26,10 @@ ProductShipmentPlan=Piano di Spedizione ProductProductCategory=Categoria CommonPrintoutDate=Data Emissione -FacilityEstimatedShipDate=Data di Completamento +FacilityEstimatedShipDate=Data Spedizione Stimata CommonLine=n.riga CommonPage=pag. n. -estimatedCompletionDate=Data consegna +estimatedCompletionDate=Data Completamenteo Stimata WorkEffortName=Piano di produzione CommonLabelNumber=Numero etichetta PickingListFx=Richiesta per Rilascio Modified: incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?view=diff&rev=451270&r1=451269&r2=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties (original) +++ incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties Fri Sep 29 05:52:17 2006 @@ -55,6 +55,7 @@ ManufacturingCreateMachineGroup=Create a Fixed Asset group ManufacturingCreateProductionRun=Create a Production Run ManufacturingCuttingList=Cutting List +ManufacturingCuttingListReport=Cutting List Report ManufacturingDeliveryDate=Delivery date ManufacturingDependentWorkEfforts=Dependent Production Runs ManufacturingEditCalendarExceptionDayFor=Edit Calendar Exception day for @@ -125,6 +126,8 @@ ManufacturingNoDataAvailable=No Data Available. ManufacturingNoMachineGroupFound=No Fixed Asset group found ManufacturingNoProductionRunSelected=No ProductionRun Selected +ManufacturingPackageLabelsReport=Package Labels Report +ManufacturingPrintProductionRun=Manufacturing Print Production Run ManufacturingProductLevel=Product Level ManufacturingProductAssocNotExist=ProductAssoc does not exist ManufacturingProductComponents=Components of this Product @@ -134,6 +137,7 @@ ManufacturingProductHasNoBom=Product has no Bill of material ManufacturingProductionRun=Production Run ManufacturingProductionRunAssocs=Assocs +ManufacturingProductionRunCosts=Production Run Costs ManufacturingProductionRunCreated=ProductionRun ${productionRunId} created ManufacturingProductionRunDeclaration=Production Run Declaration ManufacturingProductionRunId=Production Run ID @@ -151,6 +155,7 @@ ManufacturingProposedOrder=Proposed Order ManufacturingQuantity=Quantity ManufacturingQuantityMinimum=Quantity Minimum +ManufacturingQuantityRemaining=Quantity Remaining ManufacturingQuickRunAllTasks=Quick Run All Tasks ManufacturingQuickRunTask=Quick Run Task ManufacturingReason=Reason @@ -173,6 +178,7 @@ ManufacturingRunMrp=Run MRP ManufacturingScrapFactor=Scrap Factor % ManufacturingShipmentPlans=Shipment Plans +ManufacturingShipmentPlanStockReport=Shipment Plan Stock Report ManufacturingStartDate=Start Date ManufacturingStartTime=Start Time ManufacturingSummarizedPartBreakdown=Summarized Breakdown @@ -181,6 +187,7 @@ ManufacturingTaskId=Task ID ManufacturingTaskName=Routing Task Name ManufacturingTaskPurpose=Task Type +ManufacturingTasksReport=Tasks Report ManufacturingTechData=Tech. Data ManufacturingTechDataCalendarNotExist=TechDataCalendar does not exist ManufacturingTechDataCalendarWeekNotExist=TechDataCalendarWeek does not exist @@ -241,8 +248,10 @@ PageTitleEditCalendarExceptionDay=Edit Calendar Exception Day PageTitleEditCalendarExceptionWeek=Edit Calendar Exception Week PageTitleEditCalendarWeek=Edit Week +PageTitleEditCostCalcs=Edit Cost Calcs PageTitleEditMachine=Edit Fixed Assets PageTitleEditMachineGroup=Edit Fixed Asset Group +PageTitleEditProductBom=Edit Product Bom PageTitleEditProductManufacturingRules=Product Manufacturing Rules PageTitleEditRouting=Edit Routing PageTitleEditRoutingProductLink=Edit Routing-Product Link Modified: incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties?view=diff&rev=451270&r1=451269&r2=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties Fri Sep 29 05:52:17 2006 @@ -19,7 +19,7 @@ # ManufacturingActualCosts=Costi Attuali ManufacturingAddExistingRoutingTask=Aggiungi una Operazione esistente -ManufacturingAddProductionRunProductComponent=Aggiungi Componente Prodotto ad un Ciclo Produzione +ManufacturingAddProductionRunProductComponent=Aggiungi Componente Prodotto ad un\u00b4Ordine di Produzione ManufacturingAddRoutingTask=Aggiungi una Operazione ManufacturingAnyMachineGroup=Qualsiasi Gruppo Macchina ManufacturingATPDate=Data ATP @@ -55,8 +55,9 @@ ManufacturingCreateMachineGroup=Creare un gruppo Macchine ManufacturingCreateProductionRun=Creare un Ordine di Produzione ManufacturingCuttingList=Lista di Montaggio +ManufacturingCuttingListReport=Stampa Lista di Montaggio ManufacturingDeliveryDate=Data Consegna -ManufacturingDependentWorkEfforts=Dipendenza Ciclo Produzione +ManufacturingDependentWorkEfforts=Dipendenza Ordine di Produzione ManufacturingEditCalendarExceptionDayFor=Aggiorna Calendario giorni speciali per ManufacturingEditCalendarExceptionWeekFor=Aggiorna Calendario settimane speciali per ManufacturingEditCalendarWeek=Aggiorna Settimana @@ -93,11 +94,11 @@ ManufacturingInventoryEventPlannedNotUpdate=InventoryEventPlanned non pu\u00f2 essere aggiornato ManufacturingInventoryEventTypeNotExist=Tipo Inventario Evento non esiste ManufacturingInventoryItemNotExis=Riga tabella Inventario non esiste -ManufacturingJobShop=Ciclo Produzione +ManufacturingJobShop=Ordine di Produzione ManufacturingListCalendarWeek=Lista delle settimane ManufacturingListingBomError=Errore durante la lista delle Distinte Base -ManufacturingListOfProductionRunComponents=Lista dei Componenti del Ciclo di Produzione -ManufacturingListOfProductionRunRoutingTasks=Lista delle Operazioni del Ciclo di Produzione +ManufacturingListOfProductionRunComponents=Lista dei Componenti del Ordine di Produzione +ManufacturingListOfProductionRunRoutingTasks=Lista delle Operazioni del Ordine di Produzione ManufacturingListProducts=Prodotti Consegnabili ManufacturingListRoutings=Lista Cicli ManufacturingMachineGroupIdAlreadyExist=Codice Gruppo Macchine non esiste @@ -124,7 +125,9 @@ ManufacturingNoCalendarFound=Nessun calendario trovato ManufacturingNoDataAvailable=Nessun Dato Disponibile. ManufacturingNoMachineGroupFound=Nessun Gruppo Macchine trovato -ManufacturingNoProductionRunSelected=Nessun Ciclo Produzione Selezionato +ManufacturingNoProductionRunSelected=Nessun Ordine di Produzione Selezionato +ManufacturingPackageLabelsReport=Stampa Etichette Pacco +ManufacturingPrintProductionRun=Stampa Ordine di Produzione ManufacturingProductLevel=Livello Prodotto ManufacturingProductAssocNotExist=Associazione Prodotto inesistente ManufacturingProductComponents=Componenti di questo Prodotto @@ -132,17 +135,18 @@ ManufacturingProductFacilityTableNotExist=Tabella Stabilimenti non esiste ManufacturingProductTableNotExist=La tabella prodotti non esiste ManufacturingProductHasNoBom=Prodotto non ha Distinta Base -ManufacturingProductionRun=Ciclo Produzione +ManufacturingProductionRun=Ordine di Produzione ManufacturingProductionRunAssocs=Associazioni -ManufacturingProductionRunCreated=Ciclo Produzione ${productionRunId} creata -ManufacturingProductionRunDeclaration=Dichiarazione Ciclo Produzione -ManufacturingProductionRunId=Codice Ciclo Produzione -ManufacturingProductionRunName=Nome Ciclo Produzione -ManufacturingProductionRunNotUpdated=Aggiornamento Ciclo Produzione fallito, vedere il log per maggiori informazioni -ManufacturingProductionRunProductComponent=Ciclo Produzione Prodotti Componenti -ManufacturingProductionRunQuantityMissing=Ciclo Produzione Quantit\u00e0 \u00e8 Mancante -ManufacturingProductionRunQuantityNotCorrect=Ciclo Produzione campo Quantit\u00e0 non \u00e8 formattato correttamente -ManufacturingProductionRunStartDateMissing=Ciclo Produzione Data Inizio \u00e8 Mancante +ManufacturingProductionRunCosts=Costi Ordine di Produzione +ManufacturingProductionRunCreated=Ordine di Produzione ${productionRunId} creata +ManufacturingProductionRunDeclaration=Dichiarazione Ordine di Produzione +ManufacturingProductionRunId=Codice Ordine di Produzione +ManufacturingProductionRunName=Nome Ordine di Produzione +ManufacturingProductionRunNotUpdated=Aggiornamento Ordine di Produzione fallito, vedere il log per maggiori informazioni +ManufacturingProductionRunProductComponent=Ordine di Produzione Prodotti Componenti +ManufacturingProductionRunQuantityMissing=Ordine di Produzione Quantit\u00e0 \u00e8 Mancante +ManufacturingProductionRunQuantityNotCorrect=Ordine di Produzione campo Quantit\u00e0 non \u00e8 formattato correttamente +ManufacturingProductionRunStartDateMissing=Ordine di Produzione Data Inizio \u00e8 Mancante ManufacturingProductionRunStartDateNotCorrect=il campo Data Inizio non \u00e8 corretto, il formato deve essere AAAA-mm-jj HH:mm:ss ManufacturingProductId=Codice Prodotto ManufacturingProductIdTo=Codice Prodotto A @@ -151,10 +155,11 @@ ManufacturingProposedOrder=Ordine Proposta ManufacturingQuantity=Quantit\u00e0 ManufacturingQuantityMinimum=Quantit\u00e0 Minima +ManufacturingQuantityRemaining=Quantit\u00e0 Rimanente ManufacturingQuickRunAllTasks=Esecuzione Veloce Tutti i Compiti ManufacturingQuickRunTask=Esecuzione Veloce Compiti ManufacturingReason=Ragione -ManufacturingReturnedQuantity=Resi +ManufacturingReturnedQuantity=Quantit\u00e0 Resa ManufacturingReports=Stampe ManufacturingRouting=Ciclo ManufacturingRoutings=Cicli @@ -173,6 +178,7 @@ ManufacturingRunMrp=Esegui MRP ManufacturingScrapFactor=Fattore Di Scarto % ManufacturingShipmentPlans=Piani Spedizione +ManufacturingShipmentPlanStockReport=Stampa Piano di Spedizione ManufacturingStartDate=Data Inizio ManufacturingStartTime=Ora Inizio ManufacturingSummarizedPartBreakdown=Esplosione Scalare Sommarizzata @@ -181,6 +187,7 @@ ManufacturingTaskId=Codice Compito ManufacturingTaskName=Nome Operazione ManufacturingTaskPurpose=Tipo Compito +ManufacturingTasksReport=Stampa Compiti ManufacturingTechData=Tech. Data ManufacturingTechDataCalendarNotExist=TechDataCalendar non esiste ManufacturingTechDataCalendarWeekNotExist=TechDataCalendarWeek non esiste @@ -211,22 +218,22 @@ ManufacturingCompleteProductionRunTask=Completa ManufacturingIssueProductionRunTask=Componenti con Problemi ManufacturingDeclareProductionRunTask=Dichiarazione -ManufacturingProductionRunClose=Chiudi Ciclo Produzione -ManufacturingIssuedQuantity=Problemi -ManufacturingProduceQuantity=Giacenza in -ManufacturingQuantityProduced=Prodotto -ManufacturingQuantityRejected=Scartato +ManufacturingProductionRunClose=Chiudi Ordine di Produzione +ManufacturingIssuedQuantity=Quantit\u00e0 Prelevata +ManufacturingProduceQuantity=Quantit\u00e0 in Giacenza +ManufacturingQuantityProduced=Quantit\u00e0 Prodotta +ManufacturingQuantityRejected=Quantit\u00e0 Scartata ManufacturingInventoryItemsProduced=Righe Inventario ManufacturingEstimatedStartDate=Data Inizio Stimata ManufacturingActualStartDate=Data Inizio ManufacturingActualCompletionDate=Data Completamento -ManufacturingQuantityToProduce=Qnt Da Produrre +ManufacturingQuantityToProduce=Quantit\u00e0 Da Produrre ManufacturingFromDate=Da Data ManufacturingToDate=A Data ManufacturingAddSetupTime=Aggiungi Tempo Installazione Attuale ManufacturingAddTaskTime=Aggiungi Tempo Attuale Compito -ManufacturingAddQuantityProduced=Aggiungi Qnt Prodotta -ManufacturingAddQuantityRejected=Aggiungi Qnt Scartata +ManufacturingAddQuantityProduced=Aggiungi Quantit\u00e0 Prodotta +ManufacturingAddQuantityRejected=Aggiungi Quantit\u00e0 Scartata ManufacturingComments=Commenti ManufacturingWorker=Lavoratore ManufacturingOrderItems=Righe Ordine @@ -240,8 +247,10 @@ PageTitleEditCalendarExceptionDay=Aggiorna Giorno Calendario Speciale PageTitleEditCalendarExceptionWeek=Aggiorna Calendario Speciale Settimana PageTitleEditCalendarWeek=Aggiorna Settimana +PageTitleEditCostCalcs=Aggiorna Calcoli Costo PageTitleEditMachine=Aggiorna Macchine PageTitleEditMachineGroup=Aggiorna Gruppo Macchine +PageTitleEditProductBom=Aggiorna Distinta Base Prodotto PageTitleEditProductManufacturingRules=Regole Produzione Prodotto PageTitleEditRouting=Aggiorna Ciclo PageTitleEditRoutingProductLink=Aggiorna Link Ciclo-Prodotto Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java?view=diff&rev=451270&r1=451269&r2=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java (original) +++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java Fri Sep 29 05:52:17 2006 @@ -155,7 +155,7 @@ Debug.logError("Production Run for order item (" + orderItem.getString("orderId") + "/" + orderItem.getString("orderItemSeqId") + ") not created.", module); continue; } - Map result = dispatcher.runSync("createProductionRunsForOrder", UtilMisc.toMap("productId", orderItem.getString("productId"), "quantity", shipmentPlan.getDouble("quantity"), "orderId", shipmentPlan.getString("orderId"), "orderItemSeqId", shipmentPlan.getString("orderItemSeqId"), "shipmentId", shipmentId, "userLogin", userLogin)); + Map result = dispatcher.runSync("createProductionRunsForOrder", UtilMisc.toMap("quantity", shipmentPlan.getDouble("quantity"), "orderId", shipmentPlan.getString("orderId"), "orderItemSeqId", shipmentPlan.getString("orderItemSeqId"), "shipmentId", shipmentId, "userLogin", userLogin)); } } catch (Exception e) { // if there is an exception for either, the other probably wont work Added: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.bsh?view=auto&rev=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.bsh (added) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.bsh Fri Sep 29 05:52:17 2006 @@ -0,0 +1,100 @@ +/* + * + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +import org.ofbiz.entity.*; +import org.ofbiz.entity.util.*; +import org.ofbiz.base.util.*; +import org.ofbiz.order.order.*; +import org.ofbiz.content.report.*; + +delegator = request.getAttribute("delegator"); +dispatcher = request.getAttribute("dispatcher"); +userLogin = request.getSession().getAttribute("userLogin"); + +shipmentId = request.getParameter("shipmentId"); +shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId)); + +context.put("shipmentIdPar", shipment.getString("shipmentId")); + +if (shipment != null) { + shipmentPackages = delegator.findByAnd("ShipmentPackage", UtilMisc.toMap("shipmentId", shipmentId)); + shipmentPackagesIt = shipmentPackages.iterator(); + records = new ArrayList(); + orderReaders = new HashMap(); + while(shipmentPackagesIt.hasNext()) { + shipmentPackage = shipmentPackagesIt.next(); + + shipmentPackageComponents = delegator.findByAnd("ShipmentPackageContent", UtilMisc.toMap("shipmentId", shipmentId, "shipmentPackageSeqId", shipmentPackage.getString("shipmentPackageSeqId"))); + shipmentPackageComponentsIt = shipmentPackageComponents.iterator(); + while(shipmentPackageComponentsIt.hasNext()) { + shipmentPackageComponent = shipmentPackageComponentsIt.next(); + + shipmentItem = shipmentPackageComponent.getRelatedOne("ShipmentItem"); + orderShipments = shipmentItem.getRelated("OrderShipment"); + orderShipment = EntityUtil.getFirst(orderShipments); + + String orderId = null; + String orderItemSeqId = null; + if (orderShipment != null) { + orderId = orderShipment.getString("orderId"); + orderItemSeqId = orderShipment.getString("orderItemSeqId"); + } + + record = new HashMap(); + if (shipmentPackageComponent.get("subProductId") != null) { + record.put("productId", shipmentPackageComponent.getString("subProductId")); + record.put("quantity", shipmentPackageComponent.getDouble("subQuantity")); + } else { + record.put("productId", shipmentItem.getString("productId")); + record.put("quantity", shipmentPackageComponent.getDouble("quantity")); + } + record.put("shipmentPackageSeqId", shipmentPackageComponent.getString("shipmentPackageSeqId")); + record.put("orderId", orderId); + record.put("orderItemSeqId", orderItemSeqId); + product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", (String)record.get("productId"))); + record.put("productName", product.getString("internalName")); + record.put("shipDate", shipment.getString("estimatedShipDate")); + // --- + orderReadHelper = null; + if (orderReaders.containsKey(orderId)) { + orderReadHelper = (OrderReadHelper)orderReaders.get(orderId); + } else { + orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId)); + orderReadHelper = new OrderReadHelper(orderHeader); + orderReaders.put(orderId, orderReadHelper); + } + displayParty = orderReadHelper.getPlacingParty(); + shippingAddress = orderReadHelper.getShippingAddress(); + record.put("shippingAddressName", shippingAddress.getString("toName")); + record.put("shippingAddressAddress", shippingAddress.getString("address1")); + record.put("shippingAddressCity", shippingAddress.getString("city")); + record.put("shippingAddressPostalCode", shippingAddress.getString("postalCode")); + record.put("shippingAddressCountry", shippingAddress.getString("countryGeoId")); + records.add(record); + } + } + context.put("records", records); + + // check permission + hasPermission = false; + if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) { + hasPermission = true; + } + context.put("hasPermission", hasPermission); +} + +return "success"; Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.bsh ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.bsh ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh?view=auto&rev=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh (added) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh Fri Sep 29 05:52:17 2006 @@ -0,0 +1,104 @@ +/* + * + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +import org.ofbiz.entity.*; +import org.ofbiz.base.util.*; +import org.ofbiz.content.report.*; + +delegator = request.getAttribute("delegator"); +security = request.getAttribute("security"); +dispatcher = request.getAttribute("dispatcher"); +userLogin = request.getSession().getAttribute("userLogin"); + +inventoryStock = new HashMap(); +shipmentId = request.getParameter("shipmentId"); +shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId)); + +context.put("shipmentIdPar", shipment.getString("shipmentId")); +context.put("estimatedReadyDatePar", shipment.getString("estimatedReadyDate")); +context.put("estimatedShipDatePar", shipment.getString("estimatedShipDate")); + +if (shipment != null) { + shipmentPlans = delegator.findByAnd("OrderShipment", UtilMisc.toMap("shipmentId", shipmentId)); + shipmentPlansIt = shipmentPlans.iterator(); + records = new ArrayList(); + + while(shipmentPlansIt.hasNext()) { + shipmentPlan = shipmentPlansIt.next(); + orderLine = delegator.findByPrimaryKey("OrderItem", UtilMisc.toMap("orderId", shipmentPlan.getString("orderId"), "orderItemSeqId", shipmentPlan.getString("orderItemSeqId"))); + recordGroup = new HashMap(); + recordGroup.put("ORDER_ID", shipmentPlan.getString("orderId")); + recordGroup.put("ORDER_ITEM_SEQ_ID", shipmentPlan.getString("orderItemSeqId")); + recordGroup.put("SHIPMENT_ID", shipmentPlan.getString("shipmentId")); + recordGroup.put("SHIPMENT_ITEM_SEQ_ID", shipmentPlan.getString("shipmentItemSeqId")); + + recordGroup.put("PRODUCT_ID", orderLine.getString("productId")); + recordGroup.put("QUANTITY", shipmentPlan.getDouble("quantity")); + product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", orderLine.getString("productId"))); + recordGroup.put("PRODUCT_NAME", product.getString("internalName")); + + Map inputPar = UtilMisc.toMap("productId", orderLine.getString("productId"), + "quantity", shipmentPlan.getDouble("quantity"), + "fromDate", "" + new Date(), + "userLogin", userLogin); + + Map result = null; + result = dispatcher.runSync("getNotAssembledComponents",inputPar); + if (result != null) + components = (List)result.get("notAssembledComponents"); + componentsIt = components.iterator(); + while(componentsIt.hasNext()) { + oneComponent = (org.ofbiz.manufacturing.bom.BOMNode)componentsIt.next(); + record = new HashMap(recordGroup); + record.put("componentId", oneComponent.getProduct().getString("productId")); + record.put("componentName", oneComponent.getProduct().getString("internalName")); + record.put("componentQuantity", new Float(oneComponent.getQuantity())); + facilityId = shipment.getString("originFacilityId"); + float qty = 0; + if (facilityId != null) { + if (!inventoryStock.containsKey(oneComponent.getProduct().getString("productId"))) { + serviceInput = UtilMisc.toMap("productId",oneComponent.getProduct().getString("productId"), "facilityId", facilityId); + serviceOutput = dispatcher.runSync("getInventoryAvailableByFacility",serviceInput); + qha = serviceOutput.get("quantityOnHandTotal"); + if (qha == null) qha = new Double(0); + inventoryStock.put(oneComponent.getProduct().getString("productId"), qha); + } + qty = ((Double)inventoryStock.get(oneComponent.getProduct().getString("productId"))).floatValue(); + qty = (float)(qty - oneComponent.getQuantity()); + inventoryStock.put(oneComponent.getProduct().getString("productId"), new Double(qty)); + } + record.put("componentOnHand", new Float(qty)); + // Now we get the products qty already reserved by production runs + serviceInput = UtilMisc.toMap("productId", oneComponent.getProduct().getString("productId"), + "userLogin", userLogin); + serviceOutput = dispatcher.runSync("getProductionRunTotResQty", serviceInput); + resQty = serviceOutput.get("reservedQuantity"); + record.put("reservedQuantity", resQty); + records.add(record); + } + } + context.put("records", records); + + // check permission + hasPermission = false; + if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) { + hasPermission = true; + } + context.put("hasPermission", hasPermission); +} + +return "success"; Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh?view=auto&rev=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh (added) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh Fri Sep 29 05:52:17 2006 @@ -0,0 +1,84 @@ +/* + * + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +import org.ofbiz.entity.*; +import org.ofbiz.base.util.*; +import org.ofbiz.order.order.*; +import org.ofbiz.content.report.*; + +delegator = request.getAttribute("delegator"); +dispatcher = request.getAttribute("dispatcher"); +userLogin = request.getSession().getAttribute("userLogin"); + +shipmentId = request.getParameter("shipmentId"); +shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId)); + +context.put("shipmentIdPar", shipment.getString("shipmentId")); +context.put("date", new Date()); +Double fixedAssetTime = new Double(0); + +if (shipment != null) { + shipmentPlans = delegator.findByAnd("OrderShipment", UtilMisc.toMap("shipmentId", shipmentId)); + shipmentPlansIt = shipmentPlans.iterator(); + records = new ArrayList(); + + while(shipmentPlansIt.hasNext()) { + shipmentPlan = shipmentPlansIt.next(); + productionRuns = delegator.findByAnd("WorkOrderItemFulfillment", UtilMisc.toMap("orderId", shipmentPlan.getString("orderId"), "orderItemSeqId", shipmentPlan.getString("orderItemSeqId")), UtilMisc.toList("workEffortId")); // TODO: add shipmentId + if (productionRuns != null && productionRuns.size() > 0) { + productionRunsIt = productionRuns.iterator(); + while (productionRunsIt.hasNext()) { + productionRun = productionRunsIt.next(); + productionRunProduct = null; + productionRunProducts = delegator.findByAnd("WorkEffortGoodStandard", UtilMisc.toMap("workEffortId", productionRun.getString("workEffortId"), "workEffortGoodStdTypeId", "PRUN_PROD_DELIV", "statusId", "WEGS_CREATED")); + if (productionRunProducts != null && productionRunProducts.size() > 0) { + //productionRunProduct = ((GenericValue)productionRunProducts.get(0)).getString("productId"); + productionRunProduct = ((GenericValue)productionRunProducts.get(0)).getRelatedOne("Product"); + } + tasks = delegator.findByAnd("WorkEffort", UtilMisc.toMap("workEffortParentId", productionRun.getString("workEffortId"), "workEffortTypeId", "PROD_ORDER_TASK")); + tasksIt = tasks.iterator(); + while (tasksIt.hasNext()) { + task = tasksIt.next(); + record = new HashMap(); + record.put("productId", productionRunProduct.getString("productId")); + record.put("productName", productionRunProduct.getString("internalName")); + record.put("fixedAssetId", task.getString("fixedAssetId")); + record.put("priority", task.getLong("priority")); + record.put("workEffortId", productionRun.getString("workEffortId")); + record.put("taskId", task.getString("workEffortId")); + record.put("taskName", task.getString("workEffortName")); + record.put("taskDescription", task.getString("description")); + record.put("taskEstimatedTime", task.getDouble("estimatedMilliSeconds")); + record.put("taskEstimatedSetup", task.getDouble("estimatedSetupMillis")); + records.add(record); + fixedAssetTime = fixedAssetTime + task.getDouble("estimatedMilliSeconds"); + } + } + } + } + context.put("fixedAssetTime", fixedAssetTime); + context.put("records", records); + + // check permission + hasPermission = false; + if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) { + hasPermission = true; + } + context.put("hasPermission", hasPermission); +} + +return "success"; Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?view=diff&rev=451270&r1=451269&r2=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Fri Sep 29 05:52:17 2006 @@ -33,7 +33,6 @@ <!-- view handlers --> <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/> <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopPdfViewHandler"/> - <handler name="jasperreportspdf" type="view" class="org.ofbiz.webapp.view.JasperReportsPdfViewHandler"/> <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/> <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> @@ -608,17 +607,14 @@ </request-map> <request-map uri="ShipmentPlanStockReport.pdf"> <security https="true" auth="true"/> - <event type="bsf" path="/jobshopmgt/" invoke="ShipmentPlanStockReportPrepare.bsh"/> <response name="success" type="view" value="ShipmentPlanStockReport"/> </request-map> <request-map uri="ShipmentLabel.pdf"> <security https="true" auth="true"/> - <event type="bsf" path="/jobshopmgt/" invoke="ShipmentLabelPrepare.bsh"/> <response name="success" type="view" value="ShipmentLabel"/> </request-map> <request-map uri="ShipmentWorkEffortTasks.pdf"> <security https="true" auth="true"/> - <event type="bsf" path="/jobshopmgt/" invoke="ShipmentWorkEffortTasksPrepare.bsh"/> <response name="success" type="view" value="ShipmentWorkEffortTasks"/> </request-map> <request-map uri="MRPPRunsProductsByFeature.pdf"> @@ -714,9 +710,9 @@ <view-map name="WorkWithShipmentPlans" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#WorkWithShipmentPlans" type="screen"/> <!-- Report view mappings --> - <view-map name="ShipmentPlanStockReport" type="jasperreportspdf" page="/jobshopmgt/ShipmentPlanStockReport.xml" content-type="application/pdf" encoding="none"/> - <view-map name="ShipmentLabel" type="jasperreportspdf" page="/jobshopmgt/ShipmentLabel.xml" content-type="application/pdf" encoding="none"/> - <view-map name="ShipmentWorkEffortTasks" type="jasperreportspdf" page="/jobshopmgt/ShipmentWorkEffortTasks.xml" content-type="application/pdf" encoding="none"/> + <view-map name="ShipmentPlanStockReport" type="screenfop" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#ShipmentPlanStockReport" content-type="application/pdf" encoding="none"/> + <view-map name="ShipmentLabel" type="screenfop" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#ShipmentLabel" content-type="application/pdf" encoding="none"/> + <view-map name="ShipmentWorkEffortTasks" type="screenfop" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#ShipmentWorkEffortTasks" content-type="application/pdf" encoding="none"/> <view-map name="CuttingListReport" type="screenfop" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#CuttingListReport" content-type="application/pdf" encoding="none"/> <view-map name="PackageContentsAndOrder" type="screenfop" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#PackageContentsAndOrder" content-type="application/pdf" encoding="none"/> <view-map name="PRunsProductsStacks" type="screenfop" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#PRunsProductsStacks" content-type="application/pdf" encoding="none"/> Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?view=diff&rev=451270&r1=451269&r2=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Fri Sep 29 05:52:17 2006 @@ -442,7 +442,7 @@ <field name="totPlannedQuantity"><display/></field> <!-- total issued quantity --> <field name="totIssuedQuantity"><display/></field> - <field name="productionRuns" title="Production Run"><display/></field> + <field name="productionRuns"><display/></field> </form> <form name="listShipmentPlans" type="list" Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl?view=diff&rev=451270&r1=451269&r2=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl (original) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl Fri Sep 29 05:52:17 2006 @@ -23,7 +23,7 @@ <div><a href="<@ofbizUrl>ShipmentWorkEffortTasks.pdf?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingTasksReport}</a></div> <div><a href="<@ofbizUrl>CuttingListReport.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_report" class="buttontext">${uiLabelMap.ManufacturingCuttingListReport}</a></div> <#else> - <div><a href="<@ofbizUrl>createProductionRunsForShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CreateProductionRuns}</a></div> + <div><a href="<@ofbizUrl>createProductionRunsForShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingCreateProductionRun}</a></div> <br/> <div><a href="<@ofbizUrl>ShipmentPlanStockReport.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_report" class="buttontext">${uiLabelMap.ManufacturingShipmentPlanStockReport}</a></div> </#if> Added: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl?view=auto&rev=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (added) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl Fri Sep 29 05:52:17 2006 @@ -0,0 +1,172 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<#-- +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> +<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="main" page-height="11.694in" page-width="8.264in" + margin-top="0.278in" margin-bottom="0.278in" margin-left="0.278in" margin-right="0.278in"> + <fo:region-body margin-top="1in"/> + <fo:region-before extent="1in"/> + <fo:region-after extent="1in"/> + </fo:simple-page-master> + </fo:layout-master-set> + <#if hasPermission> + <#if records?has_content> + <fo:page-sequence master-reference="main"> + <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> + <#assign index = 1> + <#list records as record> + <#if index == 1> + <fo:table border="0.5pt solid black"> + <fo:table-column column-width="252pt"/> + <fo:table-header> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.ManufacturingShipTo}:</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block font-size="18pt">${record.get("shippingAddressName")}</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block>${record.get("shippingAddressAddress")}</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block>${record.get("shippingAddressCity")}</fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-header> + <fo:table-body/> + </fo:table> + <fo:block space-after.optimum="10pt" font-size="10pt"/> + <fo:table> + <fo:table-column column-width="63pt"/> + <fo:table-column column-width="63pt"/> + <fo:table-column column-width="93pt"/> + <fo:table-column column-width="33pt"/> + <fo:table-header border="0.5pt solid black"> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.OrderOrderId}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.ProductProductId}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.CommonDescription}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.CommonQuantity}</fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-header> + <fo:table-body/> + </fo:table> + </#if> + <fo:table> + <fo:table-column column-width="63pt"/> + <fo:table-column column-width="63pt"/> + <fo:table-column column-width="93pt"/> + <fo:table-column column-width="33pt"/> + <fo:table-header/> + <fo:table-body> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block> + ${record.get("orderId")} ${record.get("orderItemSeqId")} + </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block> + ${record.get("productId")} + </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block> + ${record.get("productName")} + </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block text-align="right"> + ${record.get("quantity")} + </fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + <#assign shipmentPackageSeqId = record.get("shipmentPackageSeqId")> + <#if estimatedReadyDatePar?has_content> + <#assign shipDate = record.get("shipDate")> + </#if> + <#assign index = index + 1> + </#list> + <fo:table border="0.5pt solid black"> + <fo:table-column column-width="84pt"/> + <fo:table-column column-width="84pt"/> + <fo:table-column column-width="84pt"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.ManufacturingPackage}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.ProductShipmentPlan}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.FacilityEstimatedShipDate}</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block> + ${shipmentIdPar}/${shipmentPackageSeqId} + </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block> + ${shipmentIdPar} + </fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block> + <#if shipDate?has_content>${shipDate}</#if> + </fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + </fo:flow> + </fo:page-sequence> + <#else> + <fo:page-sequence master-reference="main"> + <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> + <fo:block font-size="14pt"> + ${uiLabelMap.ManufacturingNoDataAvailable} + </fo:block> + </fo:flow> + </fo:page-sequence> + </#if> + <#else> + <fo:block font-size="14pt"> + ${uiLabelMap.ManufacturingViewPermissionError} + </fo:block> + </#if> +</fo:root> Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl?view=auto&rev=451270 ============================================================================== --- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl (added) +++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl Fri Sep 29 05:52:17 2006 @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<#-- +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> +<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="main" page-height="11.694in" page-width="8.264in" + margin-top="0.278in" margin-bottom="0.278in" margin-left="0.417in" margin-right="0.417in"> + <fo:region-body margin-top="1in"/> + <fo:region-before extent="1in"/> + <fo:region-after extent="1in"/> + </fo:simple-page-master> + </fo:layout-master-set> + <#if hasPermission> + <#if records?has_content> + <fo:page-sequence master-reference="main"> + <fo:static-content flow-name="xsl-region-after"> + <fo:block text-align="right" line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> + ${uiLabelMap.CommonPage} <fo:page-number/> + </fo:block> + </fo:static-content> + <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> + <fo:block><fo:leader/></fo:block> + <fo:block font-size="14pt">${uiLabelMap.ManufacturingComponentsOfShipmentPlan}</fo:block> + <fo:block><fo:leader/></fo:block> + <fo:block space-after.optimum="10pt" font-size="10pt"/> + <fo:table> + <fo:table-column column-width="200pt"/> + <fo:table-column column-width="200pt"/> + <fo:table-column column-width="200pt"/> + <fo:table-header> + <fo:table-row font-weight="bold"> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.ManufacturingShipmentId}: ${shipmentIdPar}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.estimatedCompletionDate}: <#if estimatedReadyDatePar?has_content>${estimatedReadyDatePar}</#if></fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:block>${uiLabelMap.FacilityEstimatedShipDate}: <#if estimatedShipDatePar?has_content>${estimatedShipDatePar}</#if></fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-header> + <fo:table-body/> + </fo:table> + <fo:block space-after.optimum="10pt" font-size="10pt"/> + <fo:table> + <fo:table-column column-width="120pt"/> + <fo:table-column column-width="120pt"/> + <fo:table-column column-width="120pt"/> + <fo:table-column column-width="120pt"/> + <fo:table-column column-width="120pt"/> + <fo:table-header> + <fo:table-row font-weight="bold"> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.OrderOrderId}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.ManufacturingProductsComponents}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.CommonDescription}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.ManufacturingNeedQuantity}</fo:block> + </fo:table-cell> + <fo:table-cell padding="2pt" background-color="#D4D0C8"> + <fo:block>${uiLabelMap.ManufacturingOnHandQuantity}</fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-header> + <fo:table-body/> + </fo:table> + <#list records as record> + <fo:table> + <fo:table-column column-width="120pt"/> + <fo:table-column column-width="120pt"/> + <fo:table-column column-width="120pt"/> + <fo:table-column column-width="120pt"/> + <fo:table-column column-width="120pt"/> + <fo:table-header/> + <fo:table-body> + <fo:table-row> + <fo:table-cell padding="2pt"> + <fo:block> + ${record.get("ORDER_ID")}/${record.get("ORDER_ITEM_SEQ_ID")} + |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |