Changeset 177 for trunk

Timestamp:

Nov 2, 2009, 1:17:03 PM (15 years ago)

Author:

gav

Message:

Inventory movement quantity adjustments now done in a service.
InventoryMovementType now has an incrementsInventory flag, so not dependant on the text name.

Location:

trunk/grails-app

Files:

• controllers/InventoryMovementDetailedController.groovy (modified) (3 diffs)
• controllers/InventoryMovementTypeController.groovy (modified) (2 diffs)
• domain/InventoryMovement.groovy (modified) (1 diff)
• domain/InventoryMovementType.groovy (modified) (1 diff)
• i18n/messages.properties (modified) (1 diff)
• services/CreateDataService.groovy (modified) (1 diff)
• services/InventoryMovementService.groovy (added)
• views/inventoryMovementDetailed/create.gsp (modified) (2 diffs)
• views/inventoryMovementDetailed/show.gsp (modified) (1 diff)
• views/inventoryMovementType/create.gsp (modified) (2 diffs)
• views/inventoryMovementType/edit.gsp (modified) (2 diffs)
• views/inventoryMovementType/list.gsp (modified) (3 diffs)
• views/inventoryMovementType/show.gsp (modified) (2 diffs)

trunk/grails-app/controllers/InventoryMovementDetailedController.groovy

@@ -2 +2 @@
 
 class InventoryMovementDetailedController extends BaseController {
+
+    def inventoryMovementService
 
     def index = { redirect(action:list,params:params) }
@@ -24 +26 @@
 
     def delete = {
-        def inventoryMovementInstance = InventoryMovement.get( params.id )
-        if(inventoryMovementInstance) {
-            try {
-                def taskId = inventoryMovementInstance.task?.id
-                inventoryMovementInstance.delete(flush:true)
-                flash.message = "InventoryMovement ${params.id} deleted"
-                redirect(controller:"taskDetailed", action:"show", id:taskId)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "InventoryMovement ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
+        def result = inventoryMovementService.reverseMove(params)
+
+        if(!result.error) {
+            flash.message = "InventoryMovement ${params.id} deleted"
+            redirect(controller:"taskDetailed", action:"show", id:result.taskId)
         }
         else {
-            flash.message = "InventoryMovement not found with id ${params.id}"
-            redirect(action:list)
+            if(result.inventoryMovementInstance) {
+                render(view:'show',model:[inventoryMovementInstance:result.inventoryMovementInstance])
+            }
+            else {
+                flash.message = "Could not delete inventory movement."
+                redirect(controller:"taskDetailed", action:"search", id:result.taskId)
+            }
         }
     }
@@ -54 +54 @@
 
     def save = {
-        def inventoryMovementInstance = new InventoryMovement(params)
-        if(!inventoryMovementInstance.hasErrors() && inventoryMovementInstance.save()) {
-            flash.message = "Inventory Movement for ${inventoryMovementInstance.inventoryItem.name} created."
-            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
+        def result = inventoryMovementService.move(params)
+
+        if(!result.error) {
+            flash.message = "Inventory Movement for ${result.inventoryMovementInstance.inventoryItem.name} created."
+            redirect(controller:"taskDetailed", action:"show", id: result.taskId)
         }
         else {
-            render(view:'create',model:[inventoryMovementInstance:inventoryMovementInstance])
+            if(result.inventoryMovementInstance) {
+                render(view:'create',model:[inventoryMovementInstance:result.inventoryMovementInstance])
+            }
+            else {
+                flash.message = "Could not create inventory movement."
+                redirect(controller:"taskDetailed", action:"search", id:result.taskId)
+            }
+
         }
     }
+
 }

trunk/grails-app/controllers/InventoryMovementTypeController.groovy

@@ -27 +27 @@
         if(inventoryMovementTypeInstance) {
             try {
-                inventoryMovementTypeInstance.delete()
+                inventoryMovementTypeInstance.delete(flush:true)
                 flash.message = "InventoryMovementType ${params.id} deleted"
                 redirect(action:list)
@@ -77 +77 @@
         else {
             flash.message = "InventoryMovementType not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:list)
         }
     }

trunk/grails-app/domain/InventoryMovement.groovy

@@ -8 +8 @@
     Date date = new Date()
 
-//     static belongsTo = [inventoryItem]
+//     static belongsTo = []
 
     static constraints = {

trunk/grails-app/domain/InventoryMovementType.groovy

@@ -2 +2 @@
     String name
     String description = ""
+    boolean incrementsInventory = false
     boolean isActive = true
 
     static hasMany = [inventoryMovements: InventoryMovement]
-    
+
     static contstraints = {
         name(maxSize:50,unique:true,blank:false)
         description(maxSize:100)
+        incrementsInventory()
+        isActive()
     }
 

trunk/grails-app/i18n/messages.properties

@@ -46 +46 @@
 task.associatedAssets=Associated Assets
 task.associatedAssets.help=These assets are to be associated with this task, but costs will not be assigned.
+
+inventoryMovement.quantity.insufficientItemsInStock=Could not complete operation, insufficient items in stock.
+inventoryMovement.inventoryItem.notFound=Inventory Item not found.
 
 default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}]

trunk/grails-app/services/CreateDataService.groovy

@@ -708 +708 @@
 
         // InventoryMovementType #1
-        inventoryMovementTypeInstance = new InventoryMovementType(name: "Used")
+        inventoryMovementTypeInstance = new InventoryMovementType(name: "Used",
+                                                                                                                        incrementsInventory: false)
         saveAndTest(inventoryMovementTypeInstance)
 
         // InventoryMovementType #2
-        inventoryMovementTypeInstance = new InventoryMovementType(name: "Repaired")
+        inventoryMovementTypeInstance = new InventoryMovementType(name: "Repaired",
+                                                                                                                        incrementsInventory: true)
         saveAndTest(inventoryMovementTypeInstance)
 
         // InventoryMovementType #3
-        inventoryMovementTypeInstance = new InventoryMovementType(name: "Purchased")
+        inventoryMovementTypeInstance = new InventoryMovementType(name: "Purchase Received",
+                                                                                                                        incrementsInventory: true)
+        saveAndTest(inventoryMovementTypeInstance)
+
+        // InventoryMovementType #4
+        inventoryMovementTypeInstance = new InventoryMovementType(name: "Correction Increase",
+                                                                                                                        incrementsInventory: true)
+        saveAndTest(inventoryMovementTypeInstance)
+
+        // InventoryMovementType #5
+        inventoryMovementTypeInstance = new InventoryMovementType(name: "Correction Decrease",
+                                                                                                                        incrementsInventory: false)
         saveAndTest(inventoryMovementTypeInstance)
     }

trunk/grails-app/views/inventoryMovementDetailed/create.gsp

@@ -41 +41 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryMovementInstance,field:'quantity','errors')}">
                                     <input type="text" id="quantity" name="quantity" value="${fieldValue(bean:inventoryMovementInstance,field:'quantity')}"/>
-                                    ${inventoryMovementInstance.inventoryItem}
                                 </td>
                             </tr>
@@ -47 +46 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="inventoryMovementType">Inventory Movement Type:</label>
+                                    <label for="inventoryMovementType">Movement Type:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryMovementInstance,field:'inventoryMovementType','errors')}">

trunk/grails-app/views/inventoryMovementDetailed/show.gsp

@@ -15 +15 @@
             <div class="message">${flash.message}</div>
             </g:if>
+            <g:hasErrors bean="${inventoryMovementInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${inventoryMovementInstance}" as="list" />
+            </div>
+            </g:hasErrors>
             <div class="dialog">
                 <table>

trunk/grails-app/views/inventoryMovementType/create.gsp

@@ -5 +5 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create InventoryMovementType</title>         
+        <title>Create InventoryMovementType</title>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${resource(dir:'')}">Home</a></span>
             <span class="menuButton"><g:link class="list" action="list">InventoryMovementType List</g:link></span>
         </div>
@@ -33 +32 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryMovementTypeInstance,field:'description','errors')}">
                                     <input type="text" id="description" name="description" value="${fieldValue(bean:inventoryMovementTypeInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="incrementsInventory">Increments Inventory:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryMovementTypeInstance,field:'incrementsInventory','errors')}">
+                                    <g:checkBox name="incrementsInventory" value="${inventoryMovementTypeInstance?.incrementsInventory}" ></g:checkBox>
                                 </td>
                             </tr> 

trunk/grails-app/views/inventoryMovementType/edit.gsp

@@ -9 +9 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${resource(dir:'')}">Home</a></span>
             <span class="menuButton"><g:link class="list" action="list">InventoryMovementType List</g:link></span>
             <span class="menuButton"><g:link class="create" action="create">New InventoryMovementType</g:link></span>
@@ -36 +35 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryMovementTypeInstance,field:'description','errors')}">
                                     <input type="text" id="description" name="description" value="${fieldValue(bean:inventoryMovementTypeInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="incrementsInventory">Increments Inventory:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryMovementTypeInstance,field:'incrementsInventory','errors')}">
+                                    <g:checkBox name="incrementsInventory" value="${inventoryMovementTypeInstance?.incrementsInventory}" ></g:checkBox>
                                 </td>
                             </tr> 

trunk/grails-app/views/inventoryMovementType/list.gsp

@@ -9 +9 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${resource(dir:'')}">Home</a></span>
             <span class="menuButton"><g:link class="create" action="create">New InventoryMovementType</g:link></span>
         </div>
@@ -26 +25 @@
                                 <g:sortableColumn property="description" title="Description" />
                         
+                                <g:sortableColumn property="incrementsInventory" title="Increments Inventory" />
+                        
                                 <g:sortableColumn property="isActive" title="Is Active" />
                         
@@ -39 +40 @@
                         
                             <td>${fieldValue(bean:inventoryMovementTypeInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:inventoryMovementTypeInstance, field:'incrementsInventory')}</td>
                         
                             <td>${fieldValue(bean:inventoryMovementTypeInstance, field:'isActive')}</td>

trunk/grails-app/views/inventoryMovementType/show.gsp

@@ -9 +9 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${resource(dir:'')}">Home</a></span>
             <span class="menuButton"><g:link class="list" action="list">InventoryMovementType List</g:link></span>
             <span class="menuButton"><g:link class="create" action="create">New InventoryMovementType</g:link></span>
@@ -34 +33 @@
                             
                             <td valign="top" class="value">${fieldValue(bean:inventoryMovementTypeInstance, field:'description')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Increments Inventory:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:inventoryMovementTypeInstance, field:'incrementsInventory')}</td>
                             
                         </tr>