You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/04/29 14:19:35 UTC
svn commit: r769770 - in /ofbiz/trunk/applications/product: config/
webapp/facility/WEB-INF/ webapp/facility/WEB-INF/actions/shipment/
webapp/facility/facility/ widget/facility/
Author: mor
Date: Wed Apr 29 12:19:34 2009
New Revision: 769770
URL: http://svn.apache.org/viewvc?rev=769770&view=rev
Log:
New screen to show list of orders which have 'pick sheet printed date' but are not picked or packed yet.
Patch from Arun Patidar, part of OFBIZ-2388 (https://issues.apache.org/jira/browse/OFBIZ-2388)
Added:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy (with props)
ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl (with props)
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=769770&r1=769769&r2=769770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Apr 29 12:19:34 2009
@@ -2142,6 +2142,9 @@
<value xml:lang="th">à¸à¸²à¸£à¹à¸à¸´à¹à¸¡à¸à¸³à¸à¸§à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
<value xml:lang="zh">订åæ°éå¢å </value>
</property>
+ <property key="FormFieldTitle_orderPickSheetPrintedDate">
+ <value xml:lang="en">Pick Sheet Printed Date</value>
+ </property>
<property key="FormFieldTitle_originatedFromPartyId">
<value xml:lang="de">Herkunft von Akteur ID</value>
<value xml:lang="en">Originated From Party Id</value>
@@ -3061,6 +3064,9 @@
<value xml:lang="it">Numero Riga Reso</value>
<value xml:lang="th">รหัสรายà¸à¸²à¸£à¸«à¸±à¸§à¸à¹à¸à¸à¸¥à¸à¸à¸à¹à¸à¸</value>
</property>
+ <property key="FormFieldTitle_reviewOrdersNotPickedOrPacked">
+ <value xml:lang="en">Review Orders Not Picked-Packed</value>
+ </property>
<property key="FormFieldTitle_scrapFactor">
<value xml:lang="de">Altmaterial Faktor</value>
<value xml:lang="en">Scrap Factor</value>
Added: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy?rev=769770&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy (added)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy Wed Apr 29 12:19:34 2009
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.condition.EntityCondition;
+import org.ofbiz.entity.condition.EntityOperator;
+
+orderHeaders = delegator.findList("OrderHeader", null, null, null, null, false);
+orders = [];
+
+orderHeaders.each { orderHeader ->
+ if (orderHeader.pickSheetPrintedDate) {
+ orderShipments = delegator.findList("Shipment", EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderHeader.orderId), null, null, null, false);
+ if (orderShipments) {
+ orderShipments.each { orderShipment ->
+ if (orderShipment.statusId == "SHIPMENT_INPUT" || orderShipment.statusId == "SHIPMENT_SCHEDULED") {
+ orders.add([orderId : orderHeader.orderId, pickSheetPrintedDate : orderHeader.pickSheetPrintedDate]);
+ }
+ }
+ }
+ else {
+ orders.add([orderId : orderHeader.orderId, pickSheetPrintedDate : orderHeader.pickSheetPrintedDate]);
+ }
+ }
+}
+context.orders = orders;
\ No newline at end of file
Propchange: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=769770&r1=769769&r2=769770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Wed Apr 29 12:19:34 2009
@@ -651,6 +651,10 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="PrintPickSheets.pdf"/>
</request-map>
+ <request-map uri="ReviewOrdersNotPickedOrPacked">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ReviewOrdersNotPickedOrPacked"/>
+ </request-map>
<!-- ================ Picking Verify Requests ================= -->
<request-map uri="VerifyPick">
@@ -1214,6 +1218,7 @@
<view-map name="PickMoveStockSimple" type="screen" page="component://product/widget/facility/FacilityScreens.xml#PickMoveStockSimple"/>
<view-map name="PicklistReport.pdf" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#PicklistReport.fo" content-type="application/pdf" encoding="none"/>
<view-map name="PrintPickSheets.pdf" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#PrintPickSheets.fo" content-type="application/pdf" encoding="none"/>
+ <view-map name="ReviewOrdersNotPickedOrPacked" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ReviewOrdersNotPickedOrPacked"/>
<view-map name="FindFacilityGroup" type="screen" page="component://product/widget/facility/FacilityGroupScreens.xml#FindFacilityGroup"/>
<view-map name="EditFacilityGroup" type="screen" page="component://product/widget/facility/FacilityGroupScreens.xml#EditFacilityGroup"/>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=769770&r1=769769&r2=769770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Wed Apr 29 12:19:34 2009
@@ -49,6 +49,9 @@
<br class="clear"/>
</div>
<div class="screenlet-body">
+ <div align ='right'>
+ <a class="buttontext" align='right' href="<@o...@ofbizUrl>">${uiLabelMap.FormFieldTitle_reviewOrdersNotPickedOrPacked}</a>
+ </div>
<table cellspacing="0" class="basic-table">
<tr class="header-row">
<td>${uiLabelMap.FacilityGroupName}</td>
Added: ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl?rev=769770&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl (added)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl Wed Apr 29 12:19:34 2009
@@ -0,0 +1,44 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.OrderOrderList}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <table class="basic-table hover-bar">
+ <tr class="header-row">
+ <td>${uiLabelMap.OrderOrderId}</td>
+ <td>${uiLabelMap.FormFieldTitle_orderPickSheetPrintedDate}</td>
+ </tr>
+ <#if orders?has_content>
+ <#list orders?sort_by("pickSheetPrintedDate") as order>
+ <tr>
+ <td><a href="/ordermgr/control/orderview?orderId=${order.orderId?if_exists}" class="buttontext" target="_blank">${order.orderId?if_exists}</a></td>
+ <td>${order.pickSheetPrintedDate?if_exists}</td>
+ </tr>
+ </#list>
+ <#else>
+ <tr><td colspan="4"><h3>${uiLabelMap.OrderNoOrderFound}</h3></td></tr>
+ </#if>
+ </table>
+ </div>
+</div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=769770&r1=769769&r2=769770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Apr 29 12:19:34 2009
@@ -1221,6 +1221,22 @@
</widgets>
</section>
</screen>
+ <screen name="ReviewOrdersNotPickedOrPacked">
+ <section>
+ <actions>
+ <script location="component://product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="PicklistManage">
<section>
<actions>