Changeset 596

Timestamp:

Jun 11, 2010, 2:00:04 PM (14 years ago)

Author:

gav

Message:

Improvements to purchasing, calculate remaining value amounts.

Location:

trunk/grails-app

Files:

• controllers/InventoryItemPurchaseDetailedController.groovy (modified) (1 diff)
• services/InventoryPurchaseService.groovy (modified) (7 diffs)

trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

@@ -285 +285 @@
         def calcQuantities = inventoryPurchaseService.calcQuantities(inventoryItemPurchaseInstance)
         inventoryItemPurchaseInstance.quantity = calcQuantities.thisOrderRemaining
+        inventoryItemPurchaseInstance.orderValueAmount = calcQuantities.thisOrderRemainingAmount
         return ['inventoryItemPurchaseInstance':inventoryItemPurchaseInstance,
                         'orderId': inventoryItemPurchaseInstance.id]

trunk/grails-app/services/InventoryPurchaseService.groovy

@@ -10 +10 @@
     * Calulates the quantities for an inventoryItem and purchaseOrderNumber.
     * @param order An inventory puchase that was the source of the order.
-    * @returns A result map contianing the totalOrdered, totalReceived, totalRemaining, thisOrderRemaining.
+    * @returns A result map containing the totalOrdered, totalReceived, totalRemaining, thisOrderRemaining,
+    *                 totalOrderedAmount, totalReceivedAmount, totalRemainingAmount, thisOrderRemainingAmount.
     */
     def calcQuantities(order) {
@@ -17 +18 @@
 
         result.totalOrdered = 0
+        result.totalOrderedAmount = 0
         InventoryItemPurchase.withCriteria {
             eq("inventoryItem", order.inventoryItem)
@@ -25 +27 @@
         }.each() {
             result.totalOrdered += it.quantity
+            result.totalOrderedAmount += it.orderValueAmount
         }
 
         result.totalReceived = 0
+        result.totalReceivedAmount = 0
         InventoryItemPurchase.withCriteria {
             eq("inventoryItem", order.inventoryItem)
@@ -39 +43 @@
         }.each() {
             result.totalReceived += it.quantity
+            result.totalReceivedAmount += it.orderValueAmount
         }
 
@@ -47 +52 @@
             result.totalRemaining = 0
 
+        result.totalRemainingAmount
+        if(result.totalOrderedAmount > result.totalReceivedAmount)
+            result.totalRemainingAmount = result.totalOrderedAmount - result.totalReceivedAmount
+        else
+            result.totalRemainingAmount = 0
+
         result.thisOrderRemaining
         if(result.totalRemaining > order.quantity)
@@ -52 +63 @@
         else
             result.thisOrderRemaining = result.totalRemaining
+
+        result.thisOrderRemainingAmount
+        if(result.totalRemainingAmount > order.orderValueAmount)
+            result.thisOrderRemainingAmount = order.orderValueAmount
+        else
+            result.thisOrderRemainingAmount = result.totalRemainingAmount
 
         return result
@@ -254 +271 @@
             if(result.inventoryItemPurchaseInstance.quantity)
                 calcQuantities.totalReceived += result.inventoryItemPurchaseInstance.quantity
+            if(result.inventoryItemPurchaseInstance.orderValueAmount)
+                calcQuantities.totalReceivedAmount += result.inventoryItemPurchaseInstance.orderValueAmount
 
             if(calcQuantities.totalReceived >= calcQuantities.totalOrdered) {