svn commit: r438687 - /incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml

[sichen]

Author: sichen
Date: Wed Aug 30 15:31:54 2006
New Revision: 438687

URL: http://svn.apache.org/viewvc?rev=438687&view=rev
Log:
changed conditions of picklists so that previous picked items which have not been completely shipped can be picked again once the previous picklist is marked PICKED

Modified:
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=438687&r1=438686&r2=438687&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Wed Aug 30 15:31:54 2006
@@ -128,13 +128,19 @@
                         <iterate entry-name="orderItemShipGrpInvRes" list-name="orderItemShipGrpInvResList">
                             <if-compare field-name="pickThisOrder" operator="equals" value="Y">
                                 <get-related-one value-name="orderItemShipGrpInvRes" relation-name="InventoryItem" to-value-name="inventoryItem"/>
-                                <!-- We are using entity-condition instead of get-related because we want to exclude cancelled picklists -->
+                                <!-- Look for other picklists which might include this order item ship group inventory reservation.  If it is on another picklist, then
+                                    we should not include it again.  We screen out picklists which are either cancelled or picked, so that we can re-pick items if
+                                    (1) the previous picklist was cancelled, or
+                                    (2) the previous picklist was picked, and there is still an OrderItemShipGrpInvRes, which means that some of the order item must not
+                                    have shipped yet.  (OrderItemShipGrpInvRes is removed when an order item has been fully shipped.
+                                    We are using entity-condition instead of get-related because we want to exclude some picklists by status -->
                                 <entity-condition entity-name="PicklistAndBinAndItem" list-name="picklistItemList">
                                     <condition-list combine="and">
                                         <condition-expr field-name="orderId" env-name="orderItemShipGrpInvRes.orderId"/>
                                         <condition-expr field-name="shipGroupSeqId" env-name="orderItemShipGrpInvRes.shipGroupSeqId"/>
                                         <condition-expr field-name="orderItemSeqId" env-name="orderItemShipGrpInvRes.orderItemSeqId"/>
                                         <condition-expr field-name="inventoryItemId" env-name="orderItemShipGrpInvRes.inventoryItemId"/>
+                                        <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
                                         <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
                                     </condition-list>
                                 </entity-condition>