Changeset 891 for branches/features/purchaseOrders/grails-app/services

Timestamp:

Apr 21, 2011, 3:29:47 PM (14 years ago)

Author:

gav

Message:

Purchase Order first draft as per ticket #30, by John Yesberg.

Location:

branches/features/purchaseOrders/grails-app/services

Files:

• CreateDataService.groovy (modified) (3 diffs)
• InventoryItemService.groovy (modified) (1 diff)
• InventoryPurchaseService.groovy (modified) (7 diffs)
• PurchaseOrderService.groovy (added)

branches/features/purchaseOrders/grails-app/services/CreateDataService.groovy

@@ -89 +89 @@
         createBaseEntryTypes()
 
+
         // Record that data has been created.
         appConfigService.set("baseDataCreated")
@@ -144 +145 @@
 //         createDemoMaintenanceActions()
         createDemoTaskRecurringSchedules()
+
+        // PurchaseOrderNumbers
+        createDemoPurchaseOrderNumbers()
 
         // Record that data has been created.
@@ -1736 +1740 @@
     }
 
+    def createDemoPurchaseOrderNumbers() {
+        for (int i=10000; i<10100; i++) {
+            saveAndTest(new PurchaseOrderNumber(value:"P${i}"))
+        }
+    }
+
     /**
     * SearchableIndex and mirroring is disabled at startup.

branches/features/purchaseOrders/grails-app/services/InventoryItemService.groovy

@@ -63 +63 @@
                 }
                 else {
-                    order('purchaseOrderNumber', 'desc')
+                    order('purchaseOrder', 'desc')
                     order('id', 'asc')
                 }

branches/features/purchaseOrders/grails-app/services/InventoryPurchaseService.groovy

@@ -6 +6 @@
     def dateUtilService
     def inventoryMovementService
+    def purchaseOrderService
 
     /**
@@ -23 +24 @@
         result.totalReceivedAmount = 0
         result.totalPaymentApproved = 0
-        InventoryItemPurchase.withCriteria {
-            eq("inventoryItem", order.inventoryItem)
-            eq("purchaseOrderNumber", order.purchaseOrderNumber)
-        }.each() {
+        def purchaseOrder = order.purchaseOrder
+        def relevantLineItems = purchaseOrder.inventoryItemPurchases.findAll{it.inventoryItem == order.inventoryItem}
+//        InventoryItemPurchase.withCriteria {
+//            eq("inventoryItem", order.inventoryItem)
+//            eq("purchaseOrderNumber", order.purchaseOrderNumber)
+//        }.each() {
+        relevantLineItems.each {
             if(it.inventoryItemPurchaseType.id == 1L) { // Orders.
                 result.totalOrdered += it.quantity
@@ -77 +81 @@
 
         namedParams.inventoryItem = inventoryItemPurchase.inventoryItem
-        namedParams.purchaseOrderNumber = inventoryItemPurchase.purchaseOrderNumber
+        namedParams.purchaseOrder = inventoryItemPurchase.purchaseOrder
         namedParams.orderPlaced = InventoryItemPurchaseType.read(1)
 
         def order = InventoryItemPurchase.find("from InventoryItemPurchase as p \
                                                                                 where( p.inventoryItem = :inventoryItem \
-                                                                                            and p.purchaseOrderNumber = :purchaseOrderNumber \
+                                                                                            and p.purchaseOrder = :purchaseOrder \
                                                                                             and p.inventoryItemPurchaseType = :orderPlaced )",
                                                                             namedParams)
@@ -322 +326 @@
 
             result.inventoryItemPurchaseInstance = new InventoryItemPurchase(params)
-            result.inventoryItemPurchaseInstance.purchaseOrderNumber = result.inventoryItemPurchaseInstance.purchaseOrderNumber.trim()
+            result.inventoryItemPurchaseInstance.purchaseOrder = purchaseOrderService.getOrCreatePurchaseOrder(params)
             result.inventoryItemPurchaseInstance.enteredBy = authService.currentUser
             result.inventoryItemPurchaseInstance.inventoryItemPurchaseType = InventoryItemPurchaseType.read(1) // Order
@@ -344 +348 @@
 
         } // end withTransaction
-    } // save()
+    }  // save()
 
     def receiveSave(params) {
@@ -363 +367 @@
             result.orderId = order.id
 
+            def purchaseOrderNumber = PurchaseOrderNumber.findByValue(order.purchaseOrderNumber)
+            def purchaseOrder = purchaseOrderNumber.purchaseOrder
+
             result.inventoryItemPurchaseInstance = new InventoryItemPurchase(params)
             result.inventoryItemPurchaseInstance.enteredBy = authService.currentUser
-            result.inventoryItemPurchaseInstance.purchaseOrderNumber = order.purchaseOrderNumber
+            result.inventoryItemPurchaseInstance.purchaseOrder = purchaseOrder
             result.inventoryItemPurchaseInstance.costCode = order.costCode
             result.inventoryItemPurchaseInstance.orderValueCurrency = order.orderValueCurrency
@@ -438 +445 @@
             result.inventoryItemPurchaseInstance = new InventoryItemPurchase(params)
             result.inventoryItemPurchaseInstance.enteredBy = authService.currentUser
-            result.inventoryItemPurchaseInstance.purchaseOrderNumber = order.purchaseOrderNumber
+            result.inventoryItemPurchaseInstance.purchaseOrder = order.purchaseOrder
             result.inventoryItemPurchaseInstance.costCode = order.costCode
             result.inventoryItemPurchaseInstance.orderValueCurrency = order.orderValueCurrency