svn commit: r440516 - in /incubator/ofbiz/trunk/applications/product: data/ShipmentTypeData.xml script/org/ofbiz/shipment/picklist/PicklistServices.xml webapp/facility/facility/PicklistManage.ftl

[sichen]

Author: sichen
Date: Tue Sep  5 15:38:14 2006
New Revision: 440516

URL: http://svn.apache.org/viewvc?view=rev&rev=440516
Log:
Added a new status for picklists of PACKED, so when picklists are PICKED but not PACKED, the Manage Picklists screen will show a list of links to pack each order on the picklist

Modified:
    incubator/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
    incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl

Modified: incubator/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml?view=diff&rev=440516&r1=440515&r2=440516
==============================================================================
--- incubator/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml (original)
+++ incubator/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml Tue Sep  5 15:38:14 2006
@@ -91,9 +91,11 @@
     <StatusItem description="Input" sequenceId="01" statusCode="INPUT" statusId="PICKLIST_INPUT" statusTypeId="PICKLIST_STATUS"/>
     <StatusItem description="Assigned" sequenceId="02" statusCode="ASSIGNED" statusId="PICKLIST_ASSIGNED" statusTypeId="PICKLIST_STATUS"/>
     <StatusItem description="Picked" sequenceId="03" statusCode="PICKED" statusId="PICKLIST_PICKED" statusTypeId="PICKLIST_STATUS"/>
+    <StatusItem description="Packed" sequenceId="04" statusCode="PACKED" statusId="PICKLIST_PACKED" statusTypeId="PICKLIST_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="PICKLIST_CANCELLED" statusTypeId="PICKLIST_STATUS"/>
     <StatusValidChange condition="" statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_ASSIGNED" transitionName="Assign"/>
     <StatusValidChange condition="" statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
+    <StatusValidChange condition="" statusId="PICKLIST_PICKED" statusIdTo="PICKLIST_PACKED" transitionName="Pack"/>
     <StatusValidChange condition="" statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
     <StatusValidChange condition="" statusId="PICKLIST_ASSIGNED" statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
     <StatusValidChange condition="" statusId="PICKLIST_ASSIGNED" statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>

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?view=diff&rev=440516&r1=440515&r2=440516
==============================================================================
--- 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 Tue Sep  5 15:38:14 2006
@@ -703,7 +703,6 @@
         <entity-condition entity-name="Picklist" list-name="picklistList">
             <condition-list combine="and">
                 <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/>
-                <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
                 <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
             </condition-list>
             <order-by field-name="picklistDate"/>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?view=diff&rev=440516&r1=440515&r2=440516
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl Tue Sep  5 15:38:14 2006
@@ -93,8 +93,12 @@
                     <div class="tabletext" style="margin-left: 15px;">
                         <b>${uiLabelMap.ProductBinNum}</b> ${picklistBinInfo.picklistBin.binLocationNumber}
                         <#if picklistBinInfo.primaryOrderHeader?exists><b>${uiLabelMap.ProductPrimaryOrderId}</b> ${picklistBinInfo.primaryOrderHeader.orderId}</#if>
-                        <#if picklistBinInfo.primaryOrderItemShipGroup?exists><b>${uiLabelMap.ProductPrimaryShipGroupSeqId}</b> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
+                        <#if picklistBinInfo.primaryOrderItemShipGroup?exists && picklistInfo.statusItem.statusId.equals("PICKLIST_PICKED")>
+                            <b>${uiLabelMap.ProductPrimaryShipGroupSeqId}</b> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}
+                            <a href="<@ofbizUrl>PackOrder?facilityId=${facilityId?if_exists}&orderId=${picklistBinInfo.primaryOrderHeader.orderId}&shipGroupSeqId=${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductPackOrder}</a>
+                        </#if>
                     </div>
+                    <#if picklistInfo.statusItem.statusId.equals("PICKLIST_INPUT")>
                     <div class="tabletext" style="margin-left: 30px;">
                         <b>${uiLabelMap.CommonUpdate} ${uiLabelMap.ProductBinNum}:</b>
                         <form method="post" action="<@ofbizUrl>updatePicklistBin</@ofbizUrl>" style="display: inline;">
@@ -112,6 +116,7 @@
                             <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
                         </form>
                     </div>
+                    </#if>
                     <#list picklistBinInfo.picklistItemInfoList?if_exists as picklistItemInfo>
                         <#assign picklistItem = picklistItemInfo.picklistItem>
                         <#assign inventoryItemAndLocation = picklistItemInfo.inventoryItemAndLocation>