Merge remote-tracking branch 'origin/master'

src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt

@@ -1380,6 +1380,7 @@ open fun getJobOrderListForPrintQrCode(date: LocalDate): List<JobOrderListForPri
         emptyList()
     }
 }
+
 open fun getCompletedJobOrderPickOrderLotDetails(pickOrderId: Long): List<Map<String, Any?>> {
     println("=== getCompletedJobOrderPickOrderLotDetails ===")
     println("pickOrderId: $pickOrderId")
@@ -1773,6 +1774,7 @@ open fun getCompletedJobOrderPickOrders(completedDate: LocalDate?): List<Map<Str
             emptyList()
         }
     }
+    // this is benson need to correct function, to add search by store Id and else part
     open fun getJobOrderPickOrderLotDetails(
         pickOrderId: Long,
         status: String? = null, // 可選，不傳=全部狀態
@@ -1793,6 +1795,17 @@ open fun getCompletedJobOrderPickOrders(completedDate: LocalDate?): List<Map<Str
                     -- Job Order Information
                     jo.id as jobOrderId,
                     jo.code as jobOrderCode,
+                    DATE_FORMAT(jo.planStart, '%Y/%m/%d') as jobOrderPlanStart,
+                    jo.reqQty as jobOrderReqQty,
+                    
+                    -- Finished Goods Information
+                    fg.code as fgCode,
+                    fg.name as fgName,
+                    
+                    b.outputQtyUom as unit,
+                    b.itemId as bomItemId,
+                    iu.uomId as bomItemUomId,
+                    uc_bom.udfudesc as uomConversionDesc,
                     
                     -- Pick Order Line Information
                     pol.id as pickOrderLineId,
@@ -1883,6 +1896,8 @@ open fun getCompletedJobOrderPickOrders(completedDate: LocalDate?): List<Map<Str
                     
                 FROM fpsmsdb.pick_order po
                 JOIN fpsmsdb.job_order jo ON jo.id = po.joId
+                LEFT JOIN fpsmsdb.bom b ON b.id = jo.bomId
+                LEFT JOIN fpsmsdb.items fg ON fg.id = b.itemId
                 JOIN fpsmsdb.pick_order_line pol ON pol.poId = po.id
                 JOIN fpsmsdb.items i ON i.id = pol.itemId
                 LEFT JOIN fpsmsdb.uom_conversion uc ON uc.id = pol.uomId
@@ -1897,6 +1912,9 @@ open fun getCompletedJobOrderPickOrders(completedDate: LocalDate?): List<Map<Str
                         OR (sol.inventoryLotLineId IS NULL AND ill.id IS NULL)
                     )
                 LEFT JOIN fpsmsdb.jo_pick_order jpo ON jpo.pick_order_id = po.id AND jpo.item_id = pol.itemId
+                LEFT JOIN fpsmsdb.item_uom iu ON iu.itemId = b.itemId AND iu.stockUnit = 1
+                LEFT JOIN fpsmsdb.uom_conversion uc_fg ON uc_fg.id = iu.uomId
+                LEFT JOIN fpsmsdb.uom_conversion uc_bom ON uc_bom.id = iu.uomId
                 WHERE po.deleted = false
                   AND po.id = :pickOrderId
                   AND pol.deleted = false

src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt

@@ -736,8 +736,24 @@ open class JobOrderService(
 
         val fields = mutableListOf<MutableMap<String, Any>>()
         val params = mutableMapOf<String, Any>()
+        val normalizedFloor = request.floor?.trim()?.uppercase()
+        val selectedFloor = normalizedFloor?.takeIf { it in setOf("2F", "3F", "4F") }
+        val floorLabel = when (normalizedFloor) {
+            "2F", "3F", "4F" -> normalizedFloor.replace("F", "/F")
+            "ALL" -> "2/F+3/F+4/F+N/A"
+            else -> ""
+        }
 
-        val sortedPickRecordInfo = pickRecordInfo.sortedBy { info ->
+        val sortedPickRecordInfo = pickRecordInfo
+            .filter { info ->
+                val route = (info["routerRoute"] as? String)?.trim().orEmpty()
+                if (selectedFloor == null) {
+                    true
+                } else {
+                    route.isBlank() || route.equals("N/A", ignoreCase = true) || route.startsWith(selectedFloor, ignoreCase = true)
+                }
+            }
+            .sortedBy { info ->
             (info["routerIndex"] as? Int) ?: Int.MAX_VALUE
         }
 
@@ -770,6 +786,7 @@ open class JobOrderService(
         params["RequiredQuantity"] = reqQty?.toString() ?: "N/A"
         params["FGCode"] = pickRecordInfo.firstOrNull()?.get("fgCode") as? String ?: "N/A"
         params["FGName"] = pickRecordInfo.firstOrNull()?.get("fgName") as? String ?: "N/A"
+        params["Floor"] = floorLabel
 
         /* Debug UOM information
         val bomItemUomIdRaw = pickRecordInfo.firstOrNull()?.get("bomItemUomId")
@@ -803,7 +820,8 @@ open class JobOrderService(
 
         val pdf = exportPickRecord(
             ExportPickRecordRequest(
-                pickOrderIds = request.pickOrderId
+                pickOrderIds = request.pickOrderId,
+                floor = request.floor,
             )
         )
 

src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt

@@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import com.ffii.fpsms.modules.jobOrder.service.JoPickOrderService
-import com.ffii.fpsms.modules.jobOrder.service.JoWorkbenchMainService
-import com.ffii.fpsms.modules.jobOrder.service.JoWorkbenchReleaseService
+//import com.ffii.fpsms.modules.jobOrder.service.JoWorkbenchMainService
+//import com.ffii.fpsms.modules.jobOrder.service.JoWorkbenchReleaseService
 import com.ffii.fpsms.modules.pickOrder.enums.PickOrderStatus
 
 import org.springframework.format.annotation.DateTimeFormat
@@ -55,8 +55,8 @@ class JobOrderController(
     private val jobOrderBomMaterialService: JobOrderBomMaterialService,
     private val jobOrderProcessService: JobOrderProcessService,
     private val joPickOrderService: JoPickOrderService,
-    private val joWorkbenchMainService: JoWorkbenchMainService,
-    private val joWorkbenchReleaseService: JoWorkbenchReleaseService,
+    //private val joWorkbenchMainService: JoWorkbenchMainService,
+    //private val joWorkbenchReleaseService: JoWorkbenchReleaseService,
     private val productProcessService: ProductProcessService,
     private val jobOrderCreationService: com.ffii.fpsms.modules.jobOrder.service.JobOrderCreationService
 ) {
@@ -96,11 +96,12 @@ class JobOrderController(
     }
 
     /** Workbench: release without stock out / SPL / SOL until first pick-order assign. */
+    /*
     @PostMapping("/workbench/release")
     fun releaseJobOrderForWorkbench(@Valid @RequestBody request: JobOrderCommonActionRequest): MessageResponse {
         return joWorkbenchReleaseService.releaseJobOrderForWorkbench(request)
     }
-
+    */
     @PostMapping("/set-hidden")
     fun setJobOrderHidden(@Valid @RequestBody request: SetJobOrderHiddenRequest): MessageResponse {
         return jobOrderService.setJobOrderHidden(request)
@@ -149,6 +150,7 @@ class JobOrderController(
     }
 
     /** Workbench: assign + prime SPL/SOL when release was deferred (see [JoWorkbenchMainService]). */
+    /*
     @PostMapping("/workbench/assign-job-order-pick-order/{pickOrderId}/{userId}")
     fun assignJobOrderPickOrderToUserForWorkbench(
         @PathVariable pickOrderId: Long,
@@ -156,6 +158,7 @@ class JobOrderController(
     ): MessageResponse {
         return joWorkbenchMainService.assignJobOrderPickOrderToUserForWorkbench(pickOrderId, userId)
     }
+    */
     @PostMapping("/unassign-job-order-pick-order/{pickOrderId}")
     fun unAssignJobOrderPickOrderToUser(
         @PathVariable pickOrderId: Long
@@ -312,10 +315,12 @@ fun getJobOrderPickOrderLotDetails(
     }
 
     /** Workbench: available qty uses in−out (matches scan-pick); stockouts include suggested SPL qty when matched. */
+    /*
     @GetMapping("/all-lots-hierarchical-by-pick-order-workbench/{pickOrderId}")
     fun getJobOrderLotsHierarchicalByPickOrderIdWorkbench(@PathVariable pickOrderId: Long): JobOrderLotsHierarchicalResponse {
         return joWorkbenchMainService.getJobOrderLotsHierarchicalByPickOrderIdWorkbench(pickOrderId)
     }
+    */
     @PostMapping("/update-jo-pick-order-handled-by")
 fun updateJoPickOrderHandledBy(@Valid @RequestBody request: UpdateJoPickOrderHandledByRequest): MessageResponse {
     try {

src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/ExportPickRecordRequest.kt

@@ -2,4 +2,5 @@ package com.ffii.fpsms.modules.jobOrder.web.model
 
 data class ExportPickRecordRequest (
     val pickOrderIds: Long,
+    val floor: String? = null,
 )

src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/PrintPickRecordRequest.kt

@@ -3,5 +3,6 @@ package com.ffii.fpsms.modules.jobOrder.web.model
 data class PrintPickRecordRequest(
     val pickOrderId: Long,
     val printerId: Long,
-    val printQty: Int?
+    val printQty: Int?,
+    val floor: String? = null,
 )

src/main/resources/PickRecord/PickRecordPDF.jrxml

@@ -1,326 +1,327 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <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="PickRecordv2" language="javascript" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isTitleNewPage="true" uuid="a037339e-92cf-44fd-9360-64465f285f3c">
-    <parameter name="JobOrderCode" class="java.lang.String"/>
-    <parameter name="FGCode" class="java.lang.String"/>
-    <parameter name="unit" class="java.lang.String"/>
-    <parameter name="ProductionDate" class="java.lang.String"/>
-    <parameter name="FGName" class="java.lang.String"/>
-    <parameter name="RequiredQuantity" class="java.lang.String"/>
-    <queryString>
-        <![CDATA[]]>
-    </queryString>
-    <field name="route" class="java.lang.String"/>
-    <field name="itemNo" class="java.lang.String"/>
-    <field name="uom" class="java.lang.String"/>
-    <field name="lotNo" class="java.lang.String"/>
-    <field name="qty" class="java.lang.String"/>
-    <field name="shortName" class="java.lang.String"/>
-    <field name="sequenceNumber" class="java.lang.String"/>
-    <field name="itemName" class="java.lang.String"/>
-    <background>
-        <band splitType="Stretch"/>
-    </background>
-    <pageHeader>
-        <band height="103" splitType="Stretch">
-            <staticText>
-                <reportElement x="225" y="5" width="108" height="23" uuid="324397fb-d07b-4748-a917-7de93ebbe012">
-                    <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="16"/>
-                </textElement>
-                <text><![CDATA[板頭紙]]></text>
-            </staticText>
-            <staticText>
-                <reportElement x="535" y="5" width="25" height="18" uuid="178c50a8-90e2-4c80-95f8-7c27dcc5ce02">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Center" verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[頁]]></text>
-            </staticText>
-            <textField evaluationTime="Report">
-                <reportElement x="515" y="5" width="20" height="18" uuid="9d782ac8-6fd4-4336-abfe-436435476462">
-                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
-                    <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="495" y="5" width="20" height="18" uuid="bb483d46-d12d-40a4-ab31-5353cdf68162">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Center" verticalAlignment="Justified">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[/]]></text>
-            </staticText>
-            <textField>
-                <reportElement x="475" y="5" width="20" height="18" uuid="7b27be01-3bb1-42f5-a4b1-6dd3674c2b8d">
-                    <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="435" y="5" width="40" height="18" uuid="e9a7bc86-91db-4ea2-ae67-89f596f356de">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Center" verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[頁數]]></text>
-            </staticText>
-            <staticText>
-                <reportElement x="5" y="35" width="80" height="18" uuid="11b7324d-086a-427b-bd9b-78ca6789f1fa">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left" verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[工單編號：]]></text>
-            </staticText>
-            <textField>
-                <reportElement x="85" y="35" width="150" height="18" uuid="abfe6fd4-11e3-463b-b075-ed6b335e4a97">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$P{JobOrderCode}]]></textFieldExpression>
-            </textField>
-            <staticText>
-                <reportElement x="5" y="55" width="80" height="18" uuid="17445159-6cfb-46a0-835d-8cdc1585b793">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left" verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[成品編號：]]></text>
-            </staticText>
-            <textField>
-                <reportElement x="85" y="55" width="150" height="18" uuid="c9a7aaad-ef1a-4e42-9c32-794dcf5d8ca9">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$P{FGCode}]]></textFieldExpression>
-            </textField>
-            <staticText>
-                <reportElement x="285" y="55" width="80" height="18" uuid="12a14105-c207-4550-a9bd-30a74a25a5c4">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left" verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[成品名稱：]]></text>
-            </staticText>
-            <textField>
-                <reportElement x="365" y="55" width="150" height="18" uuid="62720d55-e8e1-49c8-a420-8318685e9e58">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$P{FGName}]]></textFieldExpression>
-            </textField>
-            <staticText>
-                <reportElement x="285" y="75" width="80" height="18" uuid="3ec46348-493e-403f-aefb-5f4aef992877">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left" verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[需求數量：]]></text>
-            </staticText>
-            <textField>
-                <reportElement x="365" y="75" width="150" height="18" uuid="367706ae-196f-4b5d-b9b2-5fbc4d70ce9b">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$P{RequiredQuantity}]]></textFieldExpression>
-            </textField>
-            <staticText>
-                <reportElement x="285" y="35" width="80" height="18" uuid="411116fd-f273-4eed-bd6c-1db269cd9adb">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left" verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[生產日期：]]></text>
-            </staticText>
-            <textField>
-                <reportElement x="365" y="35" width="150" height="18" uuid="f044c78b-cdcb-4a90-81c5-a6fc81b73efc">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$P{ProductionDate}]]></textFieldExpression>
-            </textField>
-            <staticText>
-                <reportElement x="5" y="75" width="80" height="18" uuid="e280f805-b423-4ac7-a429-2d5d81edf3bc">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left" verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[銷售單位：]]></text>
-            </staticText>
-            <textField>
-                <reportElement x="85" y="75" width="150" height="18" uuid="ee5b0bcd-5a86-43e1-a003-ea5c7b9dd147">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$P{unit}]]></textFieldExpression>
-            </textField>
-        </band>
-    </pageHeader>
-    <columnHeader>
-        <band height="42" splitType="Stretch">
-            <staticText>
-                <reportElement x="0" y="10" width="50" height="18" uuid="c4baf479-7a41-49cb-a2cf-be798e11b2c1">
-                    <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">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[序號]]></text>
-            </staticText>
-            <staticText>
-                <reportElement x="50" y="10" width="95" height="18" uuid="e66fdecd-3672-423d-8a10-ed078a5ac5bf">
-                    <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">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[路綫]]></text>
-            </staticText>
-            <staticText>
-                <reportElement x="145" y="10" width="80" height="18" uuid="38721c72-5f81-4be3-b1e1-335562f1dc38">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[貨品編號]]></text>
-            </staticText>
-            <staticText>
-                <reportElement x="225" y="10" width="245" height="18" uuid="558582fa-0269-47d6-960b-305e51a8ff0c">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[貨品名稱]]></text>
-            </staticText>
-            <staticText>
-                <reportElement x="470" y="10" width="84" height="18" uuid="bae79e0c-96f8-45dc-a5db-1c85466f860a">
-                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left">
-                    <font fontName="微軟正黑體" size="12"/>
-                </textElement>
-                <text><![CDATA[已提數量]]></text>
-            </staticText>
-            <line>
-                <reportElement x="0" y="33" width="554" height="1" uuid="ff5ea71d-829e-40f0-bfa8-d223d9fc7769">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-            </line>
-            <line>
-                <reportElement x="0" y="28" width="554" height="1" uuid="f8aa06c3-5656-4ce4-9e16-71ca47e0036f">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-            </line>
-        </band>
-    </columnHeader>
-    <detail>
-        <band height="44" splitType="Stretch">
-            <textField>
-                <reportElement x="145" y="0" width="80" height="18" uuid="115d523b-e9c3-484e-9663-4f4953555258">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Top">
-                    <font fontName="微軟正黑體"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
-            </textField>
-            <textField>
-                <reportElement x="0" y="0" width="50" height="18" uuid="619701f2-9515-433e-9bb5-cfe5d0a3e8c6">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Top">
-                    <font fontName="微軟正黑體"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$F{sequenceNumber}]]></textFieldExpression>
-            </textField>
-            <textField>
-                <reportElement x="50" y="0" width="95" height="18" uuid="d6f3c123-c7e2-4c98-b14c-4e6e27197b78">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Top">
-                    <font fontName="微軟正黑體"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$F{route}]]></textFieldExpression>
-            </textField>
-            <textField>
-                <reportElement x="225" y="0" width="245" height="18" uuid="7b2f23a2-277f-4eec-af2b-468e5000d801">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Top">
-                    <font fontName="微軟正黑體"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$F{itemName} + "(" +  $F{uom}  + ")"]]></textFieldExpression>
-            </textField>
-            <textField>
-                <reportElement x="225" y="17" width="245" height="18" uuid="11233863-3357-4fe3-9b32-31e93927f23e">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement verticalAlignment="Top">
-                    <font fontName="微軟正黑體"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
-            </textField>
-            <textField>
-                <reportElement x="470" y="-1" width="84" height="18" uuid="1ae1c905-d97b-4f47-b72d-f11789ee5891">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-                <textElement textAlignment="Left" verticalAlignment="Top">
-                    <font fontName="微軟正黑體"/>
-                </textElement>
-                <textFieldExpression><![CDATA[$F{qty} + $F{shortName}]]></textFieldExpression>
-            </textField>
-            <line>
-                <reportElement x="0" y="35" width="554" height="1" uuid="d7111b08-77a9-4f83-931a-985d2768ddb6">
-                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                </reportElement>
-            </line>
-        </band>
-    </detail>
+	<parameter name="JobOrderCode" class="java.lang.String"/>
+	<parameter name="FGCode" class="java.lang.String"/>
+	<parameter name="unit" class="java.lang.String"/>
+	<parameter name="ProductionDate" class="java.lang.String"/>
+	<parameter name="FGName" class="java.lang.String"/>
+	<parameter name="RequiredQuantity" class="java.lang.String"/>
+	<parameter name="Floor" class="java.lang.String"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="route" class="java.lang.String"/>
+	<field name="itemNo" class="java.lang.String"/>
+	<field name="uom" class="java.lang.String"/>
+	<field name="lotNo" class="java.lang.String"/>
+	<field name="qty" class="java.lang.String"/>
+	<field name="shortName" class="java.lang.String"/>
+	<field name="sequenceNumber" class="java.lang.String"/>
+	<field name="itemName" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<pageHeader>
+		<band height="103" splitType="Stretch">
+			<textField>
+				<reportElement x="180" y="5" width="153" height="23" uuid="324397fb-d07b-4748-a917-7de93ebbe012">
+					<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="16"/>
+				</textElement>
+				<textFieldExpression><![CDATA["板頭紙（" + ($P{Floor} == null ? "" : $P{Floor}) + "）"]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="535" y="5" width="25" height="18" uuid="178c50a8-90e2-4c80-95f8-7c27dcc5ce02">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[頁]]></text>
+			</staticText>
+			<textField evaluationTime="Report">
+				<reportElement x="515" y="5" width="20" height="18" uuid="9d782ac8-6fd4-4336-abfe-436435476462">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<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="495" y="5" width="20" height="18" uuid="bb483d46-d12d-40a4-ab31-5353cdf68162">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Justified">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[/]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="475" y="5" width="20" height="18" uuid="7b27be01-3bb1-42f5-a4b1-6dd3674c2b8d">
+					<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="435" y="5" width="40" height="18" uuid="e9a7bc86-91db-4ea2-ae67-89f596f356de">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[頁數]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="5" y="35" width="80" height="18" uuid="11b7324d-086a-427b-bd9b-78ca6789f1fa">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[工單編號：]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="85" y="35" width="150" height="18" uuid="abfe6fd4-11e3-463b-b075-ed6b335e4a97">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{JobOrderCode}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="5" y="55" width="80" height="18" uuid="17445159-6cfb-46a0-835d-8cdc1585b793">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[成品編號：]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="85" y="55" width="150" height="18" uuid="c9a7aaad-ef1a-4e42-9c32-794dcf5d8ca9">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{FGCode}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="285" y="55" width="80" height="18" uuid="12a14105-c207-4550-a9bd-30a74a25a5c4">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[成品名稱：]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="365" y="55" width="150" height="18" uuid="62720d55-e8e1-49c8-a420-8318685e9e58">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{FGName}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="285" y="75" width="80" height="18" uuid="3ec46348-493e-403f-aefb-5f4aef992877">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[需求數量：]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="365" y="75" width="150" height="18" uuid="367706ae-196f-4b5d-b9b2-5fbc4d70ce9b">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{RequiredQuantity}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="285" y="35" width="80" height="18" uuid="411116fd-f273-4eed-bd6c-1db269cd9adb">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[生產日期：]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="365" y="35" width="150" height="18" uuid="f044c78b-cdcb-4a90-81c5-a6fc81b73efc">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{ProductionDate}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="5" y="75" width="80" height="18" uuid="e280f805-b423-4ac7-a429-2d5d81edf3bc">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[銷售單位：]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="85" y="75" width="150" height="18" uuid="ee5b0bcd-5a86-43e1-a003-ea5c7b9dd147">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{unit}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="42" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="10" width="50" height="18" uuid="c4baf479-7a41-49cb-a2cf-be798e11b2c1">
+					<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">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[序號]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="50" y="10" width="95" height="18" uuid="e66fdecd-3672-423d-8a10-ed078a5ac5bf">
+					<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">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[路綫]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="145" y="10" width="80" height="18" uuid="38721c72-5f81-4be3-b1e1-335562f1dc38">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[貨品編號]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="225" y="10" width="245" height="18" uuid="558582fa-0269-47d6-960b-305e51a8ff0c">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[貨品名稱]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="470" y="10" width="84" height="18" uuid="bae79e0c-96f8-45dc-a5db-1c85466f860a">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[已提數量]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="33" width="554" height="1" uuid="ff5ea71d-829e-40f0-bfa8-d223d9fc7769">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+			<line>
+				<reportElement x="0" y="28" width="554" height="1" uuid="f8aa06c3-5656-4ce4-9e16-71ca47e0036f">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="44" splitType="Stretch">
+			<textField>
+				<reportElement x="145" y="0" width="80" height="18" uuid="115d523b-e9c3-484e-9663-4f4953555258">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Top">
+					<font fontName="微軟正黑體"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="0" width="50" height="18" uuid="619701f2-9515-433e-9bb5-cfe5d0a3e8c6">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Top">
+					<font fontName="微軟正黑體"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{sequenceNumber}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="50" y="0" width="95" height="18" uuid="d6f3c123-c7e2-4c98-b14c-4e6e27197b78">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Top">
+					<font fontName="微軟正黑體"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{route}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="225" y="0" width="245" height="18" uuid="7b2f23a2-277f-4eec-af2b-468e5000d801">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Top">
+					<font fontName="微軟正黑體"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{itemName} + "(" +  $F{uom}  + ")"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="225" y="17" width="245" height="18" uuid="11233863-3357-4fe3-9b32-31e93927f23e">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Top">
+					<font fontName="微軟正黑體"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="470" y="-1" width="84" height="18" uuid="1ae1c905-d97b-4f47-b72d-f11789ee5891">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Top">
+					<font fontName="微軟正黑體"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{qty} + $F{shortName}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="35" width="554" height="1" uuid="d7111b08-77a9-4f83-931a-985d2768ddb6">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+		</band>
+	</detail>
 </jasperReport>