diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/TruckRoutingSummaryService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/TruckRoutingSummaryService.kt index f50d380..89f781f 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/TruckRoutingSummaryService.kt +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/TruckRoutingSummaryService.kt @@ -158,7 +158,6 @@ class TruckRoutingSummaryService( "truckLanceCode" to truckLanceCode.trim(), "reportDate" to reportDate.trim(), "pendingStatus" to DoPickOrderStatus.pending.name, - "releasedStatus" to DoPickOrderStatus.released.name, ) val sql = """ SELECT COUNT(1) AS unpickedCount @@ -167,7 +166,7 @@ class TruckRoutingSummaryService( AND REPLACE(dpo.store_id, '/', '') = :storeId AND dpo.TruckLanceCode = :truckLanceCode AND dpo.RequiredDeliveryDate = :reportDate - AND dpo.ticket_status IN (:pendingStatus, :releasedStatus) + AND dpo.ticket_status = :pendingStatus """.trimIndent() val row = jdbcDao.queryForList(sql, args).firstOrNull() return (row?.get("unpickedCount") as? Number)?.toInt() ?: 0 diff --git a/src/main/resources/DeliveryNote/TruckRoutingSummaryPDF.jrxml b/src/main/resources/DeliveryNote/TruckRoutingSummaryPDF.jrxml index d92450d..cb2cf7c 100644 --- a/src/main/resources/DeliveryNote/TruckRoutingSummaryPDF.jrxml +++ b/src/main/resources/DeliveryNote/TruckRoutingSummaryPDF.jrxml @@ -14,7 +14,7 @@ - + @@ -84,7 +84,7 @@ <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="微軟正黑體" size="14" isBold="true"/> </textElement> - <text><![CDATA[店鋪名稱 / 地址]]></text> + <text><![CDATA[店鋪名稱 & 地址]]></text> </staticText> <staticText> <reportElement x="520" y="4" width="35" height="20" uuid="8473f6ea-a5bd-4739-bc05-618c0afb06d2"/> @@ -99,9 +99,9 @@ </band> </columnHeader> <detail> - <band height="40" splitType="Stretch"> + <band height="48" splitType="Stretch"> <rectangle> - <reportElement mode="Opaque" x="0" y="0" width="555" height="40" backcolor="#EFEFEF" uuid="a4c8bcb4-6fa2-4c97-b52d-507f629d54a0"> + <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="555" height="48" backcolor="#EFEFEF" uuid="a4c8bcb4-6fa2-4c97-b52d-507f629d54a0"> <printWhenExpression><![CDATA[$V{REPORT_COUNT}.intValue() % 2 == 0]]></printWhenExpression> </reportElement> <graphicElement> @@ -109,21 +109,21 @@ </graphicElement> </rectangle> <textField isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="60" height="32" uuid="31c8d1cf-9298-4866-9dca-d5bbaa08b277"/> + <reportElement stretchType="RelativeToTallestObject" x="0" y="6" width="60" height="36" uuid="31c8d1cf-9298-4866-9dca-d5bbaa08b277"/> <textElement textAlignment="Center" verticalAlignment="Top"> <font fontName="微軟正黑體" size="14"/> </textElement> <textFieldExpression><![CDATA[$F{dropOffSequence}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="70" y="2" width="60" height="32" uuid="f4ed6642-ce1c-4130-bf80-1024c5453db4"/> + <reportElement stretchType="RelativeToTallestObject" x="70" y="6" width="60" height="36" uuid="f4ed6642-ce1c-4130-bf80-1024c5453db4"/> <textElement textAlignment="Center" verticalAlignment="Top"> <font fontName="微軟正黑體" size="14"/> </textElement> <textFieldExpression><![CDATA[$F{shopCode}]]></textFieldExpression> </textField> <textField textAdjust="StretchHeight" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="140" y="2" width="380" height="22" uuid="a44a3df4-a77f-4dda-8b82-d77b47e56eaf"/> + <reportElement stretchType="RelativeToTallestObject" x="140" y="6" width="380" height="30" uuid="a44a3df4-a77f-4dda-8b82-d77b47e56eaf"/> <textElement verticalAlignment="Top"> <font fontName="微軟正黑體" size="14"/> </textElement> @@ -133,7 +133,7 @@ ))]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="520" y="2" width="35" height="32" uuid="ff0c3947-9dd6-48eb-8ba9-83e47b7cd8e1"/> + <reportElement stretchType="RelativeToTallestObject" x="520" y="6" width="35" height="36" uuid="ff0c3947-9dd6-48eb-8ba9-83e47b7cd8e1"/> <textElement textAlignment="Right" verticalAlignment="Top"> <font fontName="微軟正黑體" size="14"/> </textElement>