[Opentaps-dataimport-commits] [dataimport commits] r56 - in versions/0.9/trunk: entitydef script/mysql src/org/opentaps/dataimport

[<cli...@gr...>]

Author: cliberty
Date: 2007-01-31 08:05:25 -0800 (Wed, 31 Jan 2007)
New Revision: 56

Modified:
   versions/0.9/trunk/entitydef/entitymodel_order.xml
   versions/0.9/trunk/script/mysql/importOrderHeadersExample.sql
   versions/0.9/trunk/src/org/opentaps/dataimport/OrderImportServices.java
Log:
Adding an orderClosed (indicator) column to the DataImportOrderHeader entity, and logic to the MySQL example script and importOrders service to handle it. If DataImportOrderHeader.orderClosed=='Y', OrderHeader.statusId will be ORDER_COMPLETED, otherwise it will be ORDER_APPROVED.

Modified: versions/0.9/trunk/entitydef/entitymodel_order.xml
===================================================================
--- versions/0.9/trunk/entitydef/entitymodel_order.xml	2007-01-30 02:28:57 UTC (rev 55)
+++ versions/0.9/trunk/entitydef/entitymodel_order.xml	2007-01-31 16:05:25 UTC (rev 56)
@@ -45,6 +45,7 @@
         <field name="adjustmentsTotal" type="currency-amount"></field>
         <field name="grandTotal" type="currency-amount"></field>
         <field name="comments" type="comment"></field>
+        <field name="orderClosed" type="indicator"></field>
         <field name="processedTimestamp" type="date-time">
             <description>Special field for system to record when entry was successfully imported.  
                 Do not use for any other purpose.</description>

Modified: versions/0.9/trunk/script/mysql/importOrderHeadersExample.sql
===================================================================
--- versions/0.9/trunk/script/mysql/importOrderHeadersExample.sql	2007-01-30 02:28:57 UTC (rev 55)
+++ versions/0.9/trunk/script/mysql/importOrderHeadersExample.sql	2007-01-31 16:05:25 UTC (rev 56)
@@ -4,6 +4,7 @@
 -- grandTotal, shippingTotal, taxTotal, adjustmentsTotal may be positive or negative numbers
 -- currencyUomId must exist in the Uom entity
 -- orderTypeId must exist in the OrderType entity
+-- orderClosed must be Y or N
 
 load data local infile
 ''
@@ -17,12 +18,14 @@
     @orderId,
     @orderDate,
     @customerId,
+    @ignore,
     @grandTotal,
     @shippingTotal,
     @taxTotal,
     @adjustmentsTotal,
     @currencyUomId,
     @comments,
+    @orderClosed,
     @orderTypeId,
 )
 
@@ -36,5 +39,6 @@
 tax_total = nullif(trim(@taxTotal),''),
 adjustments_total = nullif(trim(@adjustmentsTotal),''),
 grand_total = nullif(trim(@grandTotal),''),
+order_closed = nullif(trim(@orderClosed),''),
 comments = nullif(trim(@comments),'');
 

Modified: versions/0.9/trunk/src/org/opentaps/dataimport/OrderImportServices.java
===================================================================
--- versions/0.9/trunk/src/org/opentaps/dataimport/OrderImportServices.java	2007-01-30 02:28:57 UTC (rev 55)
+++ versions/0.9/trunk/src/org/opentaps/dataimport/OrderImportServices.java	2007-01-31 16:05:25 UTC (rev 56)
@@ -172,7 +172,7 @@
         orderHeaderInput.put("salesChannelEnumId", "UNKNWN_SALES_CHANNEL");
         orderHeaderInput.put("orderDate", orderDate);
         orderHeaderInput.put("entryDate", UtilDateTime.nowTimestamp());
-        orderHeaderInput.put("statusId", "ORDER_COMPLETED");
+        orderHeaderInput.put("statusId", externalOrderHeader.getBoolean("orderClosed") ? "ORDER_COMPLETED" : "ORDER_APPROVED");
         orderHeaderInput.put("currencyUom", externalOrderHeader.get("currencyUomId"));
         orderHeaderInput.put("productStoreId", productStoreId);
         orderHeaderInput.put("remainingSubTotal", new Double(0));