update fg stock out report

src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt

@@ -422,7 +422,8 @@ return result
         il.expiryDate
     ORDER BY
         it.code,
-        il.lotNo
+        il.lotNo,
+        deliveryDate
 """.trimIndent()
 
     val result = jdbcDao.queryForList(sql, args)

src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml

@@ -56,6 +56,7 @@
 	<field name="storeLocation" class="java.lang.String"/>
 	<field name="pickRemark" class="java.lang.String"/>
 	<field name="deliveryOrderNo" class="java.lang.String"/>
+	<field name="deliveryDate" class="java.lang.String"/>
 	<field name="totalStockOutQty" class="java.lang.String"/>
 	<group name="Group1" keepTogether="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
@@ -74,7 +75,7 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="220" y="0" width="190" height="18" uuid="73188a51-3255-443c-9fee-4f3b527072c4">
+					<reportElement x="298" y="0" width="190" height="18" uuid="73188a51-3255-443c-9fee-4f3b527072c4">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -84,7 +85,7 @@
 					<text><![CDATA[總出倉量：]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="410" y="0" width="59" height="18" uuid="e4734789-5213-4934-80fe-6d72f3c38f23"/>
+					<reportElement x="490" y="0" width="59" height="18" uuid="e4734789-5213-4934-80fe-6d72f3c38f23"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
 					</textElement>
@@ -150,7 +151,7 @@
 				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="410" y="80" width="59" height="18" uuid="7950d513-4660-445b-9b18-08e062b66f30">
+				<reportElement x="490" y="80" width="59" height="18" uuid="7950d513-4660-445b-9b18-08e062b66f30">
 					<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"/>
@@ -161,7 +162,7 @@
 				<text><![CDATA[出貨數量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="330" y="80" width="80" height="18" uuid="a2e0f22f-b299-4712-84f7-7ba3b54b1d1c">
+				<reportElement x="410" y="80" width="80" height="18" uuid="a2e0f22f-b299-4712-84f7-7ba3b54b1d1c">
 					<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"/>
@@ -172,7 +173,7 @@
 				<text><![CDATA[到期日]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="130" y="80" width="100" height="18" uuid="ccda69a3-43de-413b-b53c-1b572e92fcf8">
+				<reportElement x="210" y="80" width="100" height="18" uuid="ccda69a3-43de-413b-b53c-1b572e92fcf8">
 					<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"/>
@@ -183,7 +184,7 @@
 				<text><![CDATA[提料單編號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="469" y="80" width="49" height="18" uuid="21d9afe9-fd02-4896-a478-60967afc50f4">
+				<reportElement x="549" y="80" width="49" height="18" uuid="21d9afe9-fd02-4896-a478-60967afc50f4">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -193,7 +194,7 @@
 				<text><![CDATA[提料人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="230" y="80" width="100" height="18" uuid="03fc341e-7026-4f5e-b975-264097a7aeda">
+				<reportElement x="310" y="80" width="100" height="18" uuid="03fc341e-7026-4f5e-b975-264097a7aeda">
 					<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"/>
@@ -204,7 +205,7 @@
 				<text><![CDATA[批號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="630" y="80" width="168" height="18" uuid="0f155dfc-0aff-4935-aa8f-54b4f01af51e">
+				<reportElement x="710" y="80" width="92" height="18" uuid="0f155dfc-0aff-4935-aa8f-54b4f01af51e">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -214,7 +215,7 @@
 				<text><![CDATA[提料備注]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="518" y="80" width="112" height="18" uuid="b20762b2-25ab-4fde-a693-a8b32776d866">
+				<reportElement x="598" y="80" width="112" height="18" uuid="b20762b2-25ab-4fde-a693-a8b32776d866">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -222,9 +223,20 @@
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[存貨位置]]></text>
+			</staticText>
+				<staticText>
+				<reportElement x="10" y="80" width="80" height="18" uuid="5db44150-7e52-40dc-9fab-fe174d818c61">
+					<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"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
+				</textElement>
+				<text><![CDATA[送貨日期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="10" y="80" width="120" height="18" uuid="5db44150-7e52-40dc-9fab-fe174d818c61">
+				<reportElement x="90" y="80" width="120" height="18" uuid="5db44150-7e52-40dc-9fab-fe174d818c61">
 					<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"/>
@@ -312,8 +324,15 @@
 	</pageHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
+		<textField textAdjust="StretchHeight">
+			<reportElement x="10" y="0" width="80" height="17" uuid="d1e2f3a4-b5c6-4d7e-8f90-1234567890ab"/>
+			<textElement textAlignment="Center" verticalAlignment="Top">
+				<font fontName="微軟正黑體" size="10"/>
+			</textElement>
+			<textFieldExpression><![CDATA[$F{deliveryDate}]]></textFieldExpression>
+		</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="10" y="0" width="120" height="17" uuid="78ffaf9e-52c3-4d50-94ac-73f826d2448a">
+				<reportElement x="90" y="0" width="120" height="17" uuid="78ffaf9e-52c3-4d50-94ac-73f826d2448a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
@@ -323,49 +342,49 @@
 				<textFieldExpression><![CDATA[$F{deliveryOrderNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="130" y="0" width="100" height="17" uuid="939193b3-e573-4e5d-af6c-da58910f03a1"/>
+				<reportElement x="210" y="0" width="100" height="17" uuid="939193b3-e573-4e5d-af6c-da58910f03a1"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{stockReqNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="230" y="0" width="100" height="17" uuid="92aae78d-2b61-4e61-9b18-574a9a7d515c"/>
+				<reportElement x="310" y="0" width="100" height="17" uuid="92aae78d-2b61-4e61-9b18-574a9a7d515c"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="330" y="0" width="80" height="17" uuid="696e6d6c-101c-4e4e-b0c8-b3aabefb78ab"/>
+				<reportElement x="410" y="0" width="80" height="17" uuid="696e6d6c-101c-4e4e-b0c8-b3aabefb78ab"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="410" y="0" width="59" height="17" uuid="45523cc4-2b5b-4a1b-8bfc-db16158a92dc"/>
+				<reportElement x="490" y="0" width="59" height="17" uuid="45523cc4-2b5b-4a1b-8bfc-db16158a92dc"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{stockOutQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="469" y="0" width="49" height="17" uuid="6384ebfc-6d01-404a-bea1-73d4e4ac5fc3"/>
+				<reportElement x="549" y="0" width="49" height="17" uuid="6384ebfc-6d01-404a-bea1-73d4e4ac5fc3"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{handler}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="518" y="0" width="112" height="17" uuid="bb1402fd-a96e-4345-b48c-7aeeeadbf57d"/>
+				<reportElement x="598" y="0" width="112" height="17" uuid="bb1402fd-a96e-4345-b48c-7aeeeadbf57d"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="630" y="0" width="168" height="17" uuid="35b41bee-4246-4cc7-ab30-4966c185a73b"/>
+				<reportElement x="710" y="0" width="168" height="17" uuid="35b41bee-4246-4cc7-ab30-4966c185a73b"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>