You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2007/09/01 20:23:32 UTC
svn commit: r571852 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
Author: jonesde
Date: Sat Sep 1 11:23:31 2007
New Revision: 571852
URL: http://svn.apache.org/viewvc?rev=571852&view=rev
Log:
Formatting change only, tabs to spaces
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=571852&r1=571851&r2=571852&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Sat Sep 1 11:23:31 2007
@@ -1457,12 +1457,12 @@
GenericValue item = (GenericValue) i.next();
Timestamp estimatedDeliveryDate = (Timestamp) item.get("estimatedDeliveryDate");
if (estimatedDeliveryDate != null && UtilDateTime.nowTimestamp().after(estimatedDeliveryDate)) {
- return true;
+ return true;
}
}
return false;
}*/
- GenericDelegator delegator = orderHeader.getDelegator();
+ GenericDelegator delegator = orderHeader.getDelegator();
GenericValue orderDeliverySchedule = null;
try {
orderDeliverySchedule = delegator.findByPrimaryKey("OrderDeliverySchedule", UtilMisc.toMap("orderId", orderId, "orderItemSeqId", "_NA_"));
@@ -1473,19 +1473,19 @@
estimatedShipDate = orderDeliverySchedule.getTimestamp("estimatedReadyDate");
}
if (estimatedShipDate != null && UtilDateTime.nowTimestamp().after(estimatedShipDate)) {
- return true;
+ return true;
}
return false;
}
public boolean getRejectedOrderItems() {
- List items = getOrderItems();
+ List items = getOrderItems();
Iterator i = items.iterator();
while (i.hasNext()) {
GenericValue item = (GenericValue) i.next();
List receipts = null;
try {
- receipts = item.getRelated("ShipmentReceipt");
+ receipts = item.getRelated("ShipmentReceipt");
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
}
@@ -1495,7 +1495,7 @@
GenericValue rec = (GenericValue) recIter.next();
Double rejected = rec.getDouble("quantityRejected");
if (rejected != null && rejected.doubleValue() > 0) {
- return true;
+ return true;
}
}
}
@@ -1503,7 +1503,7 @@
return false;
}
- public boolean getPartiallyReceivedItems() {
+ public boolean getPartiallyReceivedItems() {
/*List exprs = UtilMisc.toList(new EntityExpr("statusId", EntityOperator.EQUALS, "ITEM_APPROVED"));
List itemsApproved = EntityUtil.filterByAnd(getOrderItems(), exprs);
Iterator i = itemsApproved.iterator();
@@ -1512,18 +1512,18 @@
int shippedQuantity = (int) getItemShippedQuantity(item);
Double orderedQuantity = (Double) item.get("quantity");
if (shippedQuantity != orderedQuantity.intValue() && shippedQuantity > 0) {
- return true;
+ return true;
}
}
return false;
}*/
- List items = getOrderItems();
+ List items = getOrderItems();
Iterator i = items.iterator();
while (i.hasNext()) {
GenericValue item = (GenericValue) i.next();
List receipts = null;
try {
- receipts = item.getRelated("ShipmentReceipt");
+ receipts = item.getRelated("ShipmentReceipt");
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
}
@@ -1534,7 +1534,7 @@
Double acceptedQuantity = rec.getDouble("quantityAccepted");
Double orderedQuantity = (Double) item.get("quantity");
if (acceptedQuantity.intValue() != orderedQuantity.intValue() && acceptedQuantity.intValue() > 0) {
- return true;
+ return true;
}
}
}
@@ -1638,25 +1638,25 @@
}
public String getCurrentOrderItemWorkEffort(GenericValue orderItem) {
- String orderItemSeqId = orderItem.getString("orderItemSeqId");
- String orderId = orderItem.getString("orderId");
- GenericDelegator delegator = orderItem.getDelegator();
- GenericValue workOrderItemFulFillment = null;
- GenericValue workEffort = null;
- try {
- List workOrderItemFulFillments = delegator.findByAndCache("WorkOrderItemFulfillment", UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId));
- if (!UtilValidate.isEmpty(workOrderItemFulFillments)) {
- workOrderItemFulFillment = EntityUtil.getFirst(workOrderItemFulFillments);
- workEffort = workOrderItemFulFillment.getRelatedOne("WorkEffort");
- }
- } catch (GenericEntityException e) {
- return null;
- }
- if (workEffort != null) {
- return workEffort.getString("workEffortId");
- } else {
- return null;
- }
+ String orderItemSeqId = orderItem.getString("orderItemSeqId");
+ String orderId = orderItem.getString("orderId");
+ GenericDelegator delegator = orderItem.getDelegator();
+ GenericValue workOrderItemFulFillment = null;
+ GenericValue workEffort = null;
+ try {
+ List workOrderItemFulFillments = delegator.findByAndCache("WorkOrderItemFulfillment", UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId));
+ if (!UtilValidate.isEmpty(workOrderItemFulFillments)) {
+ workOrderItemFulFillment = EntityUtil.getFirst(workOrderItemFulFillments);
+ workEffort = workOrderItemFulFillment.getRelatedOne("WorkEffort");
+ }
+ } catch (GenericEntityException e) {
+ return null;
+ }
+ if (workEffort != null) {
+ return workEffort.getString("workEffortId");
+ } else {
+ return null;
+ }
}
public String getCurrentItemStatus(GenericValue orderItem) {
@@ -2083,7 +2083,7 @@
List picked = null;
try {
- picked = orderHeader.getDelegator().findByCondition("PicklistAndBinAndItem", pickedConditions, null, null);
+ picked = orderHeader.getDelegator().findByCondition("PicklistAndBinAndItem", pickedConditions, null, null);
} catch (GenericEntityException e) {
Debug.logError(e, module);
this.orderHeader = null;