Merge remote-tracking branch 'origin/master'

src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt

@@ -45,6 +45,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
                 jo.reqQty,
                 -- b.outputQtyUom,
                 uc2.udfudesc as uom,
+                uc2.uomShortDesc as shortUom,
                 json_arrayagg(
                     json_object(
                         'id', jobm.id,

src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt

@@ -47,6 +47,7 @@ data class JobOrderDetailPickLine(
     val pickedLotNo: List<JobOrderDetailPickedLotNo>?,
     val reqQty: BigDecimal?,
     val uom: String?,
+    val shortUom: String?,
     val status: String?
 )
 

src/main/resources/DeliveryNote/DeliveryNoteCartonLabelsPDF.jrxml

@@ -1,150 +1,159 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Blank_A4" pageWidth="500" pageHeight="120" columnWidth="460" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="baa9f270-b398-4f1c-b01e-ba216b7997e9">
-	<parameter name="shopPurchaseOrderNo" class="java.lang.String"/>
-	<parameter name="shopName" class="java.lang.String"/>
-	<parameter name="shopAddress" class="java.lang.String"/>
-	<parameter name="deliveryOrderCode" class="java.lang.String"/>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<detail>
-		<band height="80" splitType="Stretch">
-			<property name="com.jaspersoft.studio.unit.height" value="px"/>
-			<textField>
-				<reportElement x="80" y="0" width="150" height="18" uuid="8fac39f8-4936-43a5-8e1f-1afbc8ccca9c">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{shopPurchaseOrderNo}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="0" width="80" height="18" uuid="e03fcb92-259c-4427-a68e-60fe5924d763">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[店鋪採購單編號：
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Blank_A4" pageWidth="425" pageHeight="283" columnWidth="385" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="baa9f270-b398-4f1c-b01e-ba216b7997e9">
+    <property name="com.jaspersoft.studio.unit." value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
+    <parameter name="shopPurchaseOrderNo" class="java.lang.String"/>
+    <parameter name="shopName" class="java.lang.String"/>
+    <parameter name="shopAddress" class="java.lang.String"/>
+    <parameter name="deliveryOrderCode" class="java.lang.String"/>
+    <queryString>
+        <![CDATA[]]>
+    </queryString>
+    <background>
+        <band splitType="Stretch"/>
+    </background>
+    <detail>
+        <band height="243" splitType="Stretch">
+            <property name="com.jaspersoft.studio.unit.height" value="px"/>
+            <textField>
+                <reportElement x="140" y="0" width="240" height="30" uuid="8fac39f8-4936-43a5-8e1f-1afbc8ccca9c">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{shopPurchaseOrderNo}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="0" y="0" width="140" height="30" uuid="e03fcb92-259c-4427-a68e-60fe5924d763">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[店鋪採購單編號：
 ]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="60" width="80" height="18" uuid="c8e417ed-73ce-4349-b83c-e59e25258544">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[箱數：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="230" y="0" width="80" height="18" uuid="f3ffd4ee-0513-41a5-94d7-f1fdb9966a76">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[送貨單編號：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="310" y="0" width="150" height="18" uuid="4319059b-9096-4c49-8275-287be93d3e6a">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{deliveryOrderCode}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="20" width="80" height="18" uuid="22ce2f40-8f43-46f0-8298-e2f224cfb239">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[店鋪名稱：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="20" width="300" height="18" uuid="9a440925-1bd4-4001-9b4b-7163ac27551e">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{shopName}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="40" width="80" height="18" uuid="057cd155-5fc8-44e5-8764-b134cb4c24f4">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[店鋪地址：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="40" width="300" height="18" uuid="26b2c156-341b-4f59-abce-bd84ea000d9d">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{shopAddress}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="150" y="60" width="20" height="18" uuid="7467bc85-22c2-4b2a-bed0-a2e82a5dba6d">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[箱]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="60" width="25" height="18" uuid="e340a673-9fdc-4559-8431-af8ea391c472">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement x="125" y="60" width="25" height="18" uuid="89ccad73-0571-4291-ae26-7804925d47eb">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="105" y="60" width="20" height="18" uuid="1cdd7507-299b-406b-baab-d2c23e44eeb0">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
-		</band>
-	</detail>
+            </staticText>
+            <staticText>
+                <reportElement x="0" y="180" width="140" height="30" uuid="c8e417ed-73ce-4349-b83c-e59e25258544">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[箱數：]]></text>
+            </staticText>
+            <staticText>
+                <reportElement x="0" y="30" width="140" height="30" uuid="f3ffd4ee-0513-41a5-94d7-f1fdb9966a76">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[送貨單編號：]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="140" y="30" width="240" height="30" uuid="4319059b-9096-4c49-8275-287be93d3e6a">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{deliveryOrderCode}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="0" y="60" width="140" height="30" uuid="22ce2f40-8f43-46f0-8298-e2f224cfb239">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[店鋪名稱：]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="140" y="60" width="240" height="60" uuid="9a440925-1bd4-4001-9b4b-7163ac27551e">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Top">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{shopName}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="0" y="120" width="140" height="30" uuid="057cd155-5fc8-44e5-8764-b134cb4c24f4">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[店鋪地址：]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="140" y="120" width="240" height="60" uuid="26b2c156-341b-4f59-abce-bd84ea000d9d">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Top">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{shopAddress}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="255" y="180" width="35" height="30" uuid="7467bc85-22c2-4b2a-bed0-a2e82a5dba6d">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[箱]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="140" y="180" width="40" height="30" uuid="e340a673-9fdc-4559-8431-af8ea391c472">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <font size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+            </textField>
+            <textField evaluationTime="Report">
+                <reportElement x="215" y="180" width="40" height="30" uuid="89ccad73-0571-4291-ae26-7804925d47eb">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <font size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="180" y="179" width="35" height="30" uuid="1cdd7507-299b-406b-baab-d2c23e44eeb0">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[/]]></text>
+            </staticText>
+        </band>
+    </detail>
 </jasperReport>