Author: nmalin
Date: Fri Apr 12 08:03:16 2019
New Revision: 1857374
URL: http://svn.apache.org/viewvc?rev=1857374&view=rev
Log:
Fixed: clean deprecated code after release 18.12 creation
(OFBIZ-10761)
Remove unused minilang function, announced deprecated since 2005
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1857374&r1=1857373&r2=1857374&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
Fri Apr 12 08:03:16 2019
@@ -1403,150 +1403,6 @@ under the License.
<get-related value-field="picklist"
relation-name="StatusValidChangeToDetail" order-by-list="orderBy"
list="picklistInfo.statusValidChangeToDetailList"/>
</simple-method>
-
-<!-- ================================================== -->
-<!-- ================================================== -->
-<!-- DEJ20050317 These methods are no longer used, but are here temporarily
for reference. -->
-<!-- ================================================== -->
-<!-- ================================================== -->
- <simple-method method-name="getPicklistData" short-description="Get
Picklist Data">
- <!--
- Parameters:
- facilityId
- shipmentMethodTypeId
- maxNumberOfOrders
- Returns:
- facilityLocationInfoList: List of Maps with facilityLocation,
productInfoList, being a List of Maps with product, quantity,
inventoryItemList, orderItemList
- inventoryItemInfoList: List of Maps with inventoryItem,
facilityLocation, orderItems, product, statusItem, quantity
- orderHeaderInfoList: List of Maps with orderHeader,
orderItemShipGroup and orderItemInfoList which is List of Maps with orderItem,
product and orderItemShipGrpInvResList
- wrongQuantityReservedList: List of Maps with reservedQuantity
and orderItem
- insufficientQohList: List of Maps with inventoryItem and
quantityNeeded
- -->
-
- <check-permission permission="FACILITY" action="_VIEW">
- <fail-property resource="ProductUiLabels"
property="ProductFacilityViewPermissionError"/>
- </check-permission>
- <check-permission permission="FACILITY" action="_UPDATE">
- <fail-property resource="ProductUiLabels"
property="ProductFacilityUpdatePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <now-timestamp field="nowTimestamp"/>
-
- <set-service-fields map="parameters"
service-name="findOrdersToPickMove" to-map="findOrdersToPickMoveMap"/>
- <call-service service-name="findOrdersToPickMove"
in-map-name="findOrdersToPickMoveMap">
- <result-to-field result-name="pickMoveInfoList"/>
- </call-service>
-
- <!-- This creates orderHeaderInfoList, wrongQuantityReservedList,
insufficientQohList and inventoryItems, inventoryItemOrderItems,
inventoryItemQuantities -->
- <call-simple-method method-name="assembleOrderHeaderInfoInline"/>
-
- <!-- This creates facilityLocationInfoList and inventoryItemInfoList
-->
- <call-simple-method method-name="assembleFacilityLocationInfoInline"/>
-
- <field-to-result field="orderHeaderInfoList"/>
- <field-to-result field="wrongQuantityReservedList"/>
- <field-to-result field="insufficientQohList"/>
-
- <field-to-result field="facilityLocationInfoList"/>
- <field-to-result field="inventoryItemInfoList"/>
- </simple-method>
- <simple-method method-name="assembleFacilityLocationInfoInline"
short-description="assembleFacilityLocationInfoInline">
- <!-- This uses inventoryItems, inventoryItemOrderItems,
inventoryItemQuantities -->
- <!-- This creates facilityLocationInfoList and inventoryItemInfoList
(and for internal use facilityLocationMap) -->
-
- <!-- go through all quantities and get inventoryItem and
facilityLocation -->
- <iterate-map key="inventoryItemId" value="quantityNeeded"
map="inventoryItemQuantities">
- <set from-field="inventoryItems[inventoryItemId]"
field="inventoryItem"/>
-
- <!-- create a list of locations, then sort it, will have to create
a reverse Map to go from location to inventory item -->
- <clear-field field="facilityLocation"/>
- <get-related-one value-field="inventoryItem"
relation-name="FacilityLocation" to-value-field="facilityLocation"/>
- <if-not-empty field="facilityLocation">
- <set from-field="facilityLocation"
field="facilityLocationMap[facilityLocation.locationSeqId]"/>
- <!-- support multiple invnetoryItemIds per
facilityLocation.locationSeqId -->
- <clear-field field="inventoryItemIdList"/>
- <set
from-field="inventoryItemsByLocation[facilityLocation.locationSeqId]"
field="inventoryItemIdList"/>
- <set from-field="inventoryItemId"
field="inventoryItemIdList[]"/>
- <set from-field="inventoryItemIdList"
field="inventoryItemsByLocation[facilityLocation.locationSeqId]"/>
- <else>
- <set from-field="inventoryItemId"
field="noLocationInventoryItemIds[]"/>
- </else>
- </if-not-empty>
- </iterate-map>
-
- <!-- make a facilityLocations List from the facilityLocationMap, which
was used to guarantee uniqueness -->
- <iterate-map map="facilityLocationMap" key="locationSeqId"
value="facilityLocation">
- <set from-field="facilityLocation" field="facilityLocations[]"/>
- </iterate-map>
-
- <!-- order the facilityLocations -->
- <set value="+areaId" field="facilityLocsOrdLst[]"/>
- <set value="+aisleId" field="facilityLocsOrdLst[]"/>
- <set value="+sectionId" field="facilityLocsOrdLst[]"/>
- <set value="+levelId" field="facilityLocsOrdLst[]"/>
- <set value="+positionId" field="facilityLocsOrdLst[]"/>
- <order-value-list list="facilityLocations"
order-by-list="facilityLocsOrdLst"/>
-
- <!-- for each facility location add an entry to the
inventoryItemInfoList -->
- <iterate list="facilityLocations" entry="facilityLocation">
- <!-- facilityLocationInfoList: facilityLocation, productInfoList
(product, quantity, inventoryItemList, orderItemList) -->
- <clear-field field="facilityLocationInfo"/>
- <set from-field="facilityLocation"
field="facilityLocationInfo.facilityLocation"/>
-
- <!-- inventoryItemInfoList: facilityLocation, inventoryItem,
orderItems, quantity, product, statusItems -->
- <set
from-field="inventoryItemsByLocation[facilityLocation.locationSeqId]"
field="inventoryItemIdList"/>
- <iterate list="inventoryItemIdList" entry="inventoryItemId">
- <clear-field field="inventoryItemInfo"/>
- <set from-field="facilityLocation"
field="inventoryItemInfo.facilityLocation"/>
- <set from-field="inventoryItems[inventoryItemId]"
field="inventoryItemInfo.inventoryItem"/>
- <set from-field="inventoryItemOrderItems[inventoryItemId]"
field="inventoryItemInfo.orderItems"/>
- <set from-field="inventoryItemQuantities[inventoryItemId]"
field="inventoryItemInfo.quantity"/>
- <get-related-one value-field="inventoryItemInfo.inventoryItem"
relation-name="Product" to-value-field="inventoryItemInfo.product"/>
- <get-related-one value-field="inventoryItemInfo.inventoryItem"
relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/>
-
- <field-to-list field="inventoryItemInfo"
list="inventoryItemInfoList"/>
-
- <!-- before destroying inventoryItemInfo, add info to the
productInfoMap -->
- <set from-field="inventoryItemInfo.product"
field="productInfoMap.${inventoryItemInfo.product.productId}.product"/>
- <calculate
field="productInfoMap.${inventoryItemInfo.product.productId}.quantity">
- <calcop operator="get"
field="productInfoMap.${inventoryItemInfo.product.productId}.quantity"/>
- <calcop operator="get" field="inventoryItemInfo.quantity"/>
- </calculate>
- <set from-field="inventoryItemInfo.inventoryItem"
field="productInfoMap.${inventoryItemInfo.product.productId}.inventoryItemList[]"/>
- <!-- put orderItems in Map by orderId:orderItemSeqId to make
sure they are unique -->
- <iterate list="inventoryItemInfo.orderItems" entry="orderItem">
- <set from-field="orderItem"
field="orderItemMap.${orderItem.orderId}:${orderItem.orderItemSeqId}"/>
- </iterate>
- </iterate>
-
- <iterate-map key="orderItemCompositeId" value="orderItem"
map="orderItemMap">
- <set from-field="orderItem"
field="productInfoMap.${orderItem.productId}.orderItemList[]"/>
- </iterate-map>
-
- <!-- move all values from productInfoMap to
facilityLocationInfo.productInfoList -->
- <iterate-map key="productId" value="productInfo"
map="productInfoMap">
- <set from-field="productInfo"
field="facilityLocationInfo.productInfoList[]"/>
- </iterate-map>
-
- <set from-field="facilityLocationInfo"
field="facilityLocationInfoList[]"/>
- <clear-field field="orderItemMap"/>
- <clear-field field="productInfoMap"/>
- </iterate>
-
- <!-- add all noLocationInventoryItemIds to inventoryItemInfoList with
all entries except facilityLocation -->
- <iterate list="noLocationInventoryItemIds" entry="inventoryItemId">
- <set from-field="inventoryItems${inventoryItemId}"
field="inventoryItemInfo.inventoryItem"/>
- <set from-field="inventoryItemOrderItems[inventoryItemId]"
field="inventoryItemInfo.orderItems"/>
- <set from-field="inventoryItemQuantities[inventoryItemId]"
field="inventoryItemInfo.quantity"/>
- <get-related-one value-field="inventoryItemInfo.inventoryItem"
relation-name="Product" to-value-field="inventoryItemInfo.product"/>
- <get-related-one value-field="inventoryItemInfo.inventoryItem"
relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/>
-
- <set from-field="inventoryItemInfo"
field="inventoryItemInfoList[]"/>
- <clear-field field="inventoryItemInfo"/>
- </iterate>
- </simple-method>
-
<!-- special method to check update the picklist status from the item
status -->
<simple-method method-name="checkPicklistBinItemStatuses"
short-description="Checks the item status and updates the pick list status">
<!-- find the picklist bin -->
