[OFBiz] SVN: r4693 - in trunk/applications: order/entitydef
product/script/org/ofbiz/shipment/picklist product/servicedef
product/webapp/facility/facility
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Sat Mar 19 15:17:00 EST 2005
Author: jonesde
Date: 2005-03-19 14:16:50 -0600 (Sat, 19 Mar 2005)
New Revision: 4693
Modified:
trunk/applications/order/entitydef/entitymodel.xml
trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
trunk/applications/product/servicedef/services_picklist.xml
trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
Log:
Added flag for rush orders to OrderHeader, used in pick management stuff but not anywhere else yet; of course, can be set in WebTools (how this was tested)
Modified: trunk/applications/order/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel.xml 2005-03-19 19:26:15 UTC (rev 4692)
+++ trunk/applications/order/entitydef/entitymodel.xml 2005-03-19 20:16:50 UTC (rev 4693)
@@ -272,6 +272,7 @@
<field name="terminalId" type="id-long"></field>
<field name="transactionId" type="id-long"></field>
<field name="needsInventoryIssuance" type="indicator"></field>
+ <field name="isRushOrder" type="indicator"></field>
<field name="remainingSubTotal" type="currency-amount"></field>
<field name="grandTotal" type="currency-amount"></field>
<prim-key field="orderId"/>
Modified: trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
===================================================================
--- trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml 2005-03-19 19:26:15 UTC (rev 4692)
+++ trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml 2005-03-19 20:16:50 UTC (rev 4693)
@@ -31,6 +31,7 @@
<!-- filter on:
+ OrderHeader.orderType = SALES_ORDER
+ OrderHeader.statusId = ORDER_APPROVED
+ + OrderHeader.isRushOrder = if Y then add to rush list, still leave in other lists
+ OrderItem.statusId = ITEM_APPROVED
+ total number of orders to pick: limit to X
+ OrderItemShipGroup.shipmentMethodTypeId = group by
@@ -59,6 +60,9 @@
+ orderItemShipGrpInvRes
+ inventoryItem
+ facilityLocation (may be null)
+ Also a Map called rushOrderInfo containing lists just as defined above, but containing only data for Orders where OrderHeader.isRushOrder = Y
+ + orderReadyToPickInfoList
+ + orderNeedsStockMoveInfoList
-->
<check-permission permission="FACILITY" action="_VIEW">
@@ -70,6 +74,7 @@
<string-to-field string="SALES_ORDER" field-name="orderTypeId" map-name="orderHeaderLkpMp"/>
<string-to-field string="ORDER_APPROVED" field-name="statusId" map-name="orderHeaderLkpMp"/>
+ <if-not-empty field-name="parameters.isRushOrder"><env-to-env env-name="parameters.isRushOrder" to-env-name="orderHeaderLkpMp.isRushOrder"/></if-not-empty>
<string-to-list string="+orderDate" list-name="orderHeaderOrdLst"/><!-- oldest first -->
<find-by-and list-name="orderHeaderList" entity-name="OrderHeader" map-name="orderHeaderLkpMp" order-by-list-name="orderHeaderOrdLst"/>
@@ -194,8 +199,14 @@
</if-empty>
<if-compare field-name="needsStockMove" operator="equals" value="Y">
<field-to-list field-name="orderHeaderInfo" list-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.orderNeedsStockMoveInfoList"/>
+ <if-compare field-name="orderHeader.isRushOrder" operator="equals" value="Y">
+ <field-to-list field-name="orderHeaderInfo" list-name="rushOrderInfo.orderNeedsStockMoveInfoList"/>
+ </if-compare>
<else>
<field-to-list field-name="orderHeaderInfo" list-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.orderReadyToPickInfoList"/>
+ <if-compare field-name="orderHeader.isRushOrder" operator="equals" value="Y">
+ <field-to-list field-name="orderHeaderInfo" list-name="rushOrderInfo.orderReadyToPickInfoList"/>
+ </if-compare>
</else>
</if-compare>
<clear-field field-name="orderHeaderInfo"/>
@@ -222,6 +233,7 @@
</iterate>
<field-to-result field-name="pickMoveByShipmentMethodInfoList"/>
+ <field-to-result field-name="rushOrderInfo"/>
</simple-method>
<simple-method method-name="assembleOrderHeaderInfoInline" short-description="assembleOrderHeaderInfoInline">
Modified: trunk/applications/product/servicedef/services_picklist.xml
===================================================================
--- trunk/applications/product/servicedef/services_picklist.xml 2005-03-19 19:26:15 UTC (rev 4692)
+++ trunk/applications/product/servicedef/services_picklist.xml 2005-03-19 20:16:50 UTC (rev 4693)
@@ -33,7 +33,9 @@
<description>Gets Picklist Data</description>
<attribute name="facilityId" type="String" mode="IN" optional="false"/>
<attribute name="shipmentMethodTypeId" type="String" mode="IN" optional="true"/>
+ <attribute name="isRushOrder" type="String" mode="IN" optional="true"/>
<attribute name="pickMoveByShipmentMethodInfoList" type="List" mode="OUT" optional="true"/>
+ <attribute name="rushOrderInfo" type="Map" mode="OUT" optional="true"/>
</service>
<!-- Persisted Picklist Services -->
@@ -43,6 +45,7 @@
<attribute name="facilityId" type="String" mode="IN" optional="false"/>
<attribute name="shipmentMethodTypeId" type="String" mode="IN" optional="true"/>
<attribute name="maxNumberOfOrders" type="Long" mode="IN" optional="true"/>
+ <attribute name="isRushOrder" type="String" mode="IN" optional="true"/>
<attribute name="picklistId" type="String" mode="OUT" optional="false"/>
</service>
Modified: trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl 2005-03-19 19:26:15 UTC (rev 4692)
+++ trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl 2005-03-19 20:16:50 UTC (rev 4693)
@@ -43,6 +43,31 @@
<td><div class="tableheadtext">${uiLabelMap.ProductNeedStockMove}</div></td>
<td><div class="tableheadtext"> </div></td>
</tr>
+ <#if rushOrderInfo?has_content>
+ <#assign orderReadyToPickInfoList = rushOrderInfo.orderReadyToPickInfoList?if_exists>
+ <#assign orderNeedsStockMoveInfoList = rushOrderInfo.orderNeedsStockMoveInfoList?if_exists>
+ <#assign orderReadyToPickInfoListSize = (orderReadyToPickInfoList.size())?default(0)>
+ <#assign orderNeedsStockMoveInfoListSize = (orderNeedsStockMoveInfoList.size())?default(0)>
+ <tr>
+ <td><div class="tabletext">[Rush Orders, all Methods]</div></td>
+ <td><div class="tabletext">${orderReadyToPickInfoListSize}</div></td>
+ <td><div class="tabletext">${orderNeedsStockMoveInfoListSize}</div></td>
+ <td>
+ <div class="tabletext">
+ <#if orderReadyToPickInfoList?has_content>
+ <form method="POST" action="<@ofbizUrl>createPicklistFromOrders</@ofbizUrl>">
+ <input type="hidden" name="facilityId" value="${facilityId}"/>
+ <input type="hidden" name="isRushOrder" value="Y"/>
+ ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20" class="inputBox"/>
+ <input type="submit" value="${uiLabelMap.ProductCreatePicklist}" class="smallSubmit"/>
+ </form>
+ <#else>
+
+ </#if>
+ </div>
+ </td>
+ </tr>
+ </#if>
<#if pickMoveByShipmentMethodInfoList?has_content>
<#assign orderReadyToPickInfoListSizeTotal = 0>
<#assign orderNeedsStockMoveInfoListSizeTotal = 0>
More information about the Svn
mailing list