Author: mor
Date: Wed Aug 5 08:36:48 2009
New Revision: 801085
URL: http://svn.apache.org/viewvc?rev=801085&view=rev
Log:
Improvements in Picking screen to display additional information about whether
the order is verified (Facility > Verify Pick) or not.
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy
ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl
Modified:
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=801085&r1=801084&r2=801085&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy
Wed Aug 5 08:36:48 2009
@@ -21,6 +21,8 @@
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.util.EntityUtil;
+import java.text.SimpleDateFormat;
+
condList = [];
condList.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS,
"ORDER_APPROVED"));
condList.add(EntityCondition.makeCondition("orderTypeId",
EntityOperator.EQUALS, "SALES_ORDER"));
@@ -28,10 +30,13 @@
cond = EntityCondition.makeCondition(condList, EntityOperator.AND);
orderHeaders = delegator.findList("OrderHeader", cond, null, null, null,
false);
orders = [];
+SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'/'K:mm a");
orderHeaders.each { orderHeader ->
itemIssuanceList = delegator.findByAnd("ItemIssuance", [orderId :
orderHeader.orderId]);
- if (!itemIssuanceList) {
- orders.add([orderId : orderHeader.orderId, pickSheetPrintedDate :
orderHeader.pickSheetPrintedDate]);
+ if (itemIssuanceList) {
+ orders.add([orderId : orderHeader.orderId, pickSheetPrintedDate :
dateFormat.format(orderHeader.pickSheetPrintedDate), isVerified : "Y"]);
+ } else {
+ orders.add([orderId : orderHeader.orderId, pickSheetPrintedDate :
dateFormat.format(orderHeader.pickSheetPrintedDate), isVerified : "N"]);
}
}
context.orders = orders;
\ No newline at end of file
Modified:
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=801085&r1=801084&r2=801085&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl
Wed Aug 5 08:36:48 2009
@@ -28,12 +28,14 @@
<tr class="header-row">
<td>${uiLabelMap.OrderOrderId}</td>
<td>${uiLabelMap.FormFieldTitle_orderPickSheetPrintedDate}</td>
+ <td>${uiLabelMap.ProductVerified}</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>
+ <td><#if "Y" ==
order.isVerified>${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}</#if></td>
</tr>
</#list>
<#else>
