Merge remote-tracking branch 'origin/master'

src/main/java/com/ffii/fpsms/modules/master/entity/QcCategoryRepository.kt

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Repository
 @Repository
 interface QcCategoryRepository : AbstractRepository<QcCategory, Long> {
     fun findAllByDeletedIsFalse(): List<QcCategory>;
+    fun findByIdAndDeletedIsFalse(id: Long): QcCategory?;
 
     fun findQcCategoryComboByDeletedIsFalse(): List<QcCategoryCombo>;
 

src/main/java/com/ffii/fpsms/modules/master/service/QcCategoryService.kt

@@ -3,9 +3,14 @@ package com.ffii.fpsms.modules.master.service
 import com.ffii.core.support.AbstractBaseEntityService
 import com.ffii.fpsms.modules.master.entity.QcCategory
 import com.ffii.fpsms.modules.master.entity.QcCategoryRepository
+import com.ffii.fpsms.modules.master.entity.QcItem
 import com.ffii.fpsms.modules.master.entity.projections.QcCategoryCombo
+import com.ffii.fpsms.modules.master.web.models.SaveQcCategoryRequest
+import com.ffii.fpsms.modules.master.web.models.SaveQcCategoryResponse
 import com.ffii.fpsms.modules.qc.entity.projection.QcCategoryInfo
+import jakarta.validation.Valid
 import org.springframework.stereotype.Service
+import org.springframework.web.bind.annotation.RequestBody
 
 @Service
 open class QcCategoryService(
@@ -16,6 +21,10 @@ open class QcCategoryService(
         return qcCategoryRepository.findAllByDeletedIsFalse()
     }
 
+    open fun findQcCategoryById(id: Long): QcCategory? {
+        return qcCategoryRepository.findByIdAndDeletedIsFalse(id)
+    }
+
     open fun getQcCategoryCombo(): List<QcCategoryCombo> {
         return qcCategoryRepository.findQcCategoryComboByDeletedIsFalse();
     }
@@ -40,4 +49,57 @@ open class QcCategoryService(
         }
         return result;
     }
+
+    open fun markDeleted(id: Long): List<QcCategory> {
+        val qcItem = qcCategoryRepository.findById(id).orElseThrow().apply {
+            deleted = true
+        }
+
+        qcCategoryRepository.save(qcItem)
+
+        return allQcCategories()
+    }
+
+    open fun saveQcCategory(@Valid @RequestBody request: SaveQcCategoryRequest): SaveQcCategoryResponse {
+        val errors = mutableMapOf<String, String>()
+        val id = request.id
+        val qcCategory = if (id != null) qcCategoryRepository.findById(id).orElseThrow() else QcCategory()
+
+        // check duplicated code
+//        val duplicateQcCategory = findQcCategoryByCode(request.code)
+//        if (duplicateQcCategory != null && duplicateQcCategory.id != qcCategory.id) {
+//            errors["code"] = "Code is duplicated"
+//        }
+
+        if (errors.isNotEmpty()) {
+            request.let {
+                SaveQcCategoryResponse(
+                    id = it.id,
+                    code = it.code,
+                    name = it.name,
+                    description = it.description,
+                    errors = errors
+                )
+            }
+        }
+
+        // Save Qc Item
+        qcCategory.apply {
+            code = request.code
+            name = request.name
+            description = request.description
+        }
+
+        val savedQcCategory = qcCategoryRepository.save(qcCategory)
+
+        return savedQcCategory.let {
+            SaveQcCategoryResponse(
+                id = it.id,
+                code = it.code,
+                name = it.name,
+                description = it.description,
+                errors = null
+            )
+        }
+    }
 }

src/main/java/com/ffii/fpsms/modules/master/service/QcItemService.kt

@@ -54,10 +54,10 @@ open class QcItemService(
         val qcItem = if (id != null) qcItemRepository.findById(id).orElseThrow() else QcItem()
 
         // check duplicated code
-        val duplicateQcItem = findQcItemByCode(request.code)
-        if (duplicateQcItem != null && duplicateQcItem.id != qcItem.id) {
-            errors["code"] = "Code is duplicated"
-        }
+//        val duplicateQcItem = findQcItemByCode(request.code)
+//        if (duplicateQcItem != null && duplicateQcItem.id != qcItem.id) {
+//            errors["code"] = "Code is duplicated"
+//        }
 
         if (errors.isNotEmpty()) {
             request.let {

src/main/java/com/ffii/fpsms/modules/master/web/QcCategoryController.kt

@@ -2,9 +2,13 @@ package com.ffii.fpsms.modules.master.web
 
 import com.ffii.core.exception.NotFoundException
 import com.ffii.fpsms.modules.master.entity.QcCategory
+import com.ffii.fpsms.modules.master.entity.QcItem
 import com.ffii.fpsms.modules.master.entity.projections.QcCategoryCombo
 import com.ffii.fpsms.modules.master.service.QcCategoryService
+import com.ffii.fpsms.modules.master.web.models.SaveQcCategoryRequest
+import com.ffii.fpsms.modules.master.web.models.SaveQcCategoryResponse
 import com.ffii.fpsms.modules.qc.entity.projection.QcCategoryInfo
+import jakarta.validation.Valid
 import org.springframework.web.bind.annotation.*
 
 @RestController
@@ -17,6 +21,21 @@ class QcCategoryController(
         return qcCategoryService.allQcCategories()
     }
 
+    @DeleteMapping("/{id}")
+    fun deleteQcItem(@PathVariable id: Long): List<QcCategory> {
+        return qcCategoryService.markDeleted(id)
+    }
+
+    @GetMapping("/details/{id}")
+    fun qcCategoryDetails(@PathVariable id: Long): QcCategory {
+        return qcCategoryService.findQcCategoryById(id) ?: throw NotFoundException()
+    }
+
+    @PostMapping("/save")
+    fun saveQcCategory(@Valid @RequestBody request: SaveQcCategoryRequest): SaveQcCategoryResponse {
+        return qcCategoryService.saveQcCategory(request)
+    }
+
     @GetMapping("/combo")
     fun getQcCategoryCombo(): List<QcCategoryCombo> {
         return qcCategoryService.getQcCategoryCombo();

src/main/java/com/ffii/fpsms/modules/master/web/models/SaveQcCategoryRequest.kt

@@ -0,0 +1,12 @@
+package com.ffii.fpsms.modules.master.web.models
+
+import jakarta.validation.constraints.NotBlank
+
+data class SaveQcCategoryRequest(
+    val id: Long?,
+    @field:NotBlank(message = "Code cannot be empty")
+    val code: String,
+    @field:NotBlank(message = "Name cannot be empty")
+    val name: String,
+    val description: String?,
+)

src/main/java/com/ffii/fpsms/modules/master/web/models/SaveQcCategoryResponse.kt

@@ -0,0 +1,9 @@
+package com.ffii.fpsms.modules.master.web.models
+
+data class SaveQcCategoryResponse(
+    val id: Long?,
+    val code: String?,
+    val name: String?,
+    val description: String?,
+    val errors: MutableMap<String, String>?
+)

src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt

@@ -126,10 +126,7 @@ open class StockInLineService(
 
             // update po status to receiving
             if (po != null) {
-                po.apply {
-                    status = PurchaseOrderStatus.RECEIVING
-                }
-                val savedPo = poRepository.save(po)
+                val savedPo = updatePurchaseOrderStatus(po)
                 stockInLine.apply {
                     this.purchaseOrder = savedPo
                 }
@@ -323,19 +320,21 @@ open class StockInLineService(
 
     @Throws(IOException::class)
     @Transactional
-    open fun updatePurchaseOrderStatus(po : PurchaseOrder) {
-        val unfinishedPol = polRepository
-            .findAllByPurchaseOrderIdAndStatusNotAndDeletedIsFalse(po.id!!,
-                PurchaseOrderLineStatus.COMPLETED)
-        // If all POL is completed
-        if (unfinishedPol.isEmpty()) {
-            po.apply {
-                status = PurchaseOrderStatus.COMPLETED
-            }
-            poRepository.saveAndFlush(po)
-        } else {
+    open fun updatePurchaseOrderStatus(po : PurchaseOrder) : PurchaseOrder {
+        val pols = polRepository.findAllByPurchaseOrderIdAndDeletedIsFalse(po.id!!)
 
+        var newStatus = PurchaseOrderStatus.PENDING
+        if (pols.isNotEmpty()) {
+            newStatus = if (pols.any { pol-> pol.status != PurchaseOrderLineStatus.COMPLETED }) {
+                PurchaseOrderStatus.RECEIVING
+            } else {
+                PurchaseOrderStatus.COMPLETED
+            }
+        }
+        po.apply {
+            status = newStatus
         }
+        return poRepository.saveAndFlush(po)
     }
     @Throws(IOException::class)
     @Transactional

src/main/resources/DeliveryNote/DeliveryNotePDF.jrxml

@@ -38,9 +38,9 @@
 		<band height="41" splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="50">
+		<band height="88">
 			<staticText>
-				<reportElement x="430" y="10" width="40" height="18" uuid="ddea10c9-9e96-484b-b76b-bfff59950a98">
+				<reportElement x="430" y="0" width="40" height="18" uuid="ddea10c9-9e96-484b-b76b-bfff59950a98">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -50,14 +50,14 @@
 				<text><![CDATA[頁數]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="470" y="10" width="20" height="18" uuid="f4a20909-91b8-41bd-940f-140adced5b18">
+				<reportElement x="470" y="0" width="20" height="18" uuid="f4a20909-91b8-41bd-940f-140adced5b18">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="530" y="10" width="25" height="18" uuid="586df5fc-ea37-4896-b8df-2290890341a8">
+				<reportElement x="530" y="0" width="25" height="18" uuid="586df5fc-ea37-4896-b8df-2290890341a8">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -67,7 +67,7 @@
 				<text><![CDATA[頁]]></text>
 			</staticText>
 			<textField evaluationTime="Report">
-				<reportElement x="510" y="10" width="20" height="18" uuid="8718a2eb-22fd-4bce-ade2-1b5869800c55">
+				<reportElement x="510" y="0" width="20" height="18" uuid="8718a2eb-22fd-4bce-ade2-1b5869800c55">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -75,7 +75,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="490" y="10" width="20" height="18" uuid="460a4235-1ce6-47d8-9e34-952e5ac9a660">
+				<reportElement x="490" y="0" width="20" height="18" uuid="460a4235-1ce6-47d8-9e34-952e5ac9a660">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -85,7 +85,7 @@
 				<text><![CDATA[/]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="223" y="2" width="108" height="23" uuid="17f9fd50-da7c-43b2-93ea-7306e59aea90">
+				<reportElement x="220" y="0" width="108" height="23" uuid="17f9fd50-da7c-43b2-93ea-7306e59aea90">
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -96,82 +96,110 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$P{dnTitle}]]></textFieldExpression>
 			</textField>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="118">
 			<staticText>
-				<reportElement x="0" y="10" width="80" height="18" uuid="7f991bbe-caf4-43c1-b8e1-d85b1f2d3815">
+				<reportElement x="0" y="25" width="80" height="23" uuid="a9753323-1dc5-47d4-92b0-13169585cc35">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<text><![CDATA[送貨單編號：]]></text>
+				<text><![CDATA[店鋪：]]></text>
 			</staticText>
+			<textField>
+				<reportElement x="80" y="25" width="150" height="23" uuid="c1836549-f941-4558-ae12-25064f243df4">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{shopName}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement x="0" y="30" width="80" height="18" uuid="a9753323-1dc5-47d4-92b0-13169585cc35">
+				<reportElement x="0" y="50" width="80" height="23" uuid="6483cdc2-6b75-4f59-9647-b87a7bf2964e">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<text><![CDATA[店鋪：]]></text>
+				<text><![CDATA[送貨地址：]]></text>
 			</staticText>
+			<textField>
+				<reportElement x="80" y="50" width="455" height="23" uuid="010cf625-64e8-4d5e-b923-6cc959546e52"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{shopAddress}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement x="0" y="50" width="80" height="18" uuid="6483cdc2-6b75-4f59-9647-b87a7bf2964e">
+				<reportElement x="275" y="25" width="110" height="23" uuid="6b810312-71e2-4749-bc8b-0b7a705377f8">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<text><![CDATA[送貨地址：]]></text>
+				<text><![CDATA[貨車班次：]]></text>
 			</staticText>
+			<textField>
+				<reportElement x="385" y="25" width="150" height="23" uuid="c403c5e2-7803-4ea2-962d-2a900092db65">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{truckNo}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="80" width="554" height="1" uuid="d50996f5-e526-4825-8f6a-015bc5044c99">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="110">
 			<staticText>
-				<reportElement x="275" y="50" width="110" height="18" uuid="7bdf9657-d5d2-4fbf-a6c3-a5da5b292dc8">
+				<reportElement x="0" y="10" width="110" height="18" uuid="7f991bbe-caf4-43c1-b8e1-d85b1f2d3815">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[送貨日期：]]></text>
+				<text><![CDATA[送貨單編號：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="275" y="10" width="110" height="18" uuid="f53e2068-dd24-4151-bd2a-033c6cbda674">
+				<reportElement x="0" y="30" width="110" height="18" uuid="7bdf9657-d5d2-4fbf-a6c3-a5da5b292dc8">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[成品提料編號：]]></text>
+				<text><![CDATA[送貨日期：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="275" y="30" width="110" height="18" uuid="f196de62-5c60-4595-a31c-a7c501e000a5">
+				<reportElement x="275" y="10" width="110" height="18" uuid="f53e2068-dd24-4151-bd2a-033c6cbda674">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[店鋪採購單編號：]]></text>
+				<text><![CDATA[成品提料編號：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="275" y="70" width="110" height="18" uuid="6b810312-71e2-4749-bc8b-0b7a705377f8">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				<reportElement x="0" y="50" width="110" height="18" uuid="f196de62-5c60-4595-a31c-a7c501e000a5">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[貨車編號：]]></text>
+				<text><![CDATA[店鋪採購單編號：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="80" y="10" width="150" height="18" uuid="69d21d74-e625-41e9-b4bb-abde259d6620">
+				<reportElement x="110" y="10" width="150" height="18" uuid="69d21d74-e625-41e9-b4bb-abde259d6620">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -180,38 +208,10 @@
 				<textFieldExpression><![CDATA[$P{deliveryOrderCode}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="80" y="30" width="150" height="18" uuid="c1836549-f941-4558-ae12-25064f243df4">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{shopName}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="80" y="50" width="150" height="36" uuid="010cf625-64e8-4d5e-b923-6cc959546e52">
+				<reportElement x="110" y="50" width="425" height="54" uuid="24a1331c-e50f-4a72-9a41-3e05b85f4c21">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{shopAddress}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="385" y="70" width="150" height="18" uuid="c403c5e2-7803-4ea2-962d-2a900092db65">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{truckNo}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="385" y="30" width="150" height="18" uuid="24a1331c-e50f-4a72-9a41-3e05b85f4c21">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{ShopPurchaseOrderNo}]]></textFieldExpression>
@@ -226,7 +226,7 @@
 				<textFieldExpression><![CDATA[$P{FGPickOrderNo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="385" y="50" width="150" height="18" uuid="e67b4047-642b-46f5-8ec7-785ead88b97e">
+				<reportElement x="110" y="30" width="150" height="18" uuid="e67b4047-642b-46f5-8ec7-785ead88b97e">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -235,7 +235,7 @@
 				<textFieldExpression><![CDATA[$P{deliveryDate}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="80" y="90" width="150" height="18" uuid="8062f7b6-8917-432a-a02c-e5a5766c14e5">
+				<reportElement x="385" y="30" width="150" height="18" uuid="8062f7b6-8917-432a-a02c-e5a5766c14e5">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -244,7 +244,7 @@
 				<textFieldExpression><![CDATA[$P{numOfCarton}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="90" width="80" height="18" uuid="25254ea4-e2b2-4ae0-975b-99c8f9390a64">
+				<reportElement x="275" y="30" width="110" height="18" uuid="25254ea4-e2b2-4ae0-975b-99c8f9390a64">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -268,7 +268,7 @@
 				<text><![CDATA[序號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="50" y="5" width="50" height="18" uuid="58a5c922-fd98-4997-9b17-16bdf9f78519">
+				<reportElement x="50" y="5" width="110" height="18" uuid="58a5c922-fd98-4997-9b17-16bdf9f78519">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -279,7 +279,7 @@
 				<text><![CDATA[路綫]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="100" y="5" width="140" height="18" uuid="65c27cc0-f806-4930-930c-6b3fd632a52f">
+				<reportElement x="160" y="5" width="80" height="18" uuid="65c27cc0-f806-4930-930c-6b3fd632a52f">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -323,7 +323,7 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="37">
+		<band height="42">
 			<textField>
 				<reportElement x="0" y="1" width="50" height="18" uuid="ae87b739-dadf-452a-bc35-8c2da1a6a9a8">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -334,7 +334,7 @@
 				<textFieldExpression><![CDATA[$F{sequenceNumber}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="50" y="1" width="50" height="18" uuid="b4bcfa6c-5d2e-4fba-815a-cc2fccd39213">
+				<reportElement x="50" y="1" width="110" height="18" uuid="b4bcfa6c-5d2e-4fba-815a-cc2fccd39213">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Top">
@@ -343,7 +343,7 @@
 				<textFieldExpression><![CDATA[$F{route}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="100" y="1" width="140" height="18" uuid="3e4a71e7-d6e1-4da8-ae58-ef752c289a6d">
+				<reportElement x="160" y="1" width="80" height="18" uuid="3e4a71e7-d6e1-4da8-ae58-ef752c289a6d">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Top">