Merge remote-tracking branch 'origin/master'

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt

@@ -749,17 +749,16 @@ open class DeliveryOrderService(
 
                 val route = line.itemId?.let { itemId ->
                     getWarehouseCodeByItemId(itemId)
-                } ?: ""
+                } ?: "-"
                 field["route"] = route
 
                 val lotNo = line.itemId?.let { itemId ->
                     pickOrderIds.mapNotNull { pickOrderId ->
                         val lots = getLotNumbersForPickOrderByItemId(itemId, pickOrderId)
-                        if (lots.isNotBlank()) lots else null
+                        lots.ifBlank { null }
                     }.distinct().joinToString(", ")
-                } ?: ""
+                }?.ifBlank { "沒有庫存" } ?: "沒有庫存"
                 field["lotNo"] = lotNo
-
                 fields.add(field)
             }
 

src/main/resources/DeliveryNote/DeliveryNotePDF.jrxml

@@ -14,6 +14,7 @@
 	<parameter name="dnTitle" class="java.lang.String"/>
 	<parameter name="colQty" class="java.lang.String"/>
 	<parameter name="totalCartonTitle" class="java.lang.String"/>
+	<parameter name="deliveryOrderCodeTitle" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -29,9 +30,12 @@
 		<band height="41" splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="88">
+		<band/>
+	</title>
+	<pageHeader>
+		<band height="186">
 			<staticText>
-				<reportElement x="430" y="0" width="40" height="18" uuid="ddea10c9-9e96-484b-b76b-bfff59950a98">
+				<reportElement x="430" y="0" width="40" height="18" uuid="3381622a-7eda-4649-88b8-650da96c2a77">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -41,14 +45,14 @@
 				<text><![CDATA[頁數]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="470" y="0" width="20" height="18" uuid="f4a20909-91b8-41bd-940f-140adced5b18">
+				<reportElement x="470" y="0" width="20" height="18" uuid="33b3d236-1c13-4751-abf5-79871b2535ea">
 					<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="0" width="25" height="18" uuid="586df5fc-ea37-4896-b8df-2290890341a8">
+				<reportElement x="530" y="0" width="25" height="18" uuid="11a0dc53-3742-4c56-a9b2-b284bfe8b07e">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -58,7 +62,7 @@
 				<text><![CDATA[頁]]></text>
 			</staticText>
 			<textField evaluationTime="Report">
-				<reportElement x="510" y="0" width="20" height="18" uuid="8718a2eb-22fd-4bce-ade2-1b5869800c55">
+				<reportElement x="510" y="0" width="20" height="18" uuid="428142d2-39f0-43f1-b662-f1ab72f0aa1a">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -66,7 +70,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="490" y="0" width="20" height="18" uuid="460a4235-1ce6-47d8-9e34-952e5ac9a660">
+				<reportElement x="490" y="0" width="20" height="18" uuid="fb619a24-7eb9-4f2e-89b3-ac7efdb04333">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -76,7 +80,7 @@
 				<text><![CDATA[/]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="220" y="0" width="108" height="23" uuid="17f9fd50-da7c-43b2-93ea-7306e59aea90">
+				<reportElement x="220" y="0" width="108" height="23" uuid="a8e0ca5e-3b0c-4f88-8c4c-f922a84cb18f">
 					<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"/>
@@ -88,7 +92,7 @@
 				<textFieldExpression><![CDATA[$P{dnTitle}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="25" width="80" height="23" uuid="a9753323-1dc5-47d4-92b0-13169585cc35">
+				<reportElement x="0" y="25" width="70" height="23" uuid="de40ab55-5e3a-4730-b6cc-ddb4272edd6d">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -98,7 +102,7 @@
 				<text><![CDATA[店鋪：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="80" y="25" width="150" height="23" uuid="c1836549-f941-4558-ae12-25064f243df4">
+				<reportElement x="70" y="25" width="300" height="23" uuid="abe02be5-6047-4dd1-9637-f21612d9040a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -107,32 +111,32 @@
 				<textFieldExpression><![CDATA[$P{shopName}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="50" width="80" height="23" uuid="6483cdc2-6b75-4f59-9647-b87a7bf2964e">
+				<reportElement x="0" y="50" width="70" height="23" uuid="1802947d-3ddb-4c51-99ab-82dda9119e34">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<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"/>
+				<reportElement x="70" y="50" width="465" height="23" uuid="89e79bce-bd39-48e6-b114-c11b4bcc5c9f"/>
 				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+					<font fontName="微軟正黑體" size="13" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{shopAddress}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="275" y="25" width="110" height="23" uuid="6b810312-71e2-4749-bc8b-0b7a705377f8">
+				<reportElement x="370" y="25" width="70" height="23" uuid="a8be367e-c33a-4876-bb0e-14c2eea6bca0">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<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">
+				<reportElement x="440" y="25" width="95" height="23" uuid="2a73f702-dda6-4abf-90b3-14704f6d3c7b">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -141,16 +145,12 @@
 				<textFieldExpression><![CDATA[$P{truckNo}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="80" width="554" height="1" uuid="d50996f5-e526-4825-8f6a-015bc5044c99">
+				<reportElement x="0" y="80" width="554" height="1" uuid="ccc9c703-7813-43c3-9443-fb2b15f6749c">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="110">
 			<staticText>
-				<reportElement x="0" y="10" width="110" height="18" uuid="7bdf9657-d5d2-4fbf-a6c3-a5da5b292dc8">
+				<reportElement x="5" y="90" width="110" height="18" uuid="329c1490-958e-4884-a36f-cdb0867162c3">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -160,7 +160,7 @@
 				<text><![CDATA[送貨日期：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="30" width="110" height="18" uuid="f53e2068-dd24-4151-bd2a-033c6cbda674">
+				<reportElement x="5" y="110" width="110" height="18" uuid="3c8084d3-e0c7-4bb9-90ec-0759b20eecf1">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -170,7 +170,7 @@
 				<text><![CDATA[成品提料編號：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="50" width="110" height="18" uuid="f196de62-5c60-4595-a31c-a7c501e000a5">
+				<reportElement x="5" y="130" width="110" height="18" uuid="111c5f73-f543-4006-931b-27479ccca816">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -180,7 +180,7 @@
 				<text><![CDATA[店鋪採購單編號：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="110" y="50" width="425" height="54" uuid="24a1331c-e50f-4a72-9a41-3e05b85f4c21">
+				<reportElement x="115" y="130" width="425" height="54" uuid="7171ba0b-1a78-4ff6-a765-7b2b543ab0bc">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Top">
@@ -189,7 +189,7 @@
 				<textFieldExpression><![CDATA[$P{ShopPurchaseOrderNo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="110" y="30" width="150" height="18" uuid="78f29b7d-c311-4c53-9c66-fda8752c9797">
+				<reportElement x="115" y="110" width="150" height="18" uuid="3fe3119e-8882-4c99-b9a9-9a1cec0d18c9">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -198,7 +198,7 @@
 				<textFieldExpression><![CDATA[$P{FGPickOrderNo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="110" y="10" width="150" height="18" uuid="e67b4047-642b-46f5-8ec7-785ead88b97e">
+				<reportElement x="115" y="90" width="150" height="18" uuid="606bac90-efd9-440c-a220-a8fad85ff82f">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -207,7 +207,7 @@
 				<textFieldExpression><![CDATA[$P{deliveryDate}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="385" y="10" width="150" height="18" uuid="8062f7b6-8917-432a-a02c-e5a5766c14e5">
+				<reportElement x="390" y="90" width="150" height="18" uuid="8497bbd0-84cb-4912-abe2-03dea16c51ec">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -216,7 +216,7 @@
 				<textFieldExpression><![CDATA[$P{numOfCarton}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="275" y="10" width="110" height="18" uuid="25254ea4-e2b2-4ae0-975b-99c8f9390a64">
+				<reportElement x="280" y="90" width="110" height="18" uuid="87fb3b29-92ab-4478-8e63-11ea1da7d6c8">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -225,7 +225,7 @@
 				<textFieldExpression><![CDATA[$P{totalCartonTitle}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="385" y="30" width="150" height="18" uuid="69d21d74-e625-41e9-b4bb-abde259d6620">
+				<reportElement x="390" y="110" width="150" height="18" uuid="b24ade74-805f-45aa-9a59-65861fe0d853">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -234,7 +234,7 @@
 				<textFieldExpression><![CDATA[$P{deliveryOrderCode}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="275" y="30" width="110" height="18" uuid="db59b94d-5a33-4c84-98d9-30b8b86bd018">
+				<reportElement x="280" y="110" width="110" height="18" uuid="f0f2f87f-26cb-4fad-9c78-9d934191fad9">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -354,7 +354,7 @@
 				<reportElement x="230" y="1" width="240" height="18" uuid="c2b4da75-fdca-4e99-8103-5769dea75841">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{itemName} + "(" +  $F{uom}  + ")"]]></textFieldExpression>
@@ -376,6 +376,6 @@
 		</band>
 	</detail>
 	<pageFooter>
-		<band height="39"/>
+		<band height="14"/>
 	</pageFooter>
 </jasperReport>