Addition the quantity at updateDesingChangeForm

diff --git a/PartsList/PartsList/app/beans/DesignChangeListBean.scala b/PartsList/PartsList/app/beans/DesignChangeListBean.scala
index 768ea34..75af637 100644 (file)
--- a/PartsList/PartsList/app/beans/DesignChangeListBean.scala
+++ b/PartsList/PartsList/app/beans/DesignChangeListBean.scala
@@ -1,3 +1,3 @@
 package beans
-case class DesignChangeListBean(val dcSeq: Long, val parentBefore: String, val childBefore: String, val parentAfter: String, val childAfter: String) {
+case class DesignChangeListBean(val dcSeq: Long, val parentBefore: String, val childBefore: String, val quantityBefore: Long, val parentAfter: String, val childAfter: String, val quantityAfter: Long) {
 }
\ No newline at end of file

diff --git a/PartsList/PartsList/app/models/services/DesignChangeManager.scala b/PartsList/PartsList/app/models/services/DesignChangeManager.scala
index 829fb71..9b71902 100644 (file)
--- a/PartsList/PartsList/app/models/services/DesignChangeManager.scala
+++ b/PartsList/PartsList/app/models/services/DesignChangeManager.scala
@@ -57,12 +57,12 @@ case class DesignChangeManager() {
         var checkch = 0
         for(addPart <- designChange.addPartRelation) {
           if(delPart.dcSeq == addPart.dcSeq) {
-                 designChangeBuffer += DesignChangeListBean(delPart.dcSeq, delPart.parent.head.name, delPart.child.head.name, addPart.parent.head.name, addPart.child.head.name)
+                 designChangeBuffer += DesignChangeListBean(delPart.dcSeq, delPart.parent.head.name, delPart.child.head.name, delPart.quantity, addPart.parent.head.name, addPart.child.head.name, addPart.quantity)
                  checkch = 1
            }
          }
         if(checkch == 0) {
-         designChangeBuffer += DesignChangeListBean(delPart.dcSeq, delPart.parent.head.name, delPart.child.head.name, "", "") 
+         designChangeBuffer += DesignChangeListBean(delPart.dcSeq, delPart.parent.head.name, delPart.child.head.name, delPart.quantity, "", "", 0) 
          }
         }
       //追加情報をバッファ        
@@ -74,7 +74,7 @@ case class DesignChangeManager() {
                    }
            }
          if(checka == 0) {
-             designChangeBuffer += DesignChangeListBean(addPart.dcSeq, "", "", addPart.parent.head.name, addPart.child.head.name)
+             designChangeBuffer += DesignChangeListBean(addPart.dcSeq, "", "", 0, addPart.parent.head.name, addPart.child.head.name, addPart.quantity)
           }
       }
       return designChangeBuffer

diff --git a/PartsList/PartsList/app/views/updateDesignChangeForm.scala.html b/PartsList/PartsList/app/views/updateDesignChangeForm.scala.html
index 9ebf20b..e7d6819 100644 (file)
--- a/PartsList/PartsList/app/views/updateDesignChangeForm.scala.html
+++ b/PartsList/PartsList/app/views/updateDesignChangeForm.scala.html
@@ -21,8 +21,10 @@
                        <tr>
                                <th>@Messages("form.header10")@Messages("list.header1")</th>
                                <th>@Messages("form.header10")@Messages("list.header2")</th>
+                               <th>@Messages("form.header10")@Messages("list.header3")</th>
                                <th>@Messages("form.header11")@Messages("list.header1")</th>
                                <th>@Messages("form.header11")@Messages("list.header2")</th>
+                               <th>@Messages("form.header11")@Messages("list.header3")</th>
                        </tr>
                </thead>
                <tbody>
@@ -30,8 +32,16 @@
                                <tr>
                                        <td>@delRelation.parentBefore</td>
                                        <td><a href="/designChangeCoverModify?designChangeId=@id&dcSeq=@delRelation.dcSeq&message=">@delRelation.childBefore</a></td>
+                                       <td>@if(delRelation.quantityBefore != 0) {
+                                                       @delRelation.quantityBefore
+                                               }
+                                       </td>
                                        <td>@delRelation.parentAfter</td>
                                        <td>@delRelation.childAfter</td>
+                                       <td>@if(delRelation.quantityAfter != 0) {
+                                               @delRelation.quantityAfter
+                                               }
+                                       </td>
                                </tr>
                        }
                </tbody>