Author: jonesde
Date: Tue Sep 18 15:26:56 2007
New Revision: 577088
URL: http://svn.apache.org/viewvc?rev=577088&view=rev
Log:
Added check of shipment statusId for ShowShipment message
Modified:
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
Modified:
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=577088&r1=577087&r2=577088&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
(original)
+++
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
Tue Sep 18 15:26:56 2007
@@ -205,6 +205,12 @@
if (shipment == null) {
String errMsg = "Could not find Shipment ID [" + shipmentId + "]";
errorMapList.add(UtilMisc.toMap("description", errMsg,
"reasonCode", "ShipmentIdNotValid"));
+ } else {
+ Set invalidStatusSet = UtilMisc.toSet("SHIPMENT_CANCELLED",
"SHIPMENT_PICKED", "SHIPMENT_PACKED", "SHIPMENT_SHIPPED", "SHIPMENT_DELIVERED");
+ if (invalidStatusSet.contains(shipment.get("statusId"))) {
+ String errMsg = "Shipment with ID [" + shipmentId + "] is in a
status [" + shipment.get("statusId") + "] that means it has been or is being
shipped, so this Show Shipment message may be a duplicate.";
+ errorMapList.add(UtilMisc.toMap("description", errMsg,
"reasonCode", "ShipmentInBadStatus"));
+ }
}
List shipUnitElementList =
UtilXml.childElementList(daShowShipmentElement, "ns:SHIPUNIT"); // n
