svn commit: r496781 - in /ofbiz/trunk/applications/product/servicedef: secas_shipment.xml services_picklist.xml services_shipment.xml

[jaz-3]

Author: jaz
Date: Tue Jan 16 09:22:00 2007
New Revision: 496781

URL: http://svn.apache.org/viewvc?view=rev&rev=496781
Log:
updated picking and packing service definitions and ecas

Modified:
    ofbiz/trunk/applications/product/servicedef/secas_shipment.xml
    ofbiz/trunk/applications/product/servicedef/services_picklist.xml
    ofbiz/trunk/applications/product/servicedef/services_shipment.xml

Modified: ofbiz/trunk/applications/product/servicedef/secas_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/secas_shipment.xml?view=diff&rev=496781&r1=496780&r2=496781
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/secas_shipment.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/secas_shipment.xml Tue Jan 16 09:22:00 2007
@@ -22,8 +22,7 @@
     <eca service="updateShipment" event="commit">
         <condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/>
         <condition field-name="statusId" operator="equals" value="SHIPMENT_PACKED"/>
-        <condition field-name="shipmentTypeId" operator="equals" value="SALES_SHIPMENT"/>
-        <action service="prepareShipmentStaging" mode="sync"/>
+        <condition field-name="shipmentTypeId" operator="equals" value="SALES_SHIPMENT"/>        
         <action service="createInvoicesFromShipment" mode="sync"/>        
     </eca>
 
@@ -107,4 +106,16 @@
         <condition field-name="shipmentPackageSeqId" operator="equals" value="New"/>
         <action service="createShipmentPackage" mode="sync"/>
     </eca>
+
+    <!-- picking ecas -->
+    <eca service="updatePicklistItem" event="commit">
+        <condition-field field-name="itemStatusId" operator="not-equals" to-field-name="oldItemStatusId"/>
+        <action service="checkPicklistBinItemStatuses" mode="sync"/>
+    </eca>
+
+    <!-- packing ecas -->
+    <eca service="packBulkItems" event="commit">
+        <condition field-name="nextPackageSeq" operator="equals" value="0"/>
+        <action service="setNextPackageSeq" mode="sync"/>
+    </eca>        
 </service-eca>

Modified: ofbiz/trunk/applications/product/servicedef/services_picklist.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_picklist.xml?view=diff&rev=496781&r1=496780&r2=496781
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_picklist.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_picklist.xml Tue Jan 16 09:22:00 2007
@@ -117,6 +117,11 @@
         <description>Delete PicklistBin</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
+    <service name="checkPicklistBinItemStatuses" default-entity-name="PicklistBin" engine="simple"
+            location="org/ofbiz/shipment/picklist/PicklistServices.xml" invoke="checkPicklistBinItemStatuses" auth="true">
+        <description>Update Picklist based on Item Status</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
 
     <!-- PicklistItem -->
     <service name="createPicklistItem" default-entity-name="PicklistItem" engine="simple"
@@ -129,12 +134,19 @@
             location="org/ofbiz/shipment/picklist/PicklistServices.xml" invoke="updatePicklistItem" auth="true">
         <description>Update PicklistItem</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <attribute name="oldItemStatusId" type="String" mode="OUT" optional="true"/>
     </service>
     <service name="deletePicklistItem" default-entity-name="PicklistItem" engine="simple"
             location="org/ofbiz/shipment/picklist/PicklistServices.xml" invoke="deletePicklistItem" auth="true">
         <description>Delete PicklistItem</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="setPicklistItemToComplete" default-entity-name="PicklistItem" engine="simple"
+            location="org/ofbiz/shipment/picklist/PicklistServices.xml" invoke="setPicklistItemToComplete" auth="true">
+        <description>Update PicklistItem's Status to COMPLETE</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="false"/>
     </service>
 
     <!-- PicklistRole -->

Modified: ofbiz/trunk/applications/product/servicedef/services_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipment.xml?view=diff&rev=496781&r1=496780&r2=496781
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_shipment.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_shipment.xml Tue Jan 16 09:22:00 2007
@@ -89,22 +89,7 @@
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <attribute name="shipmentId" type="String" mode="OUT" optional="false"/>
     </service>
-
-    <service name="prepareShipmentStaging" engine="java"
-            location="org.ofbiz.shipment.shipment.ShipmentServices" invoke="fillShipmentStagingTables" auth="true">
-        <description>Prepares the shipment ODBC staging tables</description>
-        <attribute name="shipmentId" type="String" mode="IN" optional="false"/>
-    </service>
-    <service name="updateShipmentFromStaging" engine="java" transaction-timeout="7200"
-            location="org.ofbiz.shipment.shipment.ShipmentServices" invoke="updateShipmentsFromStaging" auth="true">
-        <description>Reads the ODBC tables and updates the shipments which have call back records.</description>
-    </service>
-    <service name="clearShipmentStaging" engine="java"
-            location="org.ofbiz.shipment.shipment.ShipmentServices" invoke="clearShipmentStagingInfo" auth="true">
-        <description>Clears the shipment ODBC staging tables</description>
-        <attribute name="shipmentId" type="String" mode="IN" optional="false"/>
-    </service>
-
+    
     <service name="createShipment" default-entity-name="Shipment" engine="simple"
             location="org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="createShipment" auth="true">
         <description>Create Shipment</description>
@@ -379,6 +364,7 @@
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="true"/>
         <attribute name="quantity" type="Double" mode="IN" optional="true"/>
         <attribute name="packageSeq" type="Integer" mode="IN" optional="false"/>
+        <attribute name="pickerPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="handlingInstructions" type="String" mode="IN" optional="true"/>
     </service>
     <service name="packBulkItems" engine="java"
@@ -387,7 +373,10 @@
         <attribute name="packingSession" type="org.ofbiz.shipment.packing.PackingSession" mode="IN" optional="false"/>
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
+        <attribute name="updateQuantity" type="Boolean" mode="IN" optional="true"/>
+        <attribute name="pickerPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="handlingInstructions" type="String" mode="IN" optional="true"/>
+        <attribute name="nextPackageSeq" type="Integer" mode="INOUT" optional="true"/>
         <attribute name="prdInfo" type="Map" string-map-prefix="prd_" mode="IN" optional="true"/>
         <attribute name="qtyInfo" type="Map" string-map-prefix="qty_" mode="IN" optional="true"/>
         <attribute name="pkgInfo" type="Map" string-map-prefix="pkg_" mode="IN" optional="true"/>
@@ -406,6 +395,12 @@
         <description>Clear the current packing session</description>
         <attribute name="packingSession" type="org.ofbiz.shipment.packing.PackingSession" mode="IN" optional="false"/>
     </service>
+    <service name="clearLastPackage" engine="java"
+            location="org.ofbiz.shipment.packing.PackingServices" invoke="clearLastPackage" auth="true">
+        <description>Clears the last package in the packing session</description>
+        <attribute name="packingSession" type="org.ofbiz.shipment.packing.PackingSession" mode="IN" optional="false"/>
+        <attribute name="nextPackageSeq" type="Integer" mode="OUT" optional="false"/>
+    </service>
     <service name="clearPackLine" engine="java"
             location="org.ofbiz.shipment.packing.PackingServices" invoke="clearPackLine" auth="true">
         <description>Clear a single line from the current packing session</description>
@@ -422,6 +417,7 @@
         <description>Complete the packging set the shipment to PACKED</description>
         <attribute name="packingSession" type="org.ofbiz.shipment.packing.PackingSession" mode="IN" optional="false"/>
         <attribute name="handlingInstructions" type="String" mode="IN" optional="true"/>
+        <attribute name="pickerPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="forceComplete" type="Boolean" mode="IN" optional="true"/>
         <attribute name="shipmentId" type="String" mode="OUT" optional="false"/>
     </service>