Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.io.IOException
 import java.math.BigDecimal
+import java.math.RoundingMode
 import kotlin.jvm.optionals.getOrNull
 
 @Service
@@ -48,8 +49,8 @@ open class ItemUomService(
         val stockUnit = findStockUnitByItemId(itemId) ?: return purchaseQty;
         val one = BigDecimal.ONE;
 
-        val baseQty = purchaseQty.multiply(purchaseUnit.ratioN ?: one).divide(purchaseUnit.ratioD ?: one)
-        val stockQty = baseQty.multiply(stockUnit.ratioD ?: one).divide(stockUnit.ratioN ?: one)
+        val baseQty = purchaseQty.multiply(purchaseUnit.ratioN ?: one).divide(purchaseUnit.ratioD ?: one, 2, RoundingMode.HALF_UP)
+        val stockQty = baseQty.multiply(stockUnit.ratioD ?: one).divide(stockUnit.ratioN ?: one, 2, RoundingMode.HALF_UP)
 
         return stockQty;
     }

src/main/resources/qrCodeLabel/poItemPDF.jrxml

@@ -1,196 +1,177 @@
 <?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="poItemPDF" printOrder="Horizontal" pageWidth="425" pageHeight="283" orientation="Landscape" columnWidth="421" leftMargin="2" rightMargin="2" topMargin="2" bottomMargin="2" uuid="6cb85eb9-3573-42f3-a293-099db250aec0">
-	<property name="com.jaspersoft.studio.unit." value="pixel"/>
-	<parameter name="lotNo" class="java.lang.String"/>
-	<parameter name="itemName" class="java.lang.String"/>
-	<parameter name="itemNo" class="java.lang.String"/>
-	<parameter name="poCode" class="java.lang.String"/>
-	<parameter name="qrCode" class="java.awt.Image"/>
-	<parameter name="acceptedQty" class="java.math.BigDecimal"/>
-	<parameter name="uom" class="java.lang.String"/>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="lotNo" class="java.lang.String"/>
-	<field name="itemName" class="java.lang.String"/>
-	<field name="itemNo" class="java.lang.String"/>
-	<field name="acceptedQty" class="java.lang.String"/>
-	<field name="uom" class="java.lang.String"/>
-	<field name="qrCode" class="java.awt.Image"/>
-	<field name="poCode" class="java.lang.String"/>
-	<field name="supplier" class="java.lang.String"/>
-<!--	<field name="materialWeight" class="java.lang.String"/>-->
-<!--	<field name="weightUnit" class="java.lang.String"/>-->
-	<field name="productionDate" class="java.lang.String"/>
-	<field name="expiryDate" class="java.lang.String"/>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<detail>
-		<band height="279" splitType="Stretch">
-			<textField>
-				<reportElement x="80" y="21" width="150" height="16" uuid="402f35fc-b11a-4bf1-982d-e12c622f38ea">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="21" width="80" height="16" uuid="f5f145f1-123f-4fe5-90fa-8550b3d2eb63"/>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[批次編號:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="49" width="80" height="16" uuid="c2041205-51f8-45bb-a1d1-e3de37eebed7"/>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[供應商:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="49" width="150" height="16" uuid="ab82ca39-8840-4471-b7c0-cdeec9cb5693">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{supplier}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="104" width="80" height="16" uuid="96d46fb1-939d-4f3e-b8f0-172b69b85e9f"/>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[物料編號:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="104" width="150" height="16" uuid="1f289946-b945-4f79-8515-212368b8be3b">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="160" width="80" height="16" uuid="53a2d7cf-bd50-4264-abee-346823cd49dd"/>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[數量:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="160" width="150" height="16" uuid="629d9af8-c73f-4614-ba9d-a582e2ed4a29">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{acceptedQty} + " " + $F{uom}]]></textFieldExpression>
-			</textField>
-			<image>
-				<reportElement x="230" y="45" width="190" height="190" uuid="5dd35c73-973b-4f0d-9cad-13305a29a9fd">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<imageExpression><![CDATA[$F{qrCode}]]></imageExpression>
-			</image>
-			<staticText>
-				<reportElement x="0" y="216" width="80" height="16" uuid="c62ac00a-c495-462c-93bc-97bdd3cdb395">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[生產日期:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="216" width="150" height="16" uuid="74a5cfba-046d-42f4-92d7-113729514a6f">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{productionDate}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="77" width="80" height="16" uuid="1b1efafd-049a-432e-93c4-9662273011f7"/>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[採購訂單編號:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="77" width="150" height="16" uuid="b805e20a-9a36-45c8-8255-23b6cc58f47c">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{poCode}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="132" width="80" height="16" uuid="5c3f9b03-222c-4c94-ab58-6bc86d44c5ce"/>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[物料名稱:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="132" width="150" height="16" uuid="e04b094d-2d16-4060-b6d9-2e6033a673ab">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
-			</textField>
-<!--			<staticText>-->
-<!--				<reportElement x="0" y="188" width="80" height="16" uuid="8b4d694b-90eb-4be4-b407-38d3dae15096"/>-->
-<!--				<textElement textAlignment="Left">-->
-<!--					<font fontName="微軟正黑體" size="12"/>-->
-<!--				</textElement>-->
-<!--				<text><![CDATA[總淨重量:]]></text>-->
-<!--			</staticText>-->
-<!--			<textField>-->
-<!--				<reportElement x="80" y="188" width="150" height="16" uuid="d6a75fb1-ade3-4216-b7e2-d596e65091ef">-->
-<!--					<property name="com.jaspersoft.studio.unit.height" value="px"/>-->
-<!--					<property name="com.jaspersoft.studio.unit.width" value="px"/>-->
-<!--				</reportElement>-->
-<!--				<textElement>-->
-<!--					<font fontName="微軟正黑體" size="12"/>-->
-<!--				</textElement>-->
-<!--				<textFieldExpression><![CDATA[$F{materialWeight} + " " + $F{weightUnit}]]></textFieldExpression>-->
-<!--			</textField>-->
-			<staticText>
-				<reportElement x="0" y="244" width="80" height="16" uuid="32edcad1-23c1-4d41-8c9a-352d9e6ef377"/>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[到期日:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="80" y="244" width="150" height="16" uuid="97e4a9bb-fc84-4074-b523-ddf9eb9ed2d2">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
+    <property name="com.jaspersoft.studio.unit." value="pixel"/>
+    <parameter name="lotNo" class="java.lang.String"/>
+    <parameter name="itemName" class="java.lang.String"/>
+    <parameter name="itemNo" class="java.lang.String"/>
+    <parameter name="poCode" class="java.lang.String"/>
+    <parameter name="qrCode" class="java.awt.Image"/>
+    <parameter name="acceptedQty" class="java.math.BigDecimal"/>
+    <parameter name="uom" class="java.lang.String"/>
+    <queryString>
+        <![CDATA[]]>
+    </queryString>
+    <field name="lotNo" class="java.lang.String"/>
+    <field name="itemName" class="java.lang.String"/>
+    <field name="itemNo" class="java.lang.String"/>
+    <field name="acceptedQty" class="java.lang.String"/>
+    <field name="uom" class="java.lang.String"/>
+    <field name="qrCode" class="java.awt.Image"/>
+    <field name="poCode" class="java.lang.String"/>
+    <field name="supplier" class="java.lang.String"/>
+    <field name="productionDate" class="java.lang.String"/>
+    <field name="expiryDate" class="java.lang.String"/>
+    <background>
+        <band splitType="Stretch"/>
+    </background>
+    <detail>
+        <band height="279" splitType="Stretch">
+            <textField>
+                <reportElement x="90" y="21" width="150" height="16" uuid="402f35fc-b11a-4bf1-982d-e12c622f38ea">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement>
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="10" y="21" width="80" height="16" uuid="f5f145f1-123f-4fe5-90fa-8550b3d2eb63"/>
+                <textElement textAlignment="Left">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[批次編號:]]></text>
+            </staticText>
+            <staticText>
+                <reportElement x="10" y="49" width="80" height="16" uuid="c2041205-51f8-45bb-a1d1-e3de37eebed7"/>
+                <textElement textAlignment="Left">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[供應商:]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="90" y="49" width="150" height="16" uuid="ab82ca39-8840-4471-b7c0-cdeec9cb5693">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement>
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{supplier}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="10" y="104" width="80" height="16" uuid="96d46fb1-939d-4f3e-b8f0-172b69b85e9f"/>
+                <textElement textAlignment="Left">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[物料編號:]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="90" y="104" width="150" height="16" uuid="1f289946-b945-4f79-8515-212368b8be3b">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement>
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="10" y="160" width="80" height="16" uuid="53a2d7cf-bd50-4264-abee-346823cd49dd"/>
+                <textElement textAlignment="Left">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[數量:]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="90" y="160" width="150" height="16" uuid="629d9af8-c73f-4614-ba9d-a582e2ed4a29">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement>
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{acceptedQty} + " " + $F{uom}]]></textFieldExpression>
+            </textField>
+            <image>
+                <reportElement x="230" y="45" width="190" height="190" uuid="5dd35c73-973b-4f0d-9cad-13305a29a9fd">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <imageExpression><![CDATA[$F{qrCode}]]></imageExpression>
+            </image>
+            <staticText>
+                <reportElement x="10" y="216" width="80" height="16" uuid="c62ac00a-c495-462c-93bc-97bdd3cdb395">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Left">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[收貨日期:]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="90" y="216" width="150" height="16" uuid="74a5cfba-046d-42f4-92d7-113729514a6f">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement>
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{productionDate}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="10" y="77" width="80" height="16" uuid="1b1efafd-049a-432e-93c4-9662273011f7"/>
+                <textElement textAlignment="Left">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[採購訂單編號:]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="90" y="77" width="150" height="16" uuid="b805e20a-9a36-45c8-8255-23b6cc58f47c">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement>
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{poCode}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="10" y="132" width="80" height="16" uuid="5c3f9b03-222c-4c94-ab58-6bc86d44c5ce"/>
+                <textElement textAlignment="Left">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[物料名稱:]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="90" y="132" width="150" height="16" uuid="e04b094d-2d16-4060-b6d9-2e6033a673ab">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement>
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="10" y="244" width="80" height="16" uuid="32edcad1-23c1-4d41-8c9a-352d9e6ef377"/>
+                <textElement textAlignment="Left">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[到期日:]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="90" y="244" width="150" height="16" uuid="97e4a9bb-fc84-4074-b523-ddf9eb9ed2d2">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement>
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
+            </textField>
+        </band>
+    </detail>
 </jasperReport>