svn commit: r557534 - in /ofbiz/trunk/specialpurpose/oagis: src/org/ofbiz/oagis/OagisShipmentServices.java webapp/oagis/message/ProcessShipment.ftl

[jonesde]

Author: jonesde
Date: Thu Jul 19 02:32:46 2007
New Revision: 557534

URL: http://svn.apache.org/viewvc?view=rev&rev=557534
Log:
A few updates to comments and cleanups related to data prep, plus another place holder

Modified:
    ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
    ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl

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?view=diff&rev=557534&r1=557533&r2=557534
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Thu Jul 19 02:32:46 2007
@@ -43,6 +43,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import javolution.util.FastList;
+import javolution.util.FastSet;
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.HttpClient;
@@ -298,7 +299,8 @@
                 } catch (GenericEntityException e) {
                     Debug.logError(e, module);
                 }
-                Set correspondingPoIdSet = new TreeSet();
+                
+                Set correspondingPoIdSet = FastSet.newInstance();
                 try {
                     List orderItems = delegator.findByAnd("OrderItem", UtilMisc.toMap("orderId", shipment.getString("primaryOrderId")));
                     Iterator oiIter = orderItems.iterator();
@@ -307,20 +309,22 @@
                         String correspondingPoId = orderItem.getString("correspondingPoId");
                         if (correspondingPoId != null) {
                         correspondingPoIdSet.add(correspondingPoId);
-                        bodyParameters.put("correspondingPoIdSet", correspondingPoIdSet);
                         }
                     }
                 } catch (GenericEntityException e) {
                     Debug.logError(e, module);
                 }
-                Set externalIdSet = new TreeSet();
+                bodyParameters.put("correspondingPoIdSet", correspondingPoIdSet);
+
+                Set externalIdSet = FastSet.newInstance();
                 try {
                     GenericValue primaryOrderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", shipment.getString("primaryOrderId")));
                     externalIdSet.add(primaryOrderHeader.getString("externalId"));
-                    bodyParameters.put("externalIdSet", externalIdSet);
                 } catch (GenericEntityException e) {
                     Debug.logError(e, module);
                 }
+                bodyParameters.put("externalIdSet", externalIdSet);
+                
                 // if order was a return replacement order (associated with return)
                 List returnItemResponses =  null;
                 List returnItemRespExprs = UtilMisc.toList(new EntityExpr("replacementOrderId", EntityOperator.NOT_EQUAL, null));

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?view=diff&rev=557534&r1=557533&r2=557534
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Thu Jul 19 02:32:46 2007
@@ -46,11 +46,11 @@
       <n:SHIPMENT>
         <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
         <#if shipperId?has_content>
-          <of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- TODO: fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate -->
+          <of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate -->
         </#if>
         <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER>
         <#if shipperId?has_content>
-          <of:FRGHTTERMS>COLLECT</of:FRGHTTERMS><#-- TODO: if SHIPPERID?has_content then set to COLLECT -->
+          <of:FRGHTTERMS>COLLECT</of:FRGHTTERMS>
         <#else>
           <of:FRGHTTERMS>PREPAID</of:FRGHTTERMS>
         </#if>
@@ -100,20 +100,25 @@
             </n:DOCUMNTREF>
           </#list>
         </n:SHIPITEM>
-        <#-- TODO: data preparation code to create the externalIdSet -->
         <#list externalIdSet?if_exists as externalId>
         <n:DOCUMNTREF>
           <of:DOCTYPE>PARTNER_SO</of:DOCTYPE>
           <of:DOCUMENTID>${externalId?if_exists}</of:DOCUMENTID>
         </n:DOCUMNTREF>
         </#list>
-        <#-- TODO: data preparation code to create the correspondingPoIdSet -->
         <#list correspondingPoIdSet?if_exists as correspondingPoId>
         <n:DOCUMNTREF>
           <of:DOCTYPE>CUST_PO</of:DOCTYPE>
           <of:DOCUMENTID>${correspondingPoId?if_exists}</of:DOCUMENTID>
         </n:DOCUMNTREF>
         </#list>
+        <#-- TODO: data preparation code to create the replacementReturnId; this is the returnId if the order is a return replacement order -->
+        <#if replacementReturnId?exists>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>RMA</of:DOCTYPE>
+          <of:DOCUMENTID>${replacementReturnId}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+        </#if>
       </n:SHIPMENT>
     </n:PROCESS_SHIPMENT>
   </n:DATAAREA>