[OFBiz] SVN: r5897 - in trunk/applications:
accounting/script/org/ofbiz/accounting/invoice
order/script/org/ofbiz/order/order
party/script/org/ofbiz/party/communication
product/script/org/ofbiz/product/inventory
product/script/org/ofbiz/shipment/issuance
product/script/org/ofbiz/shipment/shipment
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Sun Oct 2 04:34:21 EDT 2005
Author: jonesde
Date: 2005-10-02 03:34:08 -0500 (Sun, 02 Oct 2005)
New Revision: 5897
Modified:
trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Log:
Looking for something that didn't require too much concentration, did a whole bunch of simple-method cleanups to use the new set operation and do better entity operations and other misc cleanups
Modified: trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
===================================================================
--- trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml 2005-10-02 08:33:07 UTC (rev 5896)
+++ trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml 2005-10-02 08:34:08 UTC (rev 5897)
@@ -31,14 +31,10 @@
<make-value value-name="newEntity" entity-name="Invoice"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <sequenced-id-to-env sequence-name="Invoice" env-name="invoiceId"/>
- <to-string field-name="invoiceId"/>
- <env-to-field env-name="invoiceId" map-name="newEntity"/>
- <field-to-result field-name="invoiceId" result-name="invoiceId"/>
+ <sequenced-id-to-env sequence-name="Invoice" env-name="newEntity.invoiceId"/>
+ <field-to-result field-name="newEntity.invoiceId" result-name="invoiceId"/>
+ <now-timestamp-to-env env-name="newEntity.invoiceDate"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="invoiceDate" map-name="newEntity"/>
-
<create-value value-name="newEntity"/>
</simple-method>
@@ -54,42 +50,37 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="datetimePerformed" map-name="newEntity">
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="datetimePerformed" map-name="newEntity"/>
- </if-empty>
+ <if-empty field-name="newEntity.datetimePerformed">
+ <now-timestamp-to-env env-name="newEntity.datetimePerformed"/>
+ </if-empty>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="setInvoiceStatus" short-description="Set The Invoice Status">
- <field-to-field field-name="invoiceId" map-name="parameters" to-map-name="lookupPKMap"/>
- <find-by-primary-key entity-name="Invoice" map-name="lookupPKMap" value-name="invoice"/>
-
- <field-to-field field-name="statusId" map-name="invoice" to-map-name="changeLookup" to-field-name="statusId"/>
- <field-to-field field-name="statusId" map-name="parameters" to-map-name="changeLookup" to-field-name="statusIdTo"/>
-
- <if-compare-field field-name="statusId" map-name="invoice" operator="not-equals" to-field-name="statusId" to-map-name="parameters">
- <find-by-primary-key entity-name="StatusValidChange" map-name="changeLookup" value-name="statusChange"/>
-
- <if-empty field-name="statusChange">
+ <entity-one entity-name="Invoice" value-name="invoice"/>
+
+ <if-compare-field field-name="invoice.statusId" operator="not-equals" to-field-name="parameters.statusId">
+ <entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false">
+ <field-map field-name="statusId" env-name="invoice.statusId"/>
+ <field-map field-name="statusIdTo" env-name="parameters.statusId"/>
+ </entity-one>
+
+ <if-empty field-name="statusChange">
<add-error><fail-message message="Status is not a valid change"/></add-error>
<log level="error" message="Cannot change from ${invoice.statusId} to ${parameters.statusId}"/>
<check-errors/>
</if-empty>
-
- <field-to-field field-name="statusId" map-name="parameters" to-field-name="statusId" to-map-name="invoice"/>
+
+ <set from-field="parameters.statusId" field="invoice.statusId"/>
<store-value value-name="invoice"/>
-
+
<make-value value-name="newEntity" entity-name="InvoiceStatus"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
-
- <if-empty field-name="statusDate" map-name="newEntity">
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="statusDate" map-name="newEntity"/>
- </if-empty>
-
+ <if-empty field-name="newEntity.statusDate">
+ <now-timestamp-to-env env-name="newEntity.statusDate"/>
+ </if-empty>
<create-value value-name="newEntity"/>
</if-compare-field>
</simple-method>
@@ -98,11 +89,9 @@
<make-value value-name="newEntity" entity-name="InvoiceTerm"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <sequenced-id-to-env sequence-name="InvoiceTerm" env-name="invoiceTermId"/>
- <to-string field-name="invoiceTermId"/>
- <env-to-field env-name="invoiceTermId" map-name="newEntity"/>
- <field-to-result field-name="invoiceTermId" result-name="invoiceTermId"/>
+ <sequenced-id-to-env sequence-name="InvoiceTerm" env-name="newEntity.invoiceTermId"/>
+ <field-to-result field-name="newEntity.invoiceTermId" result-name="invoiceTermId"/>
- <create-value value-name="newEntity"/>
- </simple-method>
-</simple-methods>
\ No newline at end of file
+ <create-value value-name="newEntity"/>
+ </simple-method>
+</simple-methods>
Modified: trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
===================================================================
--- trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml 2005-10-02 08:33:07 UTC (rev 5896)
+++ trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml 2005-10-02 08:34:08 UTC (rev 5897)
@@ -31,16 +31,15 @@
<check-permission permission="ORDERMGR" action="_CREATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateOrderAdjustement"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="OrderAdjustment"/>
+ <make-value entity-name="OrderAdjustment" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <sequenced-id-to-env sequence-name="OrderAdjustment" env-name="orderAdjustmentId"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="orderAdjustmentId" map-name="newEntity"/>
- <env-to-field env-name="nowTimestamp" field-name="createdDate" map-name="newEntity"/>
- <field-to-field field-name="userLoginId" map-name="userLogin" to-field-name="createdByUserLogin" to-map-name="newEntity"/>
- <field-to-result field-name="orderAdjustmentId" result-name="orderAdjustmentId"/>
+ <sequenced-id-to-env sequence-name="OrderAdjustment" env-name="newEntity.orderAdjustmentId"/>
+ <field-to-result field-name="newEntity.orderAdjustmentId" result-name="orderAdjustmentId"/>
+ <now-timestamp-to-env env-name="newEntity.createdDate"/>
+ <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
+
<create-value value-name="newEntity"/>
</simple-method>
@@ -53,14 +52,10 @@
<simple-method method-name="createNotificationLog" short-description="Log an order notification" login-required="false">
<make-value entity-name="OrderNotification" value-name="orderNotification"/>
- <sequenced-id-to-env sequence-name="OrderNotification" env-name="orderNotificationId"/>
- <env-to-field env-name="orderNotificationId" map-name="orderNotification"/>
-
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="orderNotification"/>
- <field-to-field field-name="emailType" map-name="parameters" to-map-name="orderNotification"/>
-
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="notificationDate" map-name="orderNotification"/>
+ <sequenced-id-to-env sequence-name="OrderNotification" env-name="orderNotification.orderNotificationId"/>
+ <set from-field="parameters.orderId" field="orderNotification.orderId"/>
+ <set from-field="parameters.emailType" field="orderNotification.emailType"/>
+ <now-timestamp-to-env env-name="orderNotification.notificationDate"/>
<create-value value-name="orderNotification"/>
</simple-method>
@@ -68,71 +63,65 @@
<check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderStatusFromReceipt"/></check-permission>
<check-errors/>
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="lookupPKMap"/>
- <find-by-primary-key entity-name="OrderHeader" map-name="lookupPKMap" value-name="orderHeader"/>
- <find-by-and entity-name="ShipmentReceipt" map-name="lookupPKMap" list-name="shipmentReceipts"/>
+ <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-and entity-name="ShipmentReceipt" list-name="shipmentReceipts">
+ <field-map field-name="orderId" env-name="parameters.orderId"/>
+ </entity-and>
<iterate list-name="shipmentReceipts" entry-name="receipt">
- <if-empty field-name="${receipt.orderItemSeqId}" map-name="totalsMap">
- <calculate field-name="${receipt.orderItemSeqId}" map-name="totalsMap">
- <number value="0"/>
+ <if-empty field-name="totalsMap.${receipt.orderItemSeqId}">
+ <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="Double"/>
+ </if-empty>
+ <calculate field-name="${receipt.orderItemSeqId}" map-name="totalsMap" type="Double">
+ <calcop field-name="${receipt.orderItemSeqId}" map-name="totalsMap" operator="add">
+ <calcop field-name="quantityAccepted" map-name="receipt" operator="get"/>
+ <calcop field-name="quantityRejected" map-name="receipt" operator="get"/>
+ </calcop>
</calculate>
- </if-empty>
- <calculate field-name="${receipt.orderItemSeqId}" map-name="totalsMap" type="Double">
- <calcop field-name="${receipt.orderItemSeqId}" map-name="totalsMap" operator="add">
- <calcop field-name="quantityAccepted" map-name="receipt" operator="get"/>
- <calcop field-name="quantityRejected" map-name="receipt" operator="get"/>
- </calcop>
- </calculate>
- <field-to-field field-name="orderId" map-name="receipt" to-map-name="newLookupMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="receipt" to-map-name="newLookupMap"/>
- <find-by-primary-key entity-name="OrderItem" map-name="newLookupMap" value-name="orderItem"/>
- <if-compare field-name="statusId" map-name="orderItem" operator="not-equals" value="ITEM_COMPLETED">
- <if-compare-field field-name="quantity" map-name="orderItem" operator="less-equals" to-field-name="${receipt.orderItemSeqId}" to-map-name="totalsMap" type="Double">
- <!-- update the status for the item -->
- <string-to-field field-name="statusId" map-name="orderItem" string="ITEM_COMPLETED"/>
- <store-value value-name="orderItem"/>
- <!-- create status change history -->
- <make-value entity-name="OrderStatus" value-name="newValue"/>
- <sequenced-id-to-env sequence-name="OrderStatus" env-name="orderStatusId"/>
- <env-to-field env-name="orderStatusId" map-name="newValue"/>
-
- <field-to-field field-name="orderItemSeqId" map-name="orderItem" to-map-name="newValue"/>
- <field-to-field field-name="orderId" map-name="orderItem" to-map-name="newValue"/>
- <field-to-field field-name="statusId" map-name="orderItem" to-map-name="newValue"/>
-
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="statusDatetime" map-name="newValue"/>
-
- <create-value value-name="newValue"/>
- </if-compare-field>
- </if-compare>
+ <set from-field="receipt.orderId" field="newLookupMap.orderId"/>
+ <set from-field="receipt.orderItemSeqId" field="newLookupMap.orderItemSeqId"/>
+ <find-by-primary-key entity-name="OrderItem" map-name="newLookupMap" value-name="orderItem"/>
+ <if-compare field-name="statusId" map-name="orderItem" operator="not-equals" value="ITEM_COMPLETED">
+ <if-compare-field field-name="quantity" map-name="orderItem" operator="less-equals" to-field-name="${receipt.orderItemSeqId}" to-map-name="totalsMap" type="Double">
+ <!-- update the status for the item -->
+ <set field="orderItem.statusId" value="ITEM_COMPLETED"/>
+ <store-value value-name="orderItem"/>
+ <!-- create status change history -->
+ <make-value entity-name="OrderStatus" value-name="newValue"/>
+ <sequenced-id-to-env sequence-name="OrderStatus" env-name="newValue.orderStatusId"/>
+ <set from-field="orderItem.orderItemSeqId" field="newValue.orderItemSeqId"/>
+ <set from-field="orderItem.orderId" field="newValue.orderId"/>
+ <set from-field="orderItem.statusId" field="newValue.statusId"/>
+ <now-timestamp-to-env env-name="newValue.statusDatetime"/>
+
+ <create-value value-name="newValue"/>
+ </if-compare-field>
+ </if-compare>
</iterate>
<!-- check to see if all items have been received -->
- <string-to-field string="true" field-name="allReceived"/>
- <find-by-and entity-name="OrderItem" map-name="lookupPKMap" list-name="allReturnItems"/>
+ <entity-and entity-name="OrderItem" list-name="allReturnItems">
+ <field-map field-name="orderId" env-name="parameters.orderId"/>
+ </entity-and>
+ <set value="true" field="allReceived"/>
<iterate list-name="allReturnItems" entry-name="item">
- <if-compare field-name="statusId" map-name="item" operator="not-equals" value="ITEM_RECEIVED">
- <string-to-field string="false" field-name="allReceived"/>
- </if-compare>
+ <if-compare field-name="item.statusId" operator="not-equals" value="ITEM_RECEIVED">
+ <set value="false" field="allReceived"/>
+ </if-compare>
</iterate>
<if-compare field-name="allReceived" operator="equals" value="true">
- <!-- update the order header -->
- <string-to-field field-name="statusId" map-name="orderHeader" string="ORDER_COMPLETED"/>
- <store-value value-name="orderHeader"/>
- <!-- create the status history -->
- <make-value entity-name="OrderStatus" value-name="newValue"/>
- <sequenced-id-to-env sequence-name="OrderStatus" env-name="orderStatusId"/>
- <env-to-field env-name="orderStatusId" map-name="newValue"/>
-
- <field-to-field field-name="orderId" map-name="orderHeader" to-map-name="newValue"/>
- <field-to-field field-name="statusId" map-name="orderHeader" to-map-name="newValue"/>
-
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="statusDatetime" map-name="newValue"/>
-
- <create-value value-name="newValue"/>
+ <!-- update the order header -->
+ <set field="orderHeader.statusId" value="ORDER_COMPLETED"/>
+ <store-value value-name="orderHeader"/>
+ <!-- create the status history -->
+ <make-value entity-name="OrderStatus" value-name="newValue"/>
+ <sequenced-id-to-env sequence-name="OrderStatus" env-name="newValue.orderStatusId"/>
+
+ <set from-field="orderHeader.orderId" field="newValue.orderId"/>
+ <set from-field="orderHeader.statusId" field="newValue.statusId"/>
+ <now-timestamp-to-env env-name="newValue.statusDatetime"/>
+
+ <create-value value-name="newValue"/>
</if-compare>
<!-- return the current return header status -->
Modified: trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
===================================================================
--- trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml 2005-10-02 08:33:07 UTC (rev 5896)
+++ trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml 2005-10-02 08:34:08 UTC (rev 5897)
@@ -28,46 +28,42 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
- <simple-method method-name="createCommunicationEvent" short-description="Create a CommunicationEvent">
+ <simple-method method-name="createCommunicationEvent" short-description="Create a CommunicationEvent">
<if>
<condition>
<and>
- <if-compare-field field-name="partyIdFrom" map-name="parameters" to-map-name="userLogin" to-field-name="partyId" operator="not-equals"/>
- <if-compare-field field-name="partyIdTo" map-name="parameters" to-map-name="userLogin" to-field-name="partyId" operator="not-equals"/>
+ <if-compare-field field-name="parameters.partyIdFrom" operator="not-equals" to-field-name="userLogin.partyId"/>
+ <if-compare-field field-name="parameters.partyIdTo" operator="not-equals" to-field-name="userLogin.partyId"/>
</and>
</condition>
<then>
<check-permission permission="PARTYMGR" action="_CREATE">
- <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventPermissionError"/>
+ <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventPermissionError"/>
</check-permission>
</then>
</if>
- <if-empty map-name="parameters" field-name="statusId">
- <string-to-field string="COM_ENTERED" field-name="statusId" map-name="parameters"/>
+ <if-empty field-name="parameters.statusId">
+ <set value="COM_ENTERED" field="parameters.statusId"/>
</if-empty>
- <make-value value-name="newEntity" entity-name="CommunicationEvent"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
-
- <sequenced-id-to-env sequence-name="CommunicationEvent" env-name="communicationEventId"/>
- <to-string field-name="communicationEventId"/>
- <env-to-field env-name="communicationEventId" map-name="newEntity"/>
-
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="entryDate" map-name="newEntity"/>
-
- <field-to-result field-name="communicationEventId" result-name="communicationEventId"/>
- <create-value value-name="newEntity"/>
- </simple-method>
+ <make-value value-name="newEntity" entity-name="CommunicationEvent"/>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+
+ <sequenced-id-to-env sequence-name="CommunicationEvent" env-name="newEntity.communicationEventId"/>
+ <field-to-result field-name="newEntity.communicationEventId" result-name="communicationEventId"/>
+
+ <now-timestamp-to-env env-name="newEntity.entryDate"/>
+
+ <create-value value-name="newEntity"/>
+ </simple-method>
<simple-method method-name="updateCommunicationEvent" short-description="Update a CommunicationEvent">
<check-permission permission="PARTYMGR" action="_UPDATE">
<fail-property resource="PartyUiLabels" property="PartyUpdateCommunicationEventPermissionError"/>
</check-permission>
<check-errors/>
- <field-to-field field-name="communicationEventId" map-name="parameters" to-map-name="lookupPKMap"/>
- <find-by-primary-key entity-name="CommunicationEvent" map-name="lookupPKMap" value-name="event"/>
+ <entity-one entity-name="CommunicationEvent" value-name="event"/>
<set-nonpk-fields map-name="parameters" value-name="event"/>
<store-value value-name="event"/>
</simple-method>
@@ -77,62 +73,56 @@
</check-permission>
<check-errors/>
- <field-to-field field-name="communicationEventId" map-name="parameters" to-map-name="lookupPKMap"/>
- <find-by-primary-key entity-name="CommunicationEvent" map-name="lookupPKMap" value-name="event"/>
+ <entity-one entity-name="CommunicationEvent" value-name="event"/>
<remove-value value-name="event"/>
</simple-method>
- <simple-method method-name="createCommunicationEventPurpose" short-description="Create a CommunicationEventPurpose">
- <check-permission permission="PARTYMGR" action="_CREATE">
- <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventPurposePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <make-value value-name="newEntity" entity-name="CommunicationEventPurpose"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <create-value value-name="newEntity"/>
- </simple-method>
- <simple-method method-name="removeCommunicationEventPurpose" short-description="Remove a CommunicationEventPurpose">
- <check-permission permission="PARTYMGR" action="_DELETE">
- <fail-property resource="PartyUiLabels" property="PartyRemoveCommunicationEventPurposePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <field-to-field field-name="communicationEventPrpTypId" map-name="parameters" to-map-name="lookupPKMap"/>
- <field-to-field field-name="communicationEventId" map-name="parameters" to-map-name="lookupPKMap"/>
- <find-by-primary-key entity-name="CommunicationEventPurpose" map-name="lookupPKMap" value-name="eventPurpose"/>
- <remove-value value-name="eventPurpose"/>
- </simple-method>
- <simple-method method-name="createCommunicationEventRole" short-description="Create a CommunicationEventRole">
- <check-permission permission="PARTYMGR" action="_CREATE">
- <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventRolePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <make-value value-name="newEntity" entity-name="CommunicationEventRole"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
- <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <create-value value-name="newEntity"/>
- </simple-method>
- <simple-method method-name="removeCommunicationEventRole" short-description="Remove a CommunicationEventRole">
- <check-permission permission="PARTYMGR" action="_DELETE">
- <fail-property resource="PartyUiLabels" property="PartyRemoveCommunicationEventRolePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <field-to-field field-name="communicationEventId" map-name="parameters" to-map-name="lookupPKMap"/>
- <field-to-field field-name="roleTypeId" map-name="parameters" to-map-name="lookupPKMap"/>
- <field-to-field field-name="partyId" map-name="parameters" to-map-name="lookupPKMap"/>
- <find-by-primary-key entity-name="CommunicationEventRole" map-name="lookupPKMap" value-name="eventRole"/>
- <remove-value value-name="eventRole"/>
- </simple-method>
+ <simple-method method-name="createCommunicationEventPurpose" short-description="Create a CommunicationEventPurpose">
+ <check-permission permission="PARTYMGR" action="_CREATE">
+ <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventPurposePermissionError"/>
+ </check-permission>
+ <check-errors/>
+
+ <make-value value-name="newEntity" entity-name="CommunicationEventPurpose"/>
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ </simple-method>
+ <simple-method method-name="removeCommunicationEventPurpose" short-description="Remove a CommunicationEventPurpose">
+ <check-permission permission="PARTYMGR" action="_DELETE">
+ <fail-property resource="PartyUiLabels" property="PartyRemoveCommunicationEventPurposePermissionError"/>
+ </check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="CommunicationEventPurpose" value-name="eventPurpose"/>
+ <remove-value value-name="eventPurpose"/>
+ </simple-method>
+ <simple-method method-name="createCommunicationEventRole" short-description="Create a CommunicationEventRole">
+ <check-permission permission="PARTYMGR" action="_CREATE">
+ <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventRolePermissionError"/>
+ </check-permission>
+ <check-errors/>
+
+ <make-value value-name="newEntity" entity-name="CommunicationEventRole"/>
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ </simple-method>
+ <simple-method method-name="removeCommunicationEventRole" short-description="Remove a CommunicationEventRole">
+ <check-permission permission="PARTYMGR" action="_DELETE">
+ <fail-property resource="PartyUiLabels" property="PartyRemoveCommunicationEventRolePermissionError"/>
+ </check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="CommunicationEventRole" value-name="eventRole"/>
+ <remove-value value-name="eventRole"/>
+ </simple-method>
<simple-method method-name="markEventRead" short-description="Marks a Communication Event as Read">
- <if-empty field-name="communicationEventId" map-name="parameters">
- <field-to-field field-name="messageId" map-name="parameters" to-field-name="communicationEventId" to-map-name="parameters"/>
+ <if-empty field-name="parameters.communicationEventId">
+ <set from-field="parameters.messageId" field="parameters.communicationEventId"/>
</if-empty>
- <field-to-field field-name="communicationEventId" map-name="parameters" to-map-name="lookupPKMap"/>
- <find-by-primary-key entity-name="CommunicationEvent" map-name="lookupPKMap" value-name="event"/>
+ <entity-one entity-name="CommunicationEvent" value-name="event"/>
+
<if>
<condition>
<or>
@@ -149,7 +139,7 @@
</or>
</condition>
<then>
- <string-to-field string="COM_READ" field-name="statusId" map-name="event"/>
+ <set value="COM_READ" field="event.statusId"/>
<store-value value-name="event"/>
</then>
</if>
Modified: trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
===================================================================
--- trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml 2005-10-02 08:33:07 UTC (rev 5896)
+++ trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml 2005-10-02 08:34:08 UTC (rev 5897)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
- * Copyright (c) 2002-2004 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2002-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -41,34 +41,32 @@
-->
<log level="verbose" message="Parameters : ${parameters}"/>
- <field-to-field field-name="productId" map-name="parameters" to-map-name="lookupFieldMap"/>
- <field-to-field field-name="facilityId" map-name="parameters" to-map-name="lookupFieldMap"/>
- <field-to-field field-name="containerId" map-name="parameters" to-map-name="lookupFieldMap"/>
+ <set from-field="parameters.productId" field="lookupFieldMap.productId"/>
+ <set from-field="parameters.facilityId" field="lookupFieldMap.facilityId"/>
+ <set from-field="parameters.containerId" field="lookupFieldMap.containerId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <make-value entity-name="OrderHeader" value-name="ohLookupMap"/>
- <set-pk-fields map-name="parameters" value-name="ohLookupMap"/>
- <find-by-primary-key entity-name="OrderHeader" map-name="ohLookupMap" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
<!-- before we do the find, put together the orderBy list based on which reserveOrderEnumId is specified -->
<if-compare value="INVRO_GUNIT_COST" operator="equals" field-name="reserveOrderEnumId" map-name="parameters">
- <string-to-field string="-unitCost" field-name="orderByString"/>
+ <set value="-unitCost" field="orderByString"/>
<else>
<if-compare value="INVRO_LUNIT_COST" operator="equals" field-name="reserveOrderEnumId" map-name="parameters">
- <string-to-field string="+unitCost" field-name="orderByString"/>
+ <set value="+unitCost" field="orderByString"/>
<else>
<if-compare value="INVRO_FIFO_EXP" operator="equals" field-name="reserveOrderEnumId" map-name="parameters">
- <string-to-field string="+expireDate" field-name="orderByString"/>
+ <set value="+expireDate" field="orderByString"/>
<else>
<if-compare value="INVRO_LIFO_EXP" operator="equals" field-name="reserveOrderEnumId" map-name="parameters">
- <string-to-field string="-expireDate" field-name="orderByString"/>
+ <set value="-expireDate" field="orderByString"/>
<else>
<if-compare value="INVRO_LIFO_REC" operator="equals" field-name="reserveOrderEnumId" map-name="parameters">
- <string-to-field string="+datetimeReceived" field-name="orderByString"/>
+ <set value="+datetimeReceived" field="orderByString"/>
<else>
<!-- the default reserveOrderEnumId is INVRO_FIFO_REC, ie FIFO based on date received -->
- <string-to-field string="-datetimeReceived" field-name="orderByString"/>
- <string-to-field string="INVRO_FIFO_REC" field-name="reserveOrderEnumId" map-name="parameters"/>
+ <set value="-datetimeReceived" field="orderByString"/>
+ <set value="INVRO_FIFO_REC" field="parameters.reserveOrderEnumId"/>
</else>
</if-compare>
</else>
@@ -79,9 +77,9 @@
</if-compare>
</else>
</if-compare>
- <field-to-list field-name="orderByString" list-name="orderByList"/>
+ <set field="orderByList[]" from-field="orderByString"/>
- <field-to-field field-name="quantity" map-name="parameters" to-field-name="quantityNotReserved"/>
+ <set from-field="parameters.quantity" field="parameters.quantityNotReserved"/>
<!-- first reserve against InventoryItems in FLT_PICKLOC type locations, then FLT_BULK locations, then InventoryItems with no locations -->
<find-by-and entity-name="InventoryItemAndLocation" map-name="lookupFieldMap" list-name="inventoryItemAndLocations" order-by-list-name="orderByList"/>
@@ -125,10 +123,10 @@
<if-not-empty field-name="lastNonSerInventoryItem">
<!-- subtract from quantityNotReserved from the availableToPromise of existing inventory item -->
<!-- instead of updating InventoryItem, add an InventoryItemDetail -->
- <env-to-env env-name="lastNonSerInventoryItem.inventoryItemId" to-env-name="createDetailMap.inventoryItemId"/>
- <env-to-env env-name="parameters.orderId" to-env-name="createDetailMap.orderId"/>
- <env-to-env env-name="parameters.orderItemSeqId" to-env-name="createDetailMap.orderItemSeqId"/>
- <env-to-env env-name="parameters.shipGroupSeqId" to-env-name="createDetailMap.shipGroupSeqId"/>
+ <set from-field="lastNonSerInventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
+ <set from-field="parameters.orderId" field="createDetailMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
<calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
<calcop field-name="parameters.quantityNotReserved" operator="negative"/>
</calculate>
@@ -137,9 +135,9 @@
<!-- get the promiseDatetime -->
<get-related-one value-name="lastNonSerInventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/>
- <field-to-env env-name="daysToShip" field-name="daysToShip" map-name="productFacility"/>
+ <set field="daysToShip" from-field="productFacility.daysToShip"/>
<if-empty field-name="daysToShip">
- <calculate field-name="daysToShip" type="Long"><number value="30"/></calculate>
+ <set field="daysToShip" value="30" type="Long"/>
</if-empty>
<call-bsh><![CDATA[
java.sql.Timestamp orderDate = orderHeader.getTimestamp("orderDate");
@@ -150,33 +148,32 @@
]]></call-bsh>
<!-- create or update OrderItemShipGrpInvRes record -->
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="shipGroupSeqId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="inventoryItemId" map-name="lastNonSerInventoryItem" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="reserveOrderEnumId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="parameters.quantityNotReserved" to-field-name="reserveOisgirMap.quantity"/>
- <field-to-field field-name="parameters.quantityNotReserved" to-field-name="reserveOisgirMap.quantityNotAvailable"/>
- <field-to-field field-name="reservedDatetime" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <env-to-field env-name="promisedDatetime" field-name="promisedDatetime" map-name="reserveOisgirMap"/>
+ <set from-field="parameters.orderId" field="reserveOisgirMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="reserveOisgirMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="reserveOisgirMap.shipGroupSeqId"/>
+ <set from-field="lastNonSerInventoryItem.inventoryItemId" field="reserveOisgirMap.inventoryItemId"/>
+ <set from-field="parameters.reserveOrderEnumId" field="reserveOisgirMap.reserveOrderEnumId"/>
+ <set from-field="parameters.quantityNotReserved" field="reserveOisgirMap.quantity"/>
+ <set from-field="parameters.quantityNotReserved" field="reserveOisgirMap.quantityNotAvailable"/>
+ <set from-field="parameters.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/>
+ <set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/>
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
<clear-field field-name="reserveOisgirMap"/>
<else>
<!-- no non-ser inv item, create a non-ser InventoryItem with availableToPromise = -quantityNotReserved -->
<make-value entity-name="InventoryItem" value-name="newNonSerInventoryItem"/>
- <sequenced-id-to-env sequence-name="InventoryItem" env-name="inventoryItemId"/>
- <env-to-field env-name="inventoryItemId" map-name="newNonSerInventoryItem"/>
- <field-to-field field-name="productId" map-name="parameters" to-map-name="newNonSerInventoryItem"/>
- <field-to-field field-name="facilityId" map-name="parameters" to-map-name="newNonSerInventoryItem"/>
- <field-to-field field-name="containerId" map-name="parameters" to-map-name="newNonSerInventoryItem"/>
- <string-to-field string="NON_SERIAL_INV_ITEM" field-name="inventoryItemTypeId" map-name="newNonSerInventoryItem"/>
+ <sequenced-id-to-env sequence-name="InventoryItem" env-name="newNonSerInventoryItem.inventoryItemId"/>
+ <set from-field="parameters.productId" field="newNonSerInventoryItem.productId"/>
+ <set from-field="parameters.facilityId" field="newNonSerInventoryItem.facilityId"/>
+ <set from-field="parameters.containerId" field="newNonSerInventoryItem.containerId"/>
+ <set value="NON_SERIAL_INV_ITEM" field="newNonSerInventoryItem.inventoryItemTypeId"/>
<create-value value-name="newNonSerInventoryItem"/>
<!-- also create a detail record with the quantities -->
- <env-to-env env-name="newNonSerInventoryItem.inventoryItemId" to-env-name="createDetailMap.inventoryItemId"/>
- <env-to-env env-name="parameters.orderId" to-env-name="createDetailMap.orderId"/>
- <env-to-env env-name="parameters.orderItemSeqId" to-env-name="createDetailMap.orderItemSeqId"/>
- <env-to-env env-name="parameters.shipGroupSeqId" to-env-name="createDetailMap.shipGroupSeqId"/>
+ <set from-field="newNonSerInventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
+ <set from-field="parameters.orderId" field="createDetailMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
<calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
<calcop field-name="parameters.quantityNotReserved" operator="negative"/>
</calculate>
@@ -185,9 +182,9 @@
<!-- get the promiseDatetime -->
<get-related-one value-name="newNonSerInventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/>
- <field-to-env field-name="daysToShip" map-name="productFacility" env-name="daysToShip"/>
+ <set field="daysToShip" from-field="productFacility.daysToShip"/>
<if-empty field-name="daysToShip">
- <calculate field-name="daysToShip" type="Long"><number value="30"/></calculate>
+ <set field="daysToShip" value="30" type="Long"/>
</if-empty>
<call-bsh><![CDATA[
java.sql.Timestamp orderDate = orderHeader.getTimestamp("orderDate");
@@ -198,21 +195,21 @@
]]></call-bsh>
<!-- create OrderItemShipGrpInvRes record -->
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="shipGroupSeqId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="inventoryItemId" map-name="newNonSerInventoryItem" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="reserveOrderEnumId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="quantityNotReserved" map-name="parameters" to-field-name="quantity" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="quantityNotReserved" map-name="parameters" to-field-name="quantityNotAvailable" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="reservedDatetime" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <env-to-field env-name="promisedDatetime" field-name="promisedDatetime" map-name="reserveOisgirMap"/>
+ <set from-field="parameters.orderId" field="reserveOisgirMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="reserveOisgirMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="reserveOisgirMap.shipGroupSeqId"/>
+ <set from-field="newNonSerInventoryItem.inventoryItemId" field="reserveOisgirMap.inventoryItemId"/>
+ <set from-field="parameters.reserveOrderEnumId" field="reserveOisgirMap.reserveOrderEnumId"/>
+ <set from-field="parameters.quantityNotReserved" field="reserveOisgirMap.quantity"/>
+ <set from-field="parameters.quantityNotReserved" field="reserveOisgirMap.quantityNotAvailable"/>
+ <set from-field="parameters.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/>
+ <set from-field="parameters.promisedDatetime" field="reserveOisgirMap.promisedDatetime"/>
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
<clear-field field-name="reserveOisgirMap"/>
</else>
</if-not-empty>
- <calculate field-name="quantityNotReserved" map-name="parameters"><number value="0"/></calculate>
+ <set field="parameters.quantityNotReserved" value="0" type="Double"/>
</else>
</if-compare>
</if-compare>
@@ -225,9 +222,9 @@
<if-compare field-name="parameters.quantityNotReserved" operator="greater" value="0" type="Double">
<!-- get the promiseDatetime -->
<get-related-one value-name="inventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/>
- <field-to-env env-name="daysToShip" field-name="daysToShip" map-name="productFacility"/>
+ <set field="daysToShip" from-field="productFacility.daysToShip"/>
<if-empty field-name="daysToShip">
- <calculate field-name="daysToShip" type="Long"><number value="30"/></calculate>
+ <set field="daysToShip" value="30" type="Long"/>
</if-empty>
<call-bsh><![CDATA[
java.sql.Timestamp orderDate = orderHeader.getTimestamp("orderDate");
@@ -240,18 +237,18 @@
<if-compare value="SERIALIZED_INV_ITEM" operator="equals" field-name="inventoryItemTypeId" map-name="inventoryItem">
<if-compare value="INV_AVAILABLE" operator="equals" field-name="statusId" map-name="inventoryItem">
<!-- change status on inventoryItem -->
- <string-to-field string="INV_PROMISED" field-name="statusId" map-name="inventoryItem"/>
+ <set value="INV_PROMISED" field="inventoryItem.statusId"/>
<store-value value-name="inventoryItem"/>
<!-- store OrderItemShipGrpInvRes record -->
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="shipGroupSeqId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="inventoryItemId" map-name="inventoryItem" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="reserveOrderEnumId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="reservedDatetime" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <env-to-field env-name="promisedDatetime" field-name="promisedDatetime" map-name="reserveOisgirMap"/>
- <calculate field-name="quantity" map-name="reserveOisgirMap"><number value="1"/></calculate>
+ <set from-field="parameters.orderId" field="reserveOisgirMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="reserveOisgirMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="reserveOisgirMap.shipGroupSeqId"/>
+ <set from-field="inventoryItem.inventoryItemId" field="reserveOisgirMap.inventoryItemId"/>
+ <set from-field="parameters.reserveOrderEnumId" field="reserveOisgirMap.reserveOrderEnumId"/>
+ <set from-field="parameters.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/>
+ <set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/>
+ <set field="reserveOisgirMap.quantity" value="1" type="Double"/>
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
<clear-field field-name="reserveOisgirMap"/>
@@ -265,16 +262,16 @@
<!-- reduce atp on inventoryItem if availableToPromise greater than 0, if not the code at the end of this method will handle it -->
<if-compare field-name="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double">
<if-compare-field field-name="parameters.quantityNotReserved" operator="greater" to-field-name="inventoryItem.availableToPromiseTotal" type="Double">
- <field-to-field field-name="availableToPromiseTotal" map-name="inventoryItem" to-field-name="deductAmount" to-map-name="parameters"/>
+ <set from-field="inventoryItem.availableToPromiseTotal" field="parameters.deductAmount"/>
<else>
- <field-to-field field-name="quantityNotReserved" map-name="parameters" to-field-name="deductAmount" to-map-name="parameters"/>
+ <set from-field="parameters.quantityNotReserved" field="parameters.deductAmount"/>
</else>
</if-compare-field>
<!-- instead of updating InventoryItem, add an InventoryItemDetail -->
- <env-to-env env-name="inventoryItem.inventoryItemId" to-env-name="createDetailMap.inventoryItemId"/>
- <env-to-env env-name="parameters.orderId" to-env-name="createDetailMap.orderId"/>
- <env-to-env env-name="parameters.orderItemSeqId" to-env-name="createDetailMap.orderItemSeqId"/>
+ <set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
+ <set from-field="parameters.orderId" field="createDetailMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
<calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
<calcop field-name="parameters.deductAmount" operator="negative"/>
</calculate>
@@ -282,14 +279,14 @@
<clear-field field-name="createDetailMap"/>
<!-- create OrderItemShipGrpInvRes record -->
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="shipGroupSeqId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="inventoryItemId" map-name="inventoryItem" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="reserveOrderEnumId" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="reservedDatetime" map-name="parameters" to-map-name="reserveOisgirMap"/>
- <field-to-field field-name="deductAmount" map-name="parameters" to-field-name="quantity" to-map-name="reserveOisgirMap"/>
- <env-to-field env-name="promisedDatetime" field-name="promisedDatetime" map-name="reserveOisgirMap"/>
+ <set from-field="parameters.orderId" field="reserveOisgirMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="reserveOisgirMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="reserveOisgirMap.shipGroupSeqId"/>
+ <set from-field="inventoryItem.inventoryItemId" field="reserveOisgirMap.inventoryItemId"/>
+ <set from-field="parameters.reserveOrderEnumId" field="reserveOisgirMap.reserveOrderEnumId"/>
+ <set from-field="parameters.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/>
+ <set from-field="parameters.deductAmount" field="reserveOisgirMap.quantity"/>
+ <set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/>
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
<clear-field field-name="reserveOisgirMap"/>
@@ -303,22 +300,23 @@
<!-- keep track of the last non-serialized inventory item for use if inventory is not required for purchase -->
<!-- use env variable named lastNonSerInventoryItem -->
- <env-to-env env-name="inventoryItem" to-env-name="lastNonSerInventoryItem"/>
+ <set from-field="inventoryItem" field="lastNonSerInventoryItem"/>
</if-compare>
</if-compare>
</simple-method>
<simple-method method-name="reserveOrderItemInventory" short-description="Reserve Order Item Inventory">
- <make-value entity-name="OrderItemShipGrpInvRes" value-name="newOisgirEntity"/>
- <set-pk-fields map-name="parameters" value-name="newOisgirEntity"/>
- <find-by-primary-key map-name="newOisgirEntity" value-name="checkOisgirEntity"/>
+ <entity-one entity-name="OrderItemShipGrpInvRes" value-name="checkOisgirEntity"/>
+
<if-empty field-name="checkOisgirEntity">
<!-- create OrderItemShipGrpInvRes record -->
+ <make-value entity-name="OrderItemShipGrpInvRes" value-name="newOisgirEntity"/>
+ <set-pk-fields map-name="parameters" value-name="newOisgirEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newOisgirEntity"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="newOisgirEntity.createdDatetime"/>
+ <set from-field="nowTimestamp" field="newOisgirEntity.createdDatetime"/>
<if-empty field-name="newOisgirEntity.reservedDatetime">
- <env-to-field env-name="nowTimestamp" field-name="newOisgirEntity.reservedDatetime"/>
+ <set from-field="nowTimestamp" field="newOisgirEntity.reservedDatetime"/>
</if-empty>
<create-value value-name="newOisgirEntity"/>
<else>
@@ -343,21 +341,21 @@
inventoryItem's availableToPromise quantity, or setting the status of the
corresponding serialized inventoryItem to available.
-->
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="oisgirListLookupMap"/>
- <if-not-empty field-name="orderItemSeqId" map-name="parameters">
- <field-to-field field-name="orderItemSeqId" map-name="parameters" to-map-name="oisgirListLookupMap"/>
+ <set from-field="parameters.orderId" field="oisgirListLookupMap.orderId"/>
+ <if-not-empty field-name="parameters.orderItemSeqId">
+ <set from-field="parameters.orderItemSeqId" field="oisgirListLookupMap.orderItemSeqId"/>
<log level="verbose" message="OISGIR Cancel for single item : ${oisgirListLookupMap}"/>
</if-not-empty>
- <if-not-empty field-name="shipGroupSeqId" map-name="parameters">
- <field-to-field field-name="shipGroupSeqId" map-name="parameters" to-map-name="oisgirListLookupMap"/>
+ <if-not-empty field-name="parameters.shipGroupSeqId">
+ <set from-field="parameters.shipGroupSeqId" field="oisgirListLookupMap.shipGroupSeqId"/>
<log level="verbose" message="OISGIR Cancel for single item : ${oisgirListLookupMap}"/>
</if-not-empty>
<find-by-and entity-name="OrderItemShipGrpInvRes" map-name="oisgirListLookupMap" list-name="oisgirList" use-cache="false"/>
<iterate entry-name="oisgir" list-name="oisgirList">
- <field-to-field field-name="orderId" map-name="oisgir" to-map-name="cancelOisgirMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="oisgir" to-map-name="cancelOisgirMap"/>
- <field-to-field field-name="shipGroupSeqId" map-name="oisgir" to-map-name="cancelOisgirMap"/>
- <field-to-field field-name="inventoryItemId" map-name="oisgir" to-map-name="cancelOisgirMap"/>
+ <set from-field="oisgir.orderId" field="cancelOisgirMap.orderId"/>
+ <set from-field="oisgir.orderItemSeqId" field="cancelOisgirMap.orderItemSeqId"/>
+ <set from-field="oisgir.shipGroupSeqId" field="cancelOisgirMap.shipGroupSeqId"/>
+ <set from-field="oisgir.inventoryItemId" field="cancelOisgirMap.inventoryItemId"/>
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOisgirMap"/>
</iterate>
</simple-method>
@@ -366,32 +364,32 @@
This will cancel the specified amount by looking through the reservations in order and cancelling
just the right amount
-->
- <if-empty field-name="cancelQuantity" map-name="parameters">
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="cancelMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="parameters" to-map-name="cancelMap"/>
- <field-to-field field-name="shipGroupSeqId" map-name="parameters" to-map-name="cancelMap"/>
+ <if-empty field-name="parameters.cancelQuantity">
+ <set from-field="parameters.orderId" field="cancelMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="cancelMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="cancelMap.shipGroupSeqId"/>
<call-service service-name="cancelOrderInventoryReservation" in-map-name="cancelMap"/>
</if-empty>
- <if-not-empty field-name="cancelQuantity" map-name="parameters">
- <field-to-env field-name="cancelQuantity" map-name="parameters" env-name="toCancelAmount"/>
+ <if-not-empty field-name="parameters.cancelQuantity">
+ <set from-field="parameters.cancelQuantity" field="toCancelAmount"/>
- <field-to-field field-name="orderId" map-name="parameters" to-map-name="oisgirListLookupMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="parameters" to-map-name="oisgirListLookupMap"/>
- <field-to-field field-name="shipGroupSeqId" map-name="parameters" to-map-name="oisgirListLookupMap"/>
+ <set from-field="parameters.orderId" field="oisgirListLookupMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="oisgirListLookupMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="oisgirListLookupMap.shipGroupSeqId"/>
<find-by-and entity-name="OrderItemShipGrpInvRes" map-name="oisgirListLookupMap" list-name="oisgirList" use-cache="false"/>
<iterate entry-name="oisgir" list-name="oisgirList">
<if-compare field-name="toCancelAmount" operator="greater" value="0" type="Double">
<if-compare-field field-name="oisgir.quantity" operator="greater-equals" to-field-name="toCancelAmount" type="Double">
- <env-to-env env-name="toCancelAmount" to-env-name="cancelOisgirMap.cancelQuantity"/>
+ <set from-field="toCancelAmount" field="cancelOisgirMap.cancelQuantity"/>
</if-compare-field>
<if-compare-field field-name="oisgir.quantity" operator="less" to-field-name="toCancelAmount" type="Double">
- <env-to-env env-name="oisgir.quantity" to-env-name="cancelOisgirMap.cancelQuantity"/>
+ <set from-field="oisgir.quantity" field="cancelOisgirMap.cancelQuantity"/>
</if-compare-field>
- <field-to-field field-name="orderId" map-name="oisgir" to-map-name="cancelOisgirMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="oisgir" to-map-name="cancelOisgirMap"/>
- <field-to-field field-name="shipGroupSeqId" map-name="oisgir" to-map-name="cancelOisgirMap"/>
- <field-to-field field-name="inventoryItemId" map-name="oisgir" to-map-name="cancelOisgirMap"/>
+ <set from-field="oisgir.orderId" field="cancelOisgirMap.orderId"/>
+ <set from-field="oisgir.orderItemSeqId" field="cancelOisgirMap.orderItemSeqId"/>
+ <set from-field="oisgir.shipGroupSeqId" field="cancelOisgirMap.shipGroupSeqId"/>
+ <set from-field="oisgir.inventoryItemId" field="cancelOisgirMap.inventoryItemId"/>
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOisgirMap"/>
<!-- update the toCancelAmount -->
<calculate field-name="toCancelAmount">
@@ -405,27 +403,26 @@
</simple-method>
<simple-method method-name="cancelOrderItemShipGrpInvRes" short-description="Cancel An Inventory Reservation">
<entity-one entity-name="OrderItemShipGrpInvRes" value-name="orderItemShipGrpInvRes"/>
-
<get-related-one relation-name="InventoryItem" value-name="orderItemShipGrpInvRes" to-value-name="inventoryItem"/>
- <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field-name="inventoryItemTypeId" map-name="inventoryItem">
+ <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field-name="inventoryItem.inventoryItemTypeId">
<log level="verbose" message="Serialized inventory re-enabled."/>
- <string-to-field string="INV_AVAILABLE" field-name="statusId" map-name="inventoryItem"/>
+ <set value="INV_AVAILABLE" field="inventoryItem.statusId"/>
<remove-value value-name="orderItemShipGrpInvRes"/>
<store-value value-name="inventoryItem"/>
</if-compare>
- <if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field-name="inventoryItemTypeId" map-name="inventoryItem">
+ <if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field-name="inventoryItem.inventoryItemTypeId">
<log level="verbose" message="Non-Serialized inventory item incrementing availableToPromise."/>
- <env-to-env env-name="parameters.cancelQuantity" to-env-name="cancelQuantity"/>
+ <set from-field="parameters.cancelQuantity" field="cancelQuantity"/>
<if-empty field-name="cancelQuantity">
- <env-to-env env-name="orderItemShipGrpInvRes.quantity" to-env-name="cancelQuantity"/>
+ <set from-field="orderItemShipGrpInvRes.quantity" field="cancelQuantity"/>
</if-empty>
<!-- instead of updating InventoryItem, add an InventoryItemDetail -->
- <env-to-env env-name="inventoryItem.inventoryItemId" to-env-name="createDetailMap.inventoryItemId"/>
- <env-to-env env-name="parameters.orderId" to-env-name="createDetailMap.orderId"/>
- <env-to-env env-name="parameters.orderItemSeqId" to-env-name="createDetailMap.orderItemSeqId"/>
- <env-to-env env-name="parameters.shipGroupSeqId" to-env-name="createDetailMap.shipGroupSeqId"/>
- <env-to-env env-name="cancelQuantity" to-env-name="createDetailMap.availableToPromiseDiff"/>
+ <set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
+ <set from-field="parameters.orderId" field="createDetailMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
+ <set from-field="cancelQuantity" field="createDetailMap.availableToPromiseDiff"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field-name="createDetailMap"/>
Modified: trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
===================================================================
--- trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml 2005-10-02 08:33:07 UTC (rev 5896)
+++ trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml 2005-10-02 08:34:08 UTC (rev 5897)
@@ -31,9 +31,9 @@
<!-- ItemIssuance services -->
<simple-method method-name="createItemIssuance" short-description="Create ItemIssuance">
<check-permission permission="FACILITY" action="_CREATE">
- <fail-message message="Security Error: to run createItemIssuance you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/>
+ <fail-message message="Security Error: to run createItemIssuance you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/>
</check-permission>
- <string-to-field string="Create ItemIssuance" field-name="operationName"/>
+ <set value="Create ItemIssuance" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
@@ -47,38 +47,34 @@
</simple-method>
<simple-method method-name="updateItemIssuance" short-description="Update ItemIssuance">
<check-permission permission="FACILITY" action="_UPDATE">
- <fail-message message="Security Error: to run updateItemIssuance you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
+ <fail-message message="Security Error: to run updateItemIssuance you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <string-to-field string="Update ItemIssuance" field-name="operationName"/>
+ <set value="Update ItemIssuance" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ItemIssuance"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
- <find-by-primary-key entity-name="ItemIssuance" map-name="lookupPKMap" value-name="lookedUpValue"/>
+ <entity-one entity-name="ItemIssuance" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteItemIssuance" short-description="Delete ItemIssuance">
<check-permission permission="FACILITY" action="_DELETE">
- <fail-message message="Security Error: to run deleteItemIssuance you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/>
+ <fail-message message="Security Error: to run deleteItemIssuance you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/>
</check-permission>
- <string-to-field string="Delete ItemIssuance" field-name="operationName"/>
+ <set value="Delete ItemIssuance" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ItemIssuance"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
- <find-by-primary-key entity-name="ItemIssuance" map-name="lookupPKMap" value-name="lookedUpValue"/>
+ <entity-one entity-name="ItemIssuance" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<!-- ItemIssuanceRole services -->
<simple-method method-name="createItemIssuanceRole" short-description="Create ItemIssuanceRole">
<check-permission permission="FACILITY" action="_CREATE">
- <fail-message message="Security Error: to run createItemIssuanceRole you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/>
+ <fail-message message="Security Error: to run createItemIssuanceRole you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/>
</check-permission>
- <string-to-field string="Create ItemIssuanceRole" field-name="operationName"/>
+ <set value="Create ItemIssuanceRole" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
@@ -90,21 +86,19 @@
</simple-method>
<simple-method method-name="deleteItemIssuanceRole" short-description="Delete ItemIssuanceRole">
<check-permission permission="FACILITY" action="_DELETE">
- <fail-message message="Security Error: to run deleteItemIssuanceRole you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/>
+ <fail-message message="Security Error: to run deleteItemIssuanceRole you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/>
</check-permission>
- <string-to-field string="Delete ItemIssuanceRole" field-name="operationName"/>
+ <set value="Delete ItemIssuanceRole" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ItemIssuanceRole"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
- <find-by-primary-key entity-name="ItemIssuanceRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
+ <entity-one entity-name="ItemIssuanceRole" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<!-- the actual issuance services -->
<simple-method method-name="issueOrderItemToShipment" short-description="Issue OrderItem to Shipment">
- <string-to-field string="Issue OrderItem to Shipment" field-name="operationName"/>
+ <set value="Issue OrderItem to Shipment" field="operationName"/>
<check-permission permission="FACILITY" action="_CREATE">
<fail-message message="Security Error: to run ${operationName} you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/>
</check-permission>
@@ -135,7 +129,7 @@
</simple-method>
<simple-method method-name="issueOrderItemShipGrpInvResToShipment" short-description="Issue OrderItemShipGrpInvRes to Shipment">
- <string-to-field string="Issue OrderItemShipGrpInvRes to Shipment" field-name="operationName"/>
+ <set value="Issue OrderItemShipGrpInvRes to Shipment" field="operationName"/>
<check-permission permission="FACILITY" action="_CREATE">
<fail-message message="Security Error: to run ${operationName} you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/>
</check-permission>
@@ -174,17 +168,11 @@
<check-errors/>
<!-- get orderItem -->
- <make-value entity-name="OrderItem" value-name="orderItemLookupPk"/>
- <set-pk-fields value-name="orderItemLookupPk" map-name="parameters"/>
- <find-by-primary-key map-name="orderItemLookupPk" value-name="orderItem"/>
+ <entity-one entity-name="OrderItem" value-name="orderItem"/>
<!-- get inventoryItem -->
- <make-value entity-name="InventoryItem" value-name="inventoryItemLookupPk"/>
- <set-pk-fields value-name="inventoryItemLookupPk" map-name="parameters"/>
- <find-by-primary-key map-name="inventoryItemLookupPk" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
<!-- get shipment -->
- <make-value entity-name="Shipment" value-name="shipmentLookupPk"/>
- <set-pk-fields value-name="shipmentLookupPk" map-name="parameters"/>
- <find-by-primary-key map-name="shipmentLookupPk" value-name="shipment"/>
+ <entity-one entity-name="Shipment" value-name="shipment"/>
<!-- get orderShipment -->
<make-value entity-name="OrderShipment" value-name="orderShipmentLookupPk"/>
<set-pk-fields value-name="orderShipmentLookupPk" map-name="parameters"/>
@@ -204,16 +192,16 @@
<field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
<make-value entity-name="ShipmentItem" value-name="shipmentItemLookupPk"/>
<set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/>
- <field-to-field field-name="orderShipment.shipmentItemSeqId" to-field-name="shipmentItemLookupPk.shipmentItemSeqId"/>
+ <set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
<find-by-primary-key map-name="shipmentItemLookupPk" value-name="shipmentItem"/>
<remove-value value-name="orderShipment"/>
</if-not-empty>
<if-compare value="0" operator="not-equals" field-name="qtyForShipmentItem" type="Double">
<!-- add the qtyForShipmentItem to the shipmentItem -->
- <field-to-field field-name="paremeters.quantity" to-field-name="originalQuantity"/>
- <field-to-field field-name="qtyForShipmentItem" to-field-name="paremeters.quantity"/>
+ <set from-field="paremeters.quantity" field="originalQuantity"/>
+ <set from-field="qtyForShipmentItem" field="paremeters.quantity"/>
<call-simple-method method-name="findCreateIssueShipmentItem"/>
- <field-to-field field-name="originalQuantity" to-field-name="paremeters.quantity"/>
+ <set from-field="originalQuantity" field="paremeters.quantity"/>
</if-compare>
<else>
<!-- decrement the orderShipment.quantity -->
@@ -226,7 +214,7 @@
<field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
<make-value entity-name="ShipmentItem" value-name="shipmentItemLookupPk"/>
<set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/>
- <field-to-field field-name="orderShipment.shipmentItemSeqId" to-field-name="shipmentItemLookupPk.shipmentItemSeqId"/>
+ <set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
<find-by-primary-key map-name="shipmentItemLookupPk" value-name="shipmentItem"/>
</else>
</if-compare>
@@ -248,9 +236,9 @@
<!-- if there are no more OIIRs for the orderItem, set the orderItem.statusId to ITEM_COMPLETED -->
<get-related value-name="orderItem" relation-name="OrderItemShipGrpInvRes" list-name="otherOiirs"/>
<if-empty field-name="otherOiirs">
- <string-to-field string="ITEM_COMPLETED" field-name="statusId" map-name="changeOrderItemStatusMap"/>
- <field-to-field field-name="orderId" map-name="orderItem" to-map-name="changeOrderItemStatusMap"/>
- <field-to-field field-name="orderItemSeqId" map-name="orderItem" to-map-name="changeOrderItemStatusMap"/>
+ <set value="ITEM_COMPLETED" field="changeOrderItemStatusMap.statusId"/>
+ <set from-field="orderItem.orderId" field="changeOrderItemStatusMap.orderId"/>
+ <set from-field="orderItem.orderItemSeqId" field="changeOrderItemStatusMap.orderItemSeqId"/>
<call-service service-name="changeOrderItemStatus" in-map-name="changeOrderItemStatusMap"/>
</if-empty>
<else>
@@ -260,13 +248,13 @@
<!-- Decrement InventoryItem quantityOnHand -->
<!-- instead of updating InventoryItem, add an InventoryItemDetail -->
- <env-to-env env-name="inventoryItem.inventoryItemId" to-env-name="createDetailMap.inventoryItemId"/>
- <env-to-env env-name="orderItem.orderId" to-env-name="createDetailMap.orderId"/>
- <env-to-env env-name="orderItem.orderItemSeqId" to-env-name="createDetailMap.orderItemSeqId"/>
- <env-to-env env-name="orderItemShipGrpInvRes.shipGroupSeqId" to-env-name="createDetailMap.shipGroupSeqId"/>
- <env-to-env env-name="shipmentItem.shipmentId" to-env-name="createDetailMap.shipmentId"/>
- <env-to-env env-name="shipmentItem.shipmentItemSeqId" to-env-name="createDetailMap.shipmentItemSeqId"/>
- <env-to-env env-name="itemIssuanceId" to-env-name="createDetailMap.itemIssuanceId"/>
+ <set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
+ <set from-field="orderItem.orderId" field="createDetailMap.orderId"/>
+ <set from-field="orderItem.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
+ <set from-field="orderItemShipGrpInvRes.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
+ <set from-field="shipmentItem.shipmentId" field="createDetailMap.shipmentId"/>
+ <set from-field="shipmentItem.shipmentItemSeqId" field="createDetailMap.shipmentItemSeqId"/>
+ <set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
<calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
<calcop field-name="parameters.quantity" operator="negative"/>
</calculate>
@@ -279,24 +267,25 @@
<!-- try to find an existing shipmentItem and attach to it, if none found create a new shipmentItem -->
<!-- if there is NO productId on the orderItem, ALWAYS create a new shipmentItem -->
<if-not-empty field-name="productId" map-name="orderItem">
- <field-to-field field-name="productId" map-name="orderItem" to-map-name="shipmentItemLookup"/>
- <field-to-field field-name="shipmentId" map-name="parameters" to-map-name="shipmentItemLookup"/>
- <if-not-empty field-name="paremeters.shipmentItemSeqId">
- <field-to-field field-name="shipmentItemSeqId" map-name="parameters" to-map-name="shipmentItemLookup"/>
- </if-not-empty>
- <string-to-list string="shipmentItemSeqId" list-name="shipmentItemOrder"/>
- <find-by-and entity-name="ShipmentItem" list-name="shipmentItems" map-name="shipmentItemLookup" order-by-list-name="shipmentItemOrder"/>
+ <entity-condition entity-name="ShipmentItem" list-name="shipmentItems">
+ <condition-list combine="and">
+ <condition-expr field-name="productId" env-name="orderItem.productId"/>
+ <condition-expr field-name="shipmentId" env-name="parameters.shipmentId"/>
+ <condition-expr field-name="shipmentItemSeqId" env-name="parameters.shipmentItemSeqId" ignore-if-empty="true"/>
+ </condition-list>
+ <order-by field-name="shipmentItemSeqId"/>
+ </entity-condition>
<first-from-list entry-name="shipmentItem" list-name="shipmentItems"/>
</if-not-empty>
<if-empty field-name="shipmentItem">
- <field-to-field field-name="productId" map-name="orderItem" to-map-name="shipmentItemCreate"/>
- <field-to-field field-name="shipmentId" map-name="parameters" to-map-name="shipmentItemCreate"/>
- <field-to-field field-name="quantity" map-name="parameters" to-map-name="shipmentItemCreate"/>
+ <set from-field="orderItem.productId" field="shipmentItemCreate.productId"/>
+ <set from-field="parameters.shipmentId" field="shipmentItemCreate.shipmentId"/>
+ <set from-field="parameters.quantity" field="shipmentItemCreate.quantity"/>
<call-service service-name="createShipmentItem" in-map-name="shipmentItemCreate">
<result-to-field result-name="shipmentItemSeqId" map-name="shipmentItemLookupPk"/>
</call-service>
- <field-to-field field-name="shipmentId" map-name="parameters" to-map-name="shipmentItemLookupPk"/>
+ <set from-field="parameters.shipmentId" field="shipmentItemLookupPk.shipmentId"/>
<find-by-primary-key entity-name="ShipmentItem" map-name="shipmentItemLookupPk" value-name="shipmentItem"/>
<else>
<calculate field-name="quantity" map-name="shipmentItem">
@@ -311,23 +300,23 @@
</simple-method>
<simple-method method-name="callCreateItemIssuance" short-description="Call Create ItemIssuance - meant to be called in-line">
<!-- create the ItemIssuance -->
- <field-to-field field-name="quantity" map-name="parameters" to-map-name="itemIssuanceCreate"/>
- <field-to-field field-name="shipmentId" map-name="shipmentItem" to-map-name="itemIssuanceCreate"/>
- <field-to-field field-name="shipmentItemSeqId" map-name="shipmentItem" to-map-name="itemIssuanceCreate"/>
- <field-to-field field-name="orderId" map-name="orderItem" to-map-name="itemIssuanceCreate"/>
- <field-to-field field-name="orderItemSeqId" map-name="orderItem" to-map-name="itemIssuanceCreate"/>
+ <set from-field="parameters.quantity" field="itemIssuanceCreate.quantity"/>
+ <set from-field="shipmentItem.shipmentId" field="itemIssuanceCreate.shipmentId"/>
+ <set from-field="shipmentItem.shipmentItemSeqId" field="itemIssuanceCreate.shipmentItemSeqId"/>
+ <set from-field="orderItem.orderId" field="itemIssuanceCreate.orderId"/>
+ <set from-field="orderItem.orderItemSeqId" field="itemIssuanceCreate.orderItemSeqId"/>
<if-not-empty field-name="orderItemShipGrpInvRes">
<!-- if this is coming from an OrderItem issue instead of an OrderItemShipGrpInvRes issue, we won't have this info -->
- <field-to-field field-name="inventoryItemId" map-name="orderItemShipGrpInvRes" to-map-name="itemIssuanceCreate"/>
- <field-to-field field-name="shipGroupSeqId" map-name="orderItemShipGrpInvRes" to-map-name="itemIssuanceCreate"/>
+ <set from-field="orderItemShipGrpInvRes.inventoryItemId" field="itemIssuanceCreate.inventoryItemId"/>
+ <set from-field="orderItemShipGrpInvRes.shipGroupSeqId" field="itemIssuanceCreate.shipGroupSeqId"/>
</if-not-empty>
<if-not-empty field-name="orderItemShipGroupAssoc">
<!-- If we have a ShipGroup Assoc for this Item to focus on, set that; this is mostly the case for purchase orders and such -->
- <field-to-field field-name="shipGroupSeqId" map-name="orderItemShipGroupAssoc" to-map-name="itemIssuanceCreate"/>
+ <set from-field="orderItemShipGroupAssoc.shipGroupSeqId" field="itemIssuanceCreate.shipGroupSeqId"/>
</if-not-empty>
- <field-to-field field-name="userLoginId" map-name="userLogin" to-field-name="issuedByUserLoginId" to-map-name="itemIssuanceCreate"/>
+ <set from-field="userLogin.userLoginId" field="itemIssuanceCreate.issuedByUserLoginId"/>
<call-service service-name="createItemIssuance" in-map-name="itemIssuanceCreate" >
<result-to-field result-name="itemIssuanceId"/>
</call-service>
@@ -336,17 +325,17 @@
<simple-method method-name="associateIssueRoles" short-description="Associate Roles for ItemIssuance - meant to be called in-line">
<!-- make sure the party is in the PACKER role -->
<make-value entity-name="PartyRole" value-name="partyRole"/>
- <field-to-field field-name="partyId" map-name="userLogin" to-map-name="partyRole"/>
- <string-to-field string="PACKER" field-name="roleTypeId" map-name="partyRole"/>
+ <set field="partyRole.partyId" from-field="userLogin.partyId"/>
+ <set field="partyRole.roleTypeId" value="PACKER"/>
<find-by-primary-key entity-name="PartyRole" map-name="partyRole" value-name="checkPartyRole"/>
<if-empty field-name="checkPartyRole">
<create-value value-name="partyRole"/>
</if-empty>
<!-- Add ItemIssuanceRole for party that issues this... -->
- <env-to-field env-name="itemIssuanceId" map-name="itemIssuanceRoleCreate"/>
- <field-to-field field-name="partyId" map-name="userLogin" to-map-name="itemIssuanceRoleCreate"/>
- <string-to-field string="PACKER" field-name="roleTypeId" map-name="itemIssuanceRoleCreate"/>
+ <set from-field="itemIssuanceId" field="itemIssuanceRoleCreate.itemIssuanceId"/>
+ <set from-field="userLogin.partyId" field="itemIssuanceRoleCreate.partyId"/>
+ <set value="PACKER" field="itemIssuanceRoleCreate.roleTypeId"/>
<call-service service-name="createItemIssuanceRole" in-map-name="itemIssuanceRoleCreate"/>
</simple-method>
</simple-methods>
Modified: trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
===================================================================
--- trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml 2005-10-02 08:33:07 UTC (rev 5896)
+++ trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml 2005-10-02 08:34:08 UTC (rev 5897)
@@ -43,9 +43,9 @@
<!-- set the created and lastModified info -->
<now-timestamp-to-env env-name="newEntity.createdDate"/>
- <field-to-field field-name="userLogin.userLoginId" to-field-name="newEntity.createdByUserLogin"/>
+ <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
<now-timestamp-to-env env-name="newEntity.lastModifiedDate"/>
- <field-to-field field-name="userLogin.userLoginId" to-field-name="newEntity.lastModifiedByUserLogin"/>
+ <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
<!-- if needed create some WorkEfforts and remember their IDs:
estimatedShipDate: estimatedShipWorkEffId
@@ -54,40 +54,40 @@
<!-- always create the WorkEfforts, even if dates aren't specified yet; when they are they will be set in the update service... -->
<!-- the Ship WorkEffort entity -->
- <string-to-field string="Shipment #${sequencedId} Ship" field-name="shipWorkEffortMap.workEffortName"/>
- <string-to-field string="EVENT" field-name="shipWorkEffortMap.workEffortTypeId"/>
- <string-to-field string="CAL_TENTATIVE" field-name="shipWorkEffortMap.currentStatusId" map-name=""/>
- <field-to-field field-name="parameters.estimatedShipDate" to-field-name="shipWorkEffortMap.estimatedStartDate"/>
- <field-to-field field-name="parameters.estimatedShipDate" to-field-name="shipWorkEffortMap.estimatedCompletionDate"/>
- <field-to-field field-name="parameters.originFacilityId" to-field-name="shipWorkEffortMap.facilityId"/>
- <env-to-field env-name="userLogin.partyId" field-name="quickAssignPartyId" map-name="shipWorkEffortMap"/>
+ <set value="Shipment #${sequencedId} Ship" field="shipWorkEffortMap.workEffortName"/>
+ <set value="EVENT" field="shipWorkEffortMap.workEffortTypeId"/>
+ <set value="CAL_TENTATIVE" field="shipWorkEffortMap.currentStatusId"/>
+ <set from-field="parameters.estimatedShipDate" field="shipWorkEffortMap.estimatedStartDate"/>
+ <set from-field="parameters.estimatedShipDate" field="shipWorkEffortMap.estimatedCompletionDate"/>
+ <set from-field="parameters.originFacilityId" field="shipWorkEffortMap.facilityId"/>
+ <set from-field="userLogin.partyId" field="shipWorkEffortMap.quickAssignPartyId"/>
<call-service service-name="createWorkEffort" in-map-name="shipWorkEffortMap">
- <result-to-field result-name="workEffortId" map-name="newEntity" field-name="estimatedShipWorkEffId"/>
+ <result-to-field result-name="workEffortId" field-name="newEntity.estimatedShipWorkEffId"/>
</call-service>
<if-not-empty field-name="partyIdFrom" map-name="newEntity">
- <field-to-field field-name="newEntity.estimatedShipWorkEffId" to-field-name="assignPartyToWorkEffortShip.workEffortId"/>
- <field-to-field field-name="newEntity.partyIdFrom" to-field-name="assignPartyToWorkEffortShip.partyId"/>
- <string-to-field string="CAL_ATTENDEE" field-name="assignPartyToWorkEffortShip.roleTypeId"/>
- <string-to-field string="CAL_SENT" field-name="assignPartyToWorkEffortShip.statusId"/>
+ <set from-field="newEntity.estimatedShipWorkEffId" field="assignPartyToWorkEffortShip.workEffortId"/>
+ <set from-field="newEntity.partyIdFrom" field="assignPartyToWorkEffortShip.partyId"/>
+ <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortShip.roleTypeId"/>
+ <set value="CAL_SENT" field="assignPartyToWorkEffortShip.statusId"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortShip"/>
</if-not-empty>
<!-- the Arrival WorkEffort entity -->
- <string-to-field string="Shipment #${sequencedId} Arrival" field-name="arrivalWorkEffortMap.workEffortName"/>
- <string-to-field string="EVENT" field-name="arrivalWorkEffortMap.workEffortTypeId"/>
- <string-to-field string="CAL_TENTATIVE" field-name="arrivalWorkEffortMap.currentStatusId"/>
- <field-to-field field-name="parameters.estimatedArrivalDate" to-field-name="arrivalWorkEffortMap.estimatedStartDate"/>
- <field-to-field field-name="parameters.estimatedArrivalDate" to-field-name="arrivalWorkEffortMap.estimatedCompletionDate"/>
- <field-to-field field-name="parameters.destinationFacilityId" to-field-name="arrivalWorkEffortMap.facilityId"/>
- <env-to-env env-name="userLogin.partyId" to-env-name="arrivalWorkEffortMap.quickAssignPartyId"/>
+ <set value="Shipment #${sequencedId} Arrival" field="arrivalWorkEffortMap.workEffortName"/>
+ <set value="EVENT" field="arrivalWorkEffortMap.workEffortTypeId"/>
+ <set value="CAL_TENTATIVE" field="arrivalWorkEffortMap.currentStatusId"/>
+ <set from-field="parameters.estimatedArrivalDate" field="arrivalWorkEffortMap.estimatedStartDate"/>
+ <set from-field="parameters.estimatedArrivalDate" field="arrivalWorkEffortMap.estimatedCompletionDate"/>
+ <set from-field="parameters.destinationFacilityId" field="arrivalWorkEffortMap.facilityId"/>
+ <set from-field="userLogin.partyId" field="arrivalWorkEffortMap.quickAssignPartyId"/>
<call-service service-name="createWorkEffort" in-map-name="arrivalWorkEffortMap">
<result-to-field result-name="workEffortId" field-name="newEntity.estimatedArrivalWorkEffId"/>
</call-service>
<if-not-empty field-name="partyIdTo" map-name="newEntity">
- <field-to-field field-name="newEntity.estimatedArrivalWorkEffId" to-field-name="assignPartyToWorkEffortArrival.workEffortId"/>
- <field-to-field field-name="newEntity.partyIdTo" to-field-name="assignPartyToWorkEffortArrival.partyId"/>
- <string-to-field string="CAL_ATTENDEE" field-name="assignPartyToWorkEffortArrival.roleTypeId"/>
- <string-to-field string="CAL_SENT" field-name="assignPartyToWorkEffortArrival.statusId"/>
+ <set from-field="newEntity.estimatedArrivalWorkEffId" field="assignPartyToWorkEffortArrival.workEffortId"/>
+ <set from-field="newEntity.partyIdTo" field="assignPartyToWorkEffortArrival.partyId"/>
+ <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortArrival.roleTypeId"/>
+ <set value="CAL_SENT" field="assignPartyToWorkEffortArrival.statusId"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortArrival"/>
</if-not-empty>
@@ -96,8 +96,8 @@
<!-- get the ShipmentStatus history started -->
<if-not-empty field-name="statusId" map-name="newEntity">
<make-value entity-name="ShipmentStatus" value-name="newStatusValue"/>
- <field-to-field field-name="statusId" map-name="newEntity" to-map-name="newStatusValue"/>
- <field-to-field field-name="shipmentId" map-name="newEntity" to-map-name="newStatusValue"/>
+ <set from-field="newEntity.statusId" field="newStatusValue.statusId"/>
+ <set from-field="newEntity.shipmentId" field="newStatusValue.shipmentId"/>
<now-timestamp-to-env env-name="newStatusValue.statusDate"/>
<create-value value-name="newStatusValue"/>
</if-not-empty>
@@ -106,7 +106,7 @@
<check-permission permission="FACILITY" action="_UPDATE">
<fail-message message="Security Error: to run updateShipment you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <string-to-field string="Update Shipment" field-name="operationName"/>
+ <set value="Update Shipment" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusDelivered"/>
<make-value value-name="lookupPKMap" entity-name="Shipment"/>
@@ -125,8 +125,8 @@
</if-empty>
<make-value entity-name="ShipmentStatus" value-name="newStatusValue"/>
- <field-to-field field-name="statusId" map-name="parameters" to-map-name="newStatusValue"/>
- <field-to-field field-name="shipmentId" map-name="parameters" to-map-name="newStatusValue"/>
+ <set from-field="parameters.statusId" field="newStatusValue.statusId"/>
+ <set from-field="parameters.shipmentId" field="newStatusValue.shipmentId"/>
<now-timestamp-to-env env-name="newStatusValue.statusDate"/>
<create-value value-name="newStatusValue"/>
</if-compare-field>
@@ -153,9 +153,9 @@
<entity-one entity-name="WorkEffort" value-name="estShipWe" auto-field-map="false">
<field-map field-name="workEffortId" env-name="lookedUpValue.estimatedShipWorkEffId"/>
</entity-one>
- <env-to-env env-name="parameters.estimatedShipDate" to-env-name="estShipWe.estimatedStartDate"/>
- <env-to-env env-name="parameters.estimatedShipDate" to-env-name="estShipWe.estimatedCompletionDate"/>
- <env-to-env env-name="parameters.originFacilityId" to-env-name="estShipWe.facilityId"/>
+ <set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedStartDate"/>
+ <set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedCompletionDate"/>
+ <set from-field="parameters.originFacilityId" field="estShipWe.facilityId"/>
<set-service-fields service-name="updateWorkEffort" map-name="estShipWe" to-map-name="estShipWeUpdMap"/>
<call-service service-name="updateWorkEffort" in-map-name="estShipWeUpdMap"/>
</then>
@@ -174,11 +174,11 @@
</or>
</condition>
<then>
- <field-to-field field-name="estimatedArrivalWorkEffId" map-name="lookedUpValue" to-field-name="workEffortId" to-map-name="estimatedArrivalWorkEffortMap"/>
+ <set from-field="lookedUpValue.estimatedArrivalWorkEffId" field="estimatedArrivalWorkEffortMap.workEffortId"/>
<find-by-primary-key entity-name="WorkEffort" map-name="estimatedArrivalWorkEffortMap" value-name="estimatedArrivalWorkEffort"/>
- <field-to-field map-name="parameters" field-name="estimatedArrivalDate" to-field-name="estimatedStartDate" to-map-name="estimatedArrivalWorkEffort"/>
- <field-to-field map-name="parameters" field-name="estimatedArrivalDate" to-field-name="estimatedCompletionDate" to-map-name="estimatedArrivalWorkEffort"/>
- <field-to-field map-name="parameters" field-name="destinationFacilityId" to-field-name="facilityId" to-map-name="estimatedArrivalWorkEffort"/>
+ <set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedStartDate"/>
+ <set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedCompletionDate"/>
+ <set from-field="parameters.destinationFacilityId" field="estimatedArrivalWorkEffort.facilityId"/>
<set-service-fields service-name="updateWorkEffort" map-name="estimatedArrivalWorkEffort" to-map-name="estimatedArrivalWorkEffortUpdMap"/>
<call-service service-name="updateWorkEffort" in-map-name="estimatedArrivalWorkEffortUpdMap"/>
</then>
@@ -193,13 +193,13 @@
</and>
</condition>
<then>
- <field-to-field field-name="estimatedShipWorkEffId" map-name="lookedUpValue" to-field-name="workEffortId" to-map-name="assignPartyToWorkEffortShip"/>
- <field-to-field field-name="partyIdFrom" map-name="parameters" to-field-name="partyId" to-map-name="assignPartyToWorkEffortShip"/>
+ <set from-field="lookedUpValue.estimatedShipWorkEffId" field="assignPartyToWorkEffortShip.workEffortId"/>
+ <set from-field="parameters.partyIdFrom" field="assignPartyToWorkEffortShip.partyId"/>
<find-by-and entity-name="WorkEffortPartyAssignment" list-name="existingShipWepas" map-name="assignPartyToWorkEffortShip"/>
<filter-list-by-date list-name="existingShipWepas"/>
<if-empty field-name="existingShipWepas">
- <string-to-field string="CAL_ATTENDEE" field-name="roleTypeId" map-name="assignPartyToWorkEffortShip"/>
- <string-to-field string="CAL_SENT" field-name="statusId" map-name="assignPartyToWorkEffortShip"/>
+ <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortShip.roleTypeId"/>
+ <set value="CAL_SENT" field="assignPartyToWorkEffortShip.statusId"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortShip"/>
</if-empty>
</then>
@@ -212,13 +212,13 @@
</and>
</condition>
<then>
- <field-to-field field-name="estimatedArrivalWorkEffId" map-name="lookedUpValue" to-field-name="workEffortId" to-map-name="assignPartyToWorkEffortArrival"/>
- <field-to-field field-name="partyIdTo" map-name="parameters" to-field-name="partyId" to-map-name="assignPartyToWorkEffortArrival"/>
+ <set from-field="lookedUpValue.estimatedArrivalWorkEffId" field="assignPartyToWorkEffortArrival.workEffortId"/>
+ <set from-field="parameters.partyIdTo" field="assignPartyToWorkEffortArrival.partyId"/>
<find-by-and entity-name="WorkEffortPartyAssignment" list-name="existingArrivalWepas" map-name="assignPartyToWorkEffortArrival"/>
<filter-list-by-date list-name="existingArrivalWepas"/>
<if-empty field-name="existingArrivalWepas">
- <string-to-field string="CAL_ATTENDEE" field-name="roleTypeId" map-name="assignPartyToWorkEffortArrival"/>
- <string-to-field string="CAL_SENT" field-name="statusId" map-name="assignPartyToWorkEffortArrival"/>
+ <set value="CAL_ATTENDEE" field="assignPartyToWorkEffortArrival.roleTypeId"/>
+ <set value="CAL_SENT" field="assignPartyToWorkEffortArrival.statusId"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortArrival"/>
</if-empty>
</then>
@@ -233,7 +233,7 @@
<!-- now that all changes have been checked, set the nonpks -->
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<now-timestamp-to-env env-name="lookedUpValue.lastModifiedDate"/>
- <field-to-field field-name="userLogin.userLoginId" to-field-name="lookedUpValue.lastModifiedByUserLogin"/>
+ <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -241,13 +241,11 @@
<check-permission permission="FACILITY" action="_DELETE">
<fail-message message="Security Error: to run deleteShipment you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/>
</check-permission>
- <string-to-field string="Delete Shipment" field-name="operationName"/>
+ <set value="Delete Shipment" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="Shipment"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
- <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
+ <entity-one e