Merge remote-tracking branch 'origin/master'

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

@@ -327,30 +327,36 @@ return result
 
     /**
      * Queries the database for Stock In Traceability Report data.
-     * Joins stock_in_line, stock_in, items, item_category, qc_result, inventory_lot, inventory_lot_line, warehouse, and shop tables.
-     * Supports comma-separated values for stockCategory, stockSubCategory, and itemCode.
+     * Joins stock_in_line, stock_in, items, qc_result, inventory_lot, inventory_lot_line, warehouse, and shop tables.
+     * Supports comma-separated values for stockCategory (items.type) and itemCode.
+     * When "All" is selected, it expands to all categories: MAT, FG, WIP, NM, CMB.
      */
     fun searchStockInTraceabilityReport(
         stockCategory: String?,
-        stockSubCategory: String?,
         itemCode: String?,
-        year: String?,
         lastInDateStart: String?,
         lastInDateEnd: String?
     ): List<Map<String, Any>> {
         val args = mutableMapOf<String, Any>()
         
-        val stockCategorySql = buildMultiValueLikeClause(stockCategory, "ic.parent", "stockCategory", args)
-        val stockSubCategorySql = buildMultiValueLikeClause(stockSubCategory, "ic.sub", "stockSubCategory", args)
-        val itemCodeSql = buildMultiValueLikeClause(itemCode, "it.code", "itemCode", args)
-        
-        val yearSql = if (!year.isNullOrBlank()) {
-            args["year"] = year
-            "AND YEAR(sil.receiptDate) = :year"
+        // Handle "All" option by expanding to all categories
+        val processedStockCategory = if (!stockCategory.isNullOrBlank()) {
+            val categories = stockCategory.split(",").map { it.trim() }.filter { it.isNotBlank() }
+            if (categories.contains("All")) {
+                // Replace "All" with all categories: MAT, FG, WIP, NM, CMB
+                val allCategories = listOf("MAT", "FG", "WIP", "NM", "CMB")
+                val otherCategories = categories.filter { it != "All" }
+                (allCategories + otherCategories).distinct().joinToString(",")
+            } else {
+                stockCategory
+            }
         } else {
-            ""
+            stockCategory
         }
         
+        val stockCategorySql = buildMultiValueExactClause(processedStockCategory, "it.type", "stockCategory", args)
+        val itemCodeSql = buildMultiValueLikeClause(itemCode, "it.code", "itemCode", args)
+        
         val lastInDateStartSql = if (!lastInDateStart.isNullOrBlank()) {
             args["lastInDateStart"] = lastInDateStart
             "AND sil.receiptDate >= :lastInDateStart"
@@ -363,51 +369,49 @@ return result
 
         val sql = """
             SELECT 
-                COALESCE(ic.sub, '') as stockSubCategory,
                 COALESCE(it.code, '') as itemNo,
-                COALESCE(CONCAT(COALESCE(it.name, ''), ' ', COALESCE(it.description, '')), '') as itemName,
+                COALESCE(it.name, '') as itemName,
                 COALESCE(uc.code, '') as unitOfMeasure,
                 COALESCE(sil.dnNo, '') as dnNo,
                 COALESCE(sil.lotNo, il.lotNo, '') as lotNo,
                 COALESCE(DATE_FORMAT(COALESCE(sil.expiryDate, il.expiryDate), '%Y-%m-%d'), '') as expiryDate,
-                CAST(COALESCE(sil.acceptedQty, 0) AS CHAR) as stockInQty,
-                CAST(COALESCE(sil.acceptedQty, 0) AS CHAR) as iqcSampleQty,
-                CAST(COALESCE(qr.failQty, 0) AS CHAR) as iqcDefectQty,
-                CAST(CASE 
+                FORMAT(COALESCE(sil.acceptedQty, 0), 2) as stockInQty,
+                FORMAT(COALESCE(sil.acceptedQty, 0), 2) as iqcSampleQty,
+                FORMAT(COALESCE(qr.failQty, 0), 2) as iqcDefectQty,
+                FORMAT(CASE 
                     WHEN COALESCE(sil.acceptedQty, 0) > 0 
                     THEN ROUND((COALESCE(qr.failQty, 0) / sil.acceptedQty) * 100, 2)
                     ELSE 0 
-                END AS CHAR) as iqcDefectPercentage,
+                END, 2) as iqcDefectPercentage,
                 CASE 
                     WHEN qr.qcPassed = true OR qr.qcPassed IS NULL THEN 'Accept'
                     ELSE 'Reject'
                 END as iqcResult,
                 COALESCE(qr.remarks, '') as iqcRemarks,
                 COALESCE(wh.code, '') as storeLocation,
-                COALESCE(sp.code, '') as supplierID,
-                COALESCE(sp.name, '') as supplierName,
-                CAST(SUM(COALESCE(sil.acceptedQty, 0)) OVER (PARTITION BY it.id) AS CHAR) as totalStockInQty,
-                CAST(SUM(COALESCE(sil.acceptedQty, 0)) OVER (PARTITION BY it.id) AS CHAR) as totalIqcSampleQty,
-                CAST(SUM(COALESCE(qr.failQty, 0)) OVER (PARTITION BY it.id) AS CHAR) as totalIqcDefectQty
+                COALESCE(sp_si.code, sp_po.code, '') as supplierID,
+                COALESCE(sp_si.name, sp_po.name, '') as supplierName,
+                FORMAT(SUM(COALESCE(sil.acceptedQty, 0)) OVER (PARTITION BY it.id), 2) as totalStockInQty,
+                FORMAT(SUM(COALESCE(sil.acceptedQty, 0)) OVER (PARTITION BY it.id), 2) as totalIqcSampleQty,
+                FORMAT(SUM(COALESCE(qr.failQty, 0)) OVER (PARTITION BY it.id), 2) as totalIqcDefectQty
             FROM stock_in_line sil
             LEFT JOIN stock_in si ON sil.stockInId = si.id
+            LEFT JOIN purchase_order po ON sil.purchaseOrderId = po.id
             LEFT JOIN items it ON sil.itemId = it.id
-            LEFT JOIN item_category ic ON it.categoryId = ic.id
             LEFT JOIN item_uom iu ON it.id = iu.itemId AND iu.stockUnit = true
             LEFT JOIN uom_conversion uc ON iu.uomId = uc.id
             LEFT JOIN qc_result qr ON sil.id = qr.stockInLineId
             LEFT JOIN inventory_lot il ON sil.inventoryLotId = il.id
             LEFT JOIN inventory_lot_line ill ON il.id = ill.inventoryLotId
             LEFT JOIN warehouse wh ON ill.warehouseId = wh.id
-            LEFT JOIN shop sp ON si.supplierId = sp.id
+            LEFT JOIN shop sp_si ON si.supplierId = sp_si.id
+            LEFT JOIN shop sp_po ON po.supplierId = sp_po.id
             WHERE sil.deleted = false
             $stockCategorySql
-            $stockSubCategorySql
             $itemCodeSql
-            $yearSql
             $lastInDateStartSql
             $lastInDateEndSql
-            ORDER BY ic.sub, it.code, sil.lotNo
+            ORDER BY it.code, sil.lotNo
         """.trimIndent()
         
         return jdbcDao.queryForList(sql, args)

src/main/java/com/ffii/fpsms/modules/report/web/ReportController.kt

@@ -83,19 +83,14 @@ class ReportController(
     @GetMapping("/print-stock-in-traceability")
     fun generateStockInTraceabilityReport(
         @RequestParam(required = false) stockCategory: String?,
-        @RequestParam(required = false) stockSubCategory: String?,
         @RequestParam(required = false) itemCode: String?,
-        @RequestParam(required = false) year: String?,
         @RequestParam(required = false) lastInDateStart: String?,
         @RequestParam(required = false) lastInDateEnd: String?
     ): ResponseEntity<ByteArray> {
         val parameters = mutableMapOf<String, Any>()
         
         // Set report header parameters
-        parameters["stockCategory"] = stockCategory ?: "All"
-        parameters["stockSubCategory"] = stockSubCategory ?: "All"
         parameters["itemNo"] = itemCode ?: "All"
-        parameters["year"] = year ?: LocalDate.now().year.toString()
         parameters["reportDate"] = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
         parameters["reportTime"] = LocalTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss"))
         parameters["lastInDateStart"] = lastInDateStart ?: ""
@@ -104,9 +99,7 @@ class ReportController(
         // Query the DB to get a list of data
         val dbData = reportService.searchStockInTraceabilityReport(
             stockCategory,
-            stockSubCategory,
             itemCode,
-            year,
             lastInDateStart,
             lastInDateEnd
         )

src/main/java/com/ffii/fpsms/modules/stock/entity/projection/QrCodeInfo.kt

@@ -29,5 +29,6 @@ interface QrCodeInfo { // stockInLine
 }
 
 data class LotLineToQrcode (
-    val inventoryLotLineId: Long
+    val inventoryLotLineId: Long,
+    val isTransfer: String? = null
 )

src/main/java/com/ffii/fpsms/modules/stock/service/InventoryLotLineService.kt

@@ -14,7 +14,7 @@ import com.ffii.fpsms.modules.stock.entity.projection.InventoryLotLineInfo
 import com.ffii.fpsms.modules.stock.entity.projection.LotLineToQrcode
 import com.ffii.fpsms.modules.stock.web.InventoryLotLineController
 import com.ffii.fpsms.modules.stock.web.model.UpdateInventoryLotLineStatusRequest
-
+import org.springframework.context.annotation.Lazy
 import com.ffii.fpsms.modules.stock.web.model.ExportQrCodeRequest
 import com.ffii.fpsms.modules.stock.web.model.SaveInventoryLotLineRequest
 import com.ffii.fpsms.modules.stock.web.model.SearchInventoryLotLineInfoRequest
@@ -38,6 +38,8 @@ import com.ffii.fpsms.modules.stock.web.model.QrCodeAnalysisRequest
 import com.ffii.fpsms.modules.stock.web.model.QrCodeAnalysisResponse
 import com.ffii.fpsms.modules.stock.web.model.ScannedLotInfo
 import com.ffii.fpsms.modules.stock.web.model.SameItemLotInfo
+import com.ffii.fpsms.modules.jobOrder.service.JobOrderService
+import com.ffii.fpsms.modules.jobOrder.web.model.ExportFGStockInLabelRequest
 
 @Service
 open class InventoryLotLineService(
@@ -46,7 +48,9 @@ open class InventoryLotLineService(
     private val warehouseRepository: WarehouseRepository,
     private val itemUomRespository: ItemUomRespository,
     private val stockInLineRepository: StockInLineRepository,
-    private val inventoryRepository: InventoryRepository
+    private val inventoryRepository: InventoryRepository,
+    @Lazy
+    private val jobOrderService: JobOrderService
 ) {
     open fun findById(id: Long): Optional<InventoryLotLine> {
         return inventoryLotLineRepository.findById(id)
@@ -184,32 +188,41 @@ open class InventoryLotLineService(
         }
         val inputStream = resource.inputStream
         val poLabel = JasperCompileManager.compileReport(inputStream)
-//        val stockInLineInfo = stockInLineRepository.findStockInLineInfoByInventoryLotLineId(request.inventoryLotLineId).orElseThrow()
+
+        // 1. 从 inventoryLotLineId 获取 inventory_lot_line
         val inventoryLotLine = inventoryLotLineRepository.findById(request.inventoryLotLineId).orElseThrow()
-        val stockInLineInfo = inventoryLotLine.inventoryLot?.stockInLine?.id?.let { stockInLineRepository.findStockInLineInfoById(it).orElseThrow() } ?: throw NoSuchElementException()
+
+        // 2. 通过 inventory_lot_line.inventoryLot.stockInLine 获取 stock_in_line 信息（用于其他字段）
+        val stockInLineInfo = inventoryLotLine.inventoryLot?.stockInLine?.id?.let {
+            stockInLineRepository.findStockInLineInfoById(it).orElseThrow()
+        } ?: throw NoSuchElementException("StockInLine not found for inventoryLotLineId=${request.inventoryLotLineId}")
 
         val qrCodeInfo = listOf(stockInLineInfo)
-//        val qrCodeInfo = stockInLineRepository.findStockInLineInfoByIdInAndDeletedFalse(request.stockInLineIds).toMutableList()
         val fields = mutableListOf<MutableMap<String ,Any>>()
 
         for (info in qrCodeInfo) {
             val field = mutableMapOf<String, Any>()
             val qrContent = QrContent(itemId = info.itemId, stockInLineId = info.id)
             val qrCodeContent = (Json.encodeToString(qrContent))
-//            field["itemId"] = info.itemId
+
+            // 使用 stockInLineInfo 的其他字段
             field["itemName"] = info.itemName ?: "N/A"
             field["itemNo"] = info.itemNo
             field["poCode"] = info.poCode ?: "N/A"
             field["itemType"] = info.itemType ?: "N/A"
+
+            // 3. 计算 inventory_lot_line 的剩余数量（onHandQty）
+            val zero = BigDecimal.ZERO
+            val onHandQty = (inventoryLotLine.inQty ?: zero)
+            // .minus(inventoryLotLine.outQty ?: zero)
+            //  .minus(inventoryLotLine.holdQty ?: zero)
+
+            // Accepted qty at stock-in, no conversion (stays e.g. 50000 even after stock out)
+            field["acceptedQty"] = "%.2f".format(info.acceptedQty)
+
             val stockItemUom = itemUomRespository.findBaseUnitByItemIdAndStockUnitIsTrueAndDeletedIsFalse(info.itemId)
-            val purchaseItemUom = itemUomRespository.findByItemIdAndPurchaseUnitIsTrueAndDeletedIsFalse(info.itemId)
-            val stockQty = if (stockItemUom != null && purchaseItemUom != null) {
-                (info.acceptedQty) * (purchaseItemUom.ratioN!! / purchaseItemUom.ratioD!!) / (stockItemUom.ratioN!! / stockItemUom.ratioD!!)
-            } else {
-                info.acceptedQty
-            }
-            field["acceptedQty"] = "%.2f".format(stockQty)
-            field["uom"] = inventoryLotLine.stockUom?.uom?.udfudesc ?: stockItemUom?.uom?.udfudesc ?: info.uom?.udfudesc?.toString() ?: "N/A"
+            field["uom"] = stockItemUom?.uom?.udfudesc ?: info.uom?.udfudesc?.toString() ?: "N/A"
+
             field["productionDate"] = info.productionDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: ""
             field["expiryDate"] = info.expiryDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: ""
             field["lotNo"] = info.lotNo!!
@@ -219,7 +232,8 @@ open class InventoryLotLineService(
             fields.add(field)
         }
         val params: MutableMap<String, Any> = mutableMapOf(
-            "poCode" to (qrCodeInfo[0].poCode ?: "N/A")
+            "poCode" to (qrCodeInfo[0].poCode ?: "N/A"),
+            "isTransfer" to (request.isTransfer ?: "")
         )
         return mapOf(
             "report" to PdfUtils.fillReport(poLabel,fields, params),
@@ -227,6 +241,32 @@ open class InventoryLotLineService(
         );
     }
 
+    @Throws(IOException::class)
+    @Transactional
+    open fun exportLabelForInventoryLotLine(inventoryLotLineId: Long): Map<String, Any> {
+        val inventoryLotLine = inventoryLotLineRepository.findById(inventoryLotLineId).orElseThrow()
+        val stockInLine = inventoryLotLine.inventoryLot?.stockInLine
+
+        return when {
+            stockInLine?.jobOrder != null -> {
+                val result = jobOrderService.exportFGStockInLabel(
+                    ExportFGStockInLabelRequest(stockInLineId = stockInLine.id!!)
+                )
+                mapOf(
+                    "report" to (result["report"]!!),
+                    "fileName" to (result["filename"] ?: "label")
+                )
+            }
+            stockInLine?.stockTransferRecord != null -> {
+                val targetLocation = stockInLine.stockTransferRecord?.targetLocation ?: ""
+                exportStockInLineQrcode(
+                    LotLineToQrcode(inventoryLotLineId = inventoryLotLineId, isTransfer = "轉倉至 $targetLocation")
+                )
+            }
+            else -> exportStockInLineQrcode(LotLineToQrcode(inventoryLotLineId = inventoryLotLineId))
+        }
+    }
+
     @Transactional
 open fun updateInventoryLotLineQuantities(request: UpdateInventoryLotLineQuantitiesRequest): MessageResponse {
     try {

src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt

@@ -618,7 +618,8 @@ open class StockInLineService(
             fields.add(field)
         }
         val params: MutableMap<String, Any> = mutableMapOf(
-            "poCode" to (qrCodeInfo[0].poCode ?: "N/A") //TODO change to JO code for JO
+            "poCode" to (qrCodeInfo[0].poCode ?: "N/A"), //TODO change to JO code for JO
+            "isTransfer" to ""
         )
         return mapOf(
             "report" to PdfUtils.fillReport(poLabel,fields, params),

src/main/java/com/ffii/fpsms/modules/stock/service/StockTransferRecordService.kt

@@ -94,14 +94,6 @@ open class StockTransferRecordService(
             throw IllegalArgumentException("warehouseId is required for stock in")
         }
 
-        // Step 4: Check if existing InventoryLotLine with same lot and warehouse exists
-        val existingInventoryLotLine = inventoryLotLineRepository.findByLotNoAndItemIdAndWarehouseId(
-            lotNo = lotNo,
-            itemId = itemId,
-            warehouseId = request.warehouseId
-        )
-
-        // Step 5: Map to StockInRequest
         val stockInRequest = StockInRequest(
             itemId = itemId,
             itemNo = itemCode,
@@ -115,25 +107,7 @@ open class StockTransferRecordService(
             warehouseId = request.warehouseId
         )
 
-        return if (existingInventoryLotLine != null) {
-            // Update existing InventoryLotLine's inQty
-            existingInventoryLotLine.apply {
-                val currentInQty = this.inQty ?: BigDecimal.ZERO
-                this.inQty = currentInQty + request.transferredQty
-
-                // Update status if it was UNAVAILABLE and now has stock
-                if (this.status == InventoryLotLineStatus.UNAVAILABLE) {
-                    this.status = InventoryLotLineStatus.AVAILABLE
-                }
-            }
-            inventoryLotLineRepository.saveAndFlush(existingInventoryLotLine)
-
-            // Create StockIn and StockInLine for record keeping, linking to existing InventoryLotLine
-            stockInLineService.createStockInForExistingInventoryLotLine(stockInRequest, existingInventoryLotLine)
-        } else {
-            // Normal flow: create new InventoryLotLine
-            stockInLineService.createStockIn(stockInRequest)
-        }
+        return stockInLineService.createStockIn(stockInRequest)
     }
 
     private fun createStockTransferRecord(

src/main/java/com/ffii/fpsms/modules/stock/web/InventoryLotLineController.kt

@@ -79,7 +79,7 @@ class InventoryLotLineController (
         response.characterEncoding = "utf-8";
         response.contentType = "application/pdf";
         val out: OutputStream = response.outputStream
-        val pdf = inventoryLotLineService.exportStockInLineQrcode(request)
+        val pdf = inventoryLotLineService.exportLabelForInventoryLotLine(request.inventoryLotLineId)
         val jasperPrint = pdf["report"] as JasperPrint
         response.addHeader("filename", "${pdf["fileName"]}.pdf")
         out.write(JasperExportManager.exportReportToPdf(jasperPrint));

src/main/resources/jasper/FGDeliveryReport.jrxml

@@ -1,560 +1,422 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- 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="FGStockOutTraceabilityReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c40e235b-365d-48a0-a1b8-a8e0ece2cdd3">
-	<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"/>
-	<subDataset name="Dataset1" uuid="dfaf2f9f-3937-4f84-9b1f-fd0ecf2f1ee9">
-		<queryString>
-			<![CDATA[]]>
-		</queryString>
-	</subDataset>
-	<parameter name="stockSubCategory" class="java.lang.String">
-		<defaultValueExpression><![CDATA["stockSubCategory"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="date" class="java.lang.String">
-		<defaultValueExpression><![CDATA["date"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="stockCategory" class="java.lang.String">
-		<defaultValueExpression><![CDATA["stockCategory"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="reportDate" class="java.lang.String"/>
-	<parameter name="reportTime" class="java.lang.String"/>
-	<parameter name="deliveryPeriodStart" class="java.lang.String"/>
-	<parameter name="deliveryPeriodEnd" class="java.lang.String"/>
-	<parameter name="year" class="java.lang.String"/>
-	<parameter name="itemNo" class="java.lang.String">
-		<defaultValueExpression><![CDATA["itemCode"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="lastOutDateStart" class="java.lang.String">
-		<parameterDescription><![CDATA["lastOutDateStart"]]></parameterDescription>
-	</parameter>
-	<parameter name="lastOutDateEnd" class="java.lang.String">
-		<parameterDescription><![CDATA["lastOutDateStart"]]></parameterDescription>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="deliveryDate" class="java.lang.String"/>
-	<field name="itemNo" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.name" value="code"/>
-		<property name="com.jaspersoft.studio.field.label" value="code"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="items"/>
-		<fieldDescription><![CDATA[]]></fieldDescription>
-	</field>
-	<field name="itemName" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.name" value="name"/>
-		<property name="com.jaspersoft.studio.field.label" value="name"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="items"/>
-		<fieldDescription><![CDATA[]]></fieldDescription>
-	</field>
-	<field name="unitOfMeasure" class="java.lang.String"/>
-	<field name="dnNo" class="java.lang.String"/>
-	<field name="customerId" class="java.lang.String"/>
-	<field name="customerName" class="java.lang.String"/>
-	<field name="qty" class="java.lang.String"/>
-	<field name="qtyNumeric" class="java.math.BigDecimal"/>
-	<field name="truckNo" class="java.lang.String"/>
-	<field name="driver" class="java.lang.String"/>
-	<field name="deliveryOrderNo" class="java.lang.String"/>
-	<field name="stockSubCategory" class="java.lang.String"/>
-	<variable name="totalDeliveredQtyPerDeliveryOrder" class="java.math.BigDecimal" 
-          incrementType="Group" 
-          incrementGroup="itemGroup" 
-          calculation="First"
-          resetType="Group"
-          resetGroup="itemGroup">
-    <variableExpression><![CDATA[$F{qtyNumeric}]]></variableExpression>
-</variable>
-	<group name="itemGroup">
-		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
-		<groupHeader>
-			<band height="69">
-				<textField>
-					<reportElement x="251" y="30" width="118" height="18" uuid="8d42562f-843e-43e7-bb4a-5bf08f9adc89">
-						<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="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{deliveryOrderNo}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="0" y="30" width="60" height="18" uuid="01a9586b-b5d2-45a9-b852-acaff85053ff">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Top">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{stockSubCategory}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="60" y="30" width="91" height="18" uuid="0817468e-35ff-45f0-b863-56dae97e9491">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Top">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="151" y="30" width="100" height="18" uuid="d3aca20f-bd40-425e-86cf-20532a0ea21b">
-						<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="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement x="181" y="50" width="119" height="18" uuid="0f570907-538c-4d1e-a261-5e275f2c3fbe">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[DN編號]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="300" y="50" width="110" height="18" uuid="74843adf-ac6c-4c37-9f17-5bb59031386a">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[顧客ID]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="410" y="50" width="108" height="18" uuid="805d0e34-eda9-45a6-9490-83d2282db99b">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[顧客名稱]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="602" y="50" width="38" height="18" uuid="a9c9239d-6640-4196-9ce4-5be81522a99b">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[單位]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="0" y="50" width="181" height="18" uuid="eb3506cf-6d61-4f70-901f-9576df17e66c">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[送貨日期]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="640" y="50" width="100" height="18" uuid="0f680edd-048d-4ee1-8a00-2ec33eaf2c88">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[貨車]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="740" y="50" width="58" height="18" uuid="68ba1843-bc0c-4834-82bf-b180ca1e72ce">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[司機]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="518" y="50" width="84" height="18" uuid="aa069323-43b9-448c-840e-97054ad358ef">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[數量]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="60" y="12" width="91" height="18" uuid="8aeef34c-491b-4cc6-b755-cf9a14d2b7d2">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[貨品編號]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="0" y="12" width="60" height="18" uuid="8951af5a-817e-4891-a26d-a2e18a045753">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[貨物子分類]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="151" y="12" width="100" height="18" uuid="56a7a3e2-3e7b-4b4f-b30e-745066d75795">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[貨品名稱]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="251" y="12" width="119" height="18" uuid="d8d2ecce-255a-46a5-9ded-949df09192de">
-						<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="Center">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[送貨訂單編號]]></text>
-				</staticText>
-				<line>
-					<reportElement x="0" y="68" width="800" height="1" uuid="8f8bf77b-6e3f-46e6-a29d-1213212c750b">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-				</line>
-			</band>
-		</groupHeader>
-		<groupFooter>
-			<band height="24">
-				<staticText>
-					<reportElement x="390" y="0" width="128" height="19" uuid="17df3070-773d-4bac-8045-6b59d8673bb4"/>
-					<textElement textAlignment="Right">
-						<font fontName="微軟正黑體" size="10" isBold="true"/>
-					</textElement>
-					<text><![CDATA[每單交貨總數：]]></text>
-				</staticText>
-				<textField>
-					<reportElement x="518" y="0" width="281" height="19" uuid="939e4c5b-176c-4154-aabd-bf06c2a0e594"/>
-					<textElement textAlignment="Right">
-						<font fontName="微軟正黑體" size="10" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{qtyNumeric} != null ? $F{qtyNumeric}.toString() : "0.00"]]></textFieldExpression>
-				</textField>
-				<line>
-					<reportElement x="0" y="23" width="799" height="1" uuid="a7505f85-e928-4098-b9ba-644111766b84">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-				</line>
-				<line>
-					<reportElement x="0" y="19" width="799" height="1" uuid="69c9e68d-5a48-4284-b977-d12984bde9bc">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-				</line>
-			</band>
-		</groupFooter>
-	</group>
-	<pageHeader>
-		<band height="143" splitType="Stretch">
-			<line>
-				<reportElement x="0" y="142" width="799" height="1" uuid="d78619a4-a4c2-4fe0-8618-5cf06dec78ea">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-			<line>
-				<reportElement x="0" y="138" width="799" height="1" uuid="789896b9-0ab8-4fd7-96bc-450eedfe98fb">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-			<textField evaluationTime="Report">
-				<reportElement x="780" y="2" width="20" height="18" uuid="0ce21a7e-8013-40f6-b079-ec45bbf4c0b6">
-					<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="700" y="2" width="40" height="18" uuid="03eaf5e6-4dfa-4e5f-bfd7-66f413d9c6bf">
-					<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="760" y="2" width="20" height="18" uuid="bed31e80-95c9-4226-946c-5a982f8ac2cc">
-					<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="740" y="2" width="20" height="18" uuid="dceaca32-361a-46f3-8327-7381b95016e3">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement x="-1" y="78" width="800" height="1" uuid="4d95bc98-ab81-4302-901a-4a3a34f11ba9">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-			<staticText>
-				<reportElement x="0" y="25" width="90" height="23" uuid="48aac263-69b4-4510-934a-0b21ede31cc1">
-					<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="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告日期：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="670" y="25" width="130" height="23" uuid="b53d173e-2ced-4508-868e-a1dec80b0489"/>
-				<textElement>
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{year}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="280" y="25" width="90" height="23" uuid="13b883e9-de0a-4531-a62e-c739b5158f60">
-					<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="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告時間：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="580" y="25" width="90" height="23" uuid="0baf70bf-2851-4be4-a5c6-70426e4a80d1">
-					<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="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[年份：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="370" y="25" width="210" height="23" uuid="7d6081b9-629b-4c6d-99e4-a8d8e7d01f0a"/>
-				<textElement>
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="90" y="25" width="190" height="23" uuid="c325f656-5d6e-485c-a50b-d6d282aca883"/>
-				<textElement>
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="78" y="80" width="720" height="18" uuid="149d9c3f-ed97-4c18-99d0-927b5b4c5fbf">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement>
-					<font fontName="微軟正黑體" size="12" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{stockCategory}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="80" width="78" height="18" uuid="1c69a56f-b4a7-4571-a215-e816848e9201">
-					<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" isBold="false"/>
-				</textElement>
-				<text><![CDATA[貨物分類：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="120" y="50" width="680" height="23" uuid="5a6d7494-fa1b-494d-b769-a41e788cbe73">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="50" width="120" height="23" uuid="b368c781-94dc-4ffe-87fd-17f853af073d">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[最後出貨日期：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="327" y="0" width="149" height="23" uuid="e3b0beb7-66ce-4d05-a959-45402fff3ec7">
-					<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="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[FG Delivery Report		
-]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="78" y="116" width="720" height="18" uuid="11b38546-7727-4478-b0f9-2ff7a89e6368">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{itemNo}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="98" width="78" height="18" uuid="06b1dca0-3bae-4492-ac14-9bf882b898c0">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[貨物子分類：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="116" width="78" height="18" uuid="e0340fda-e14b-4105-a715-17ef47fd8226">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[貨品編號：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="78" y="98" width="720" height="18" uuid="a3183414-850d-4fd2-9675-61c09a110ad8">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{stockSubCategory}]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageHeader>
-	<detail>
-		<band height="18" splitType="Stretch">
-			<textField>
-				<reportElement x="0" y="0" width="181" height="18" uuid="7bb350a8-a127-4a47-aa7a-c86119864db9">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{deliveryDate}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="181" y="0" width="119" height="18" uuid="4b76d458-5318-402d-9828-c8e7d5a2197a">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{dnNo}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="300" y="0" width="110" height="18" uuid="c7701dde-d643-4f6d-ad07-d70395f3f0b7">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{customerId}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="410" y="0" width="108" height="18" uuid="f239f480-ae9f-45f3-a03e-562eab10c304">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{customerName}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="518" y="0" width="84" height="18" uuid="143501a2-6a00-4fe2-84c4-2689ad68cbc4">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{qty}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="602" y="0" width="38" height="18" uuid="1d124434-b3f7-48dd-89c2-29ea10c28941">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="640" y="0" width="100" height="18" uuid="62c1bc61-05ac-450f-9385-75f2f1cba9fd">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{truckNo}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="740" y="0" width="59" height="18" uuid="7b848284-bdb1-4110-ba59-55c5e7de802c">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{driver}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
+    <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"/>
+    <subDataset name="Dataset1" uuid="dfaf2f9f-3937-4f84-9b1f-fd0ecf2f1ee9">
+        <queryString>
+            <![CDATA[]]>
+        </queryString>
+    </subDataset>
+    <parameter name="stockSubCategory" class="java.lang.String">
+        <defaultValueExpression><![CDATA["stockSubCategory"]]></defaultValueExpression>
+    </parameter>
+    <parameter name="date" class="java.lang.String">
+        <defaultValueExpression><![CDATA["date"]]></defaultValueExpression>
+    </parameter>
+    <parameter name="stockCategory" class="java.lang.String">
+        <defaultValueExpression><![CDATA["stockCategory"]]></defaultValueExpression>
+    </parameter>
+    <parameter name="reportDate" class="java.lang.String"/>
+    <parameter name="reportTime" class="java.lang.String"/>
+    <parameter name="deliveryPeriodStart" class="java.lang.String"/>
+    <parameter name="deliveryPeriodEnd" class="java.lang.String"/>
+    <parameter name="year" class="java.lang.String"/>
+    <parameter name="itemNo" class="java.lang.String">
+        <defaultValueExpression><![CDATA["itemCode"]]></defaultValueExpression>
+    </parameter>
+    <parameter name="lastOutDateStart" class="java.lang.String">
+        <parameterDescription><![CDATA["lastOutDateStart"]]></parameterDescription>
+    </parameter>
+    <parameter name="lastOutDateEnd" class="java.lang.String">
+        <parameterDescription><![CDATA["lastOutDateStart"]]></parameterDescription>
+    </parameter>
+    <queryString>
+        <![CDATA[]]>
+    </queryString>
+    <field name="deliveryDate" class="java.lang.String"/>
+    <field name="itemNo" class="java.lang.String">
+        <property name="com.jaspersoft.studio.field.name" value="code"/>
+        <property name="com.jaspersoft.studio.field.label" value="code"/>
+        <property name="com.jaspersoft.studio.field.tree.path" value="items"/>
+        <fieldDescription><![CDATA[]]></fieldDescription>
+    </field>
+    <field name="itemName" class="java.lang.String">
+        <property name="com.jaspersoft.studio.field.name" value="name"/>
+        <property name="com.jaspersoft.studio.field.label" value="name"/>
+        <property name="com.jaspersoft.studio.field.tree.path" value="items"/>
+        <fieldDescription><![CDATA[]]></fieldDescription>
+    </field>
+    <field name="unitOfMeasure" class="java.lang.String"/>
+    <field name="dnNo" class="java.lang.String"/>
+    <field name="customerId" class="java.lang.String"/>
+    <field name="customerName" class="java.lang.String"/>
+    <field name="qty" class="java.lang.String"/>
+    <field name="qtyNumeric" class="java.math.BigDecimal"/>
+    <field name="truckNo" class="java.lang.String"/>
+    <field name="driver" class="java.lang.String"/>
+    <field name="deliveryOrderNo" class="java.lang.String"/>
+    <field name="stockSubCategory" class="java.lang.String"/>
+    <variable name="totalDeliveredQtyPerDeliveryOrder" class="java.math.BigDecimal" resetType="Group" resetGroup="itemGroup" incrementType="Group" incrementGroup="itemGroup" calculation="First">
+        <variableExpression><![CDATA[$F{qtyNumeric}]]></variableExpression>
+    </variable>
+    <group name="itemGroup">
+        <groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
+        <groupHeader>
+            <band height="40">
+                <textField>
+                    <reportElement x="570" y="0" width="118" height="18" uuid="8d42562f-843e-43e7-bb4a-5bf08f9adc89">
+                        <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="10"/>
+                    </textElement>
+                    <textFieldExpression><![CDATA[$F{deliveryOrderNo}]]></textFieldExpression>
+                </textField>
+                <textField>
+                    <reportElement x="60" y="0" width="70" height="18" uuid="0817468e-35ff-45f0-b863-56dae97e9491">
+                        <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    </reportElement>
+                    <textElement verticalAlignment="Top">
+                        <font fontName="微軟正黑體" size="10"/>
+                    </textElement>
+                    <textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
+                </textField>
+                <textField>
+                    <reportElement x="200" y="0" width="210" height="18" uuid="d3aca20f-bd40-425e-86cf-20532a0ea21b">
+                        <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[$F{itemName}]]></textFieldExpression>
+                </textField>
+                <staticText>
+                    <reportElement x="100" y="20" width="140" height="18" uuid="0f570907-538c-4d1e-a261-5e275f2c3fbe">
+                        <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="Center" verticalAlignment="Middle">
+                        <font fontName="微軟正黑體" size="10"/>
+                    </textElement>
+                    <text><![CDATA[DN編號]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement x="240" y="20" width="140" height="18" uuid="805d0e34-eda9-45a6-9490-83d2282db99b">
+                        <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="Center" verticalAlignment="Middle">
+                        <font fontName="微軟正黑體" size="10"/>
+                    </textElement>
+                    <text><![CDATA[門店名稱]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement x="460" y="20" width="100" height="18" uuid="a9c9239d-6640-4196-9ce4-5be81522a99b">
+                        <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="Center" verticalAlignment="Middle">
+                        <font fontName="微軟正黑體" size="10"/>
+                    </textElement>
+                    <text><![CDATA[單位]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement x="8" y="20" width="92" height="18" uuid="eb3506cf-6d61-4f70-901f-9576df17e66c">
+                        <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="560" y="20" width="98" height="18" uuid="0f680edd-048d-4ee1-8a00-2ec33eaf2c88">
+                        <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="Center" verticalAlignment="Middle">
+                        <font fontName="微軟正黑體" size="10"/>
+                    </textElement>
+                    <text><![CDATA[貨車]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement x="380" y="20" width="80" height="18" uuid="aa069323-43b9-448c-840e-97054ad358ef">
+                        <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="Center" verticalAlignment="Middle">
+                        <font fontName="微軟正黑體" size="10"/>
+                    </textElement>
+                    <text><![CDATA[數量]]></text>
+                </staticText>
+                <staticText>
+                    <reportElement x="8" y="0" width="52" height="18" uuid="8aeef34c-491b-4cc6-b755-cf9a14d2b7d2">
+                        <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="150" y="0" width="50" height="18" uuid="56a7a3e2-3e7b-4b4f-b30e-745066d75795">
+                        <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="500" y="0" width="70" height="18" uuid="d8d2ecce-255a-46a5-9ded-949df09192de">
+                        <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>
+            </band>
+        </groupHeader>
+        <groupFooter>
+            <band height="24">
+                <staticText>
+                    <reportElement x="302" y="0" width="78" height="19" uuid="17df3070-773d-4bac-8045-6b59d8673bb4"/>
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
+                        <font fontName="微軟正黑體" size="10" isBold="true"/>
+                    </textElement>
+                    <text><![CDATA[每單交貨總數：]]></text>
+                </staticText>
+                <textField>
+                    <reportElement x="380" y="0" width="80" height="19" uuid="939e4c5b-176c-4154-aabd-bf06c2a0e594"/>
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
+                        <font fontName="微軟正黑體" size="10" isBold="true"/>
+                    </textElement>
+                    <textFieldExpression><![CDATA[$F{qtyNumeric} != null ? $F{qtyNumeric}.toString() : "0.00"]]></textFieldExpression>
+                </textField>
+                <line>
+                    <reportElement x="0" y="23" width="799" height="1" uuid="a7505f85-e928-4098-b9ba-644111766b84">
+                        <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    </reportElement>
+                </line>
+                <line>
+                    <reportElement x="0" y="19" width="799" height="1" uuid="69c9e68d-5a48-4284-b977-d12984bde9bc">
+                        <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    </reportElement>
+                </line>
+            </band>
+        </groupFooter>
+    </group>
+    <pageHeader>
+        <band height="80" splitType="Stretch">
+            <line>
+                <reportElement x="-1" y="78" width="800" height="1" uuid="4d95bc98-ab81-4302-901a-4a3a34f11ba9">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+            </line>
+            <textField evaluationTime="Report">
+                <reportElement x="760" y="0" width="30" height="23" uuid="cfdec3a5-cc0f-421a-85ab-0eb49f96b7df">
+                    <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="670" y="0" width="40" height="23" uuid="25f66e24-ad42-4ff6-ac86-ac1d1c6f3b03">
+                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Center" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[頁數]]></text>
+            </staticText>
+            <staticText>
+                <reportElement x="740" y="0" width="20" height="23" uuid="e0a5035b-8a7c-49c0-b012-baf4325774b7">
+                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Center" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12"/>
+                </textElement>
+                <text><![CDATA[/]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="710" y="0" width="30" height="23" uuid="997d0e6e-4e9a-4027-91b6-a2bdf02971fa">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Center" verticalAlignment="Middle"/>
+                <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="8" y="30" width="90" height="23" uuid="5f860195-7684-4674-bcba-5e3af52a55da">
+                    <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" isBold="true"/>
+                </textElement>
+                <text><![CDATA[報告日期：]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="711" y="53" width="79" height="23" uuid="b1bba504-8ae4-4985-909c-e598c2e6001b"/>
+                <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12" isBold="true"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{year}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="640" y="30" width="71" height="23" uuid="0986cf8b-0ade-490d-bcb5-f2b1aceaab15">
+                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Right" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12" isBold="true"/>
+                </textElement>
+                <text><![CDATA[報告時間：]]></text>
+            </staticText>
+            <staticText>
+                <reportElement x="640" y="53" width="71" height="23" uuid="3e31701d-067e-46eb-b691-a88829562c15">
+                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Right" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12" isBold="true"/>
+                </textElement>
+                <text><![CDATA[年份：]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="711" y="30" width="79" height="23" uuid="89bfffda-987c-4c76-bd0e-cfdb63d8bd0e"/>
+                <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12" isBold="true"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+            </textField>
+            <textField>
+                <reportElement x="98" y="30" width="190" height="23" uuid="f89e2dd2-10de-4ec1-af98-4b8dfb4aac4c"/>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12" isBold="true"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="300" y="0" width="210" height="23" uuid="e34c7a3e-ea38-4b1b-bbdc-cfe4a5f969de">
+                    <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="16" isBold="true"/>
+                </textElement>
+                <text><![CDATA[成品出倉報告]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="98" y="53" width="336" height="23" uuid="f855785e-5316-4c6c-a612-556f58dff006">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12" isBold="true"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="8" y="53" width="90" height="23" uuid="1543eecf-9964-43b0-9103-e885209265e4">
+                    <property name="com.jaspersoft.studio.unit.y" value="px"/>
+                    <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="12" isBold="true"/>
+                </textElement>
+                <text><![CDATA[成品出倉日期:]]></text>
+            </staticText>
+        </band>
+    </pageHeader>
+    <detail>
+        <band height="18" splitType="Stretch">
+            <textField>
+                <reportElement x="8" y="0" width="92" height="18" uuid="7bb350a8-a127-4a47-aa7a-c86119864db9">
+                    <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>
+                <textFieldExpression><![CDATA[$F{deliveryDate}]]></textFieldExpression>
+            </textField>
+            <textField>
+                <reportElement x="100" y="0" width="140" height="18" uuid="4b76d458-5318-402d-9828-c8e7d5a2197a">
+                    <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>
+                <textFieldExpression><![CDATA[$F{dnNo}]]></textFieldExpression>
+            </textField>
+            <textField>
+                <reportElement x="240" y="0" width="140" height="18" uuid="f239f480-ae9f-45f3-a03e-562eab10c304">
+                    <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>
+                <textFieldExpression><![CDATA[$F{customerName}]]></textFieldExpression>
+            </textField>
+            <textField>
+                <reportElement x="380" y="0" width="80" height="18" uuid="143501a2-6a00-4fe2-84c4-2689ad68cbc4">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Right" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="10"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{qty}]]></textFieldExpression>
+            </textField>
+            <textField>
+                <reportElement x="460" y="0" width="100" height="18" uuid="1d124434-b3f7-48dd-89c2-29ea10c28941">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Right" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="10"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
+            </textField>
+            <textField>
+                <reportElement x="560" y="0" width="98" height="18" uuid="62c1bc61-05ac-450f-9385-75f2f1cba9fd">
+                    <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 fontName="微軟正黑體" size="10"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{truckNo}]]></textFieldExpression>
+            </textField>
+        </band>
+    </detail>
 </jasperReport>

src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml

@@ -227,18 +227,18 @@
                     <textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
                 </textField>
                 <staticText>
-                    <reportElement x="170" y="0" width="70" height="20" uuid="f0d35ecc-bc8d-4f5e-a94c-5cc6e5cde51e">
+                    <reportElement x="210" y="0" width="60" height="20" uuid="f0d35ecc-bc8d-4f5e-a94c-5cc6e5cde51e">
                         <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="Right" verticalAlignment="Middle">
+                    <textElement textAlignment="Left" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="12"/>
                     </textElement>
                     <text><![CDATA[貨品名稱：]]></text>
                 </staticText>
                 <textField>
-                    <reportElement x="240" y="0" width="194" height="20" uuid="11265d83-f36f-4cf2-ae3f-60d504226ab0">
+                    <reportElement x="270" y="0" width="194" height="20" uuid="11265d83-f36f-4cf2-ae3f-60d504226ab0">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
                     <textElement verticalAlignment="Middle">
@@ -247,17 +247,17 @@
                     <textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
                 </textField>
                 <staticText>
-                    <reportElement x="450" y="0" width="40" height="20" uuid="a9054f9d-f217-4daa-a35c-076fe16a2df6">
+                    <reportElement x="510" y="0" width="39" height="20" uuid="a9054f9d-f217-4daa-a35c-076fe16a2df6">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Right" verticalAlignment="Middle">
+                    <textElement textAlignment="Left" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="12"/>
                     </textElement>
                     <text><![CDATA[單位：]]></text>
                 </staticText>
                 <textField>
-                    <reportElement x="490" y="0" width="120" height="20" uuid="1a6c5348-668b-40cd-b8c7-a7b53c5dbcbe">
+                    <reportElement x="549" y="0" width="120" height="20" uuid="1a6c5348-668b-40cd-b8c7-a7b53c5dbcbe">
                         <property name="com.jaspersoft.studio.unit.height" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
@@ -272,248 +272,248 @@
                     </reportElement>
                 </line>
                 <staticText>
-                    <reportElement x="512" y="20" width="56" height="20" uuid="a6161aa7-2abd-4bb6-894d-ccdd6f9575c4">
+                    <reportElement x="549" y="20" width="61" height="20" uuid="a6161aa7-2abd-4bb6-894d-ccdd6f9575c4">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[十月]]></text>
                 </staticText>
                 <textField pattern="#,##0">
-                    <reportElement x="232" y="40" width="56" height="20" uuid="0f873665-fc42-4c6d-bb26-7f80537edb34">
+                    <reportElement x="250" y="40" width="60" height="20" uuid="0f873665-fc42-4c6d-bb26-7f80537edb34">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyMay}]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="456" y="40" width="56" height="20" uuid="bef5a00a-cc6c-4505-a170-0df341cc0a0b">
+                    <reportElement x="489" y="40" width="60" height="20" uuid="bef5a00a-cc6c-4505-a170-0df341cc0a0b">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtySep}]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="176" y="40" width="56" height="20" uuid="ca9e080a-3a8b-4924-8197-6fa302b149c2">
+                    <reportElement x="190" y="40" width="60" height="20" uuid="ca9e080a-3a8b-4924-8197-6fa302b149c2">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyApr}]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="8" y="40" width="56" height="20" uuid="06ace712-1de4-4cc0-b8d7-c56a08a0dbc6">
+                    <reportElement x="8" y="40" width="62" height="20" uuid="06ace712-1de4-4cc0-b8d7-c56a08a0dbc6">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyJan}]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="288" y="40" width="56" height="20" uuid="fc7e228a-ea4f-4990-b3f3-a17a7899a24a">
+                    <reportElement x="310" y="40" width="59" height="20" uuid="fc7e228a-ea4f-4990-b3f3-a17a7899a24a">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyJun}]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="698" y="40" width="90" height="20" uuid="be0fb0b2-ce4d-4a20-8cf3-9049a58ae21e">
+                    <reportElement x="730" y="40" width="60" height="20" uuid="be0fb0b2-ce4d-4a20-8cf3-9049a58ae21e">
                         <property name="com.jaspersoft.studio.unit.height" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{totalProductionQty} != null && !$F{totalProductionQty}.isEmpty() ? new java.math.BigDecimal($F{totalProductionQty}) : new java.math.BigDecimal("0")]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="400" y="40" width="56" height="20" uuid="826bb018-835b-4c05-bd4e-8bbfabdfbfe8">
+                    <reportElement x="429" y="40" width="60" height="20" uuid="826bb018-835b-4c05-bd4e-8bbfabdfbfe8">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyAug}]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="512" y="40" width="56" height="20" uuid="a6d6a1e2-e02a-4ff3-aac8-aa81af99f40a">
+                    <reportElement x="549" y="40" width="61" height="20" uuid="a6d6a1e2-e02a-4ff3-aac8-aa81af99f40a">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyOct}]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="624" y="40" width="74" height="20" uuid="1525fa22-1c84-44dd-bf81-80a0cc14bc7d">
+                    <reportElement x="669" y="40" width="61" height="20" uuid="1525fa22-1c84-44dd-bf81-80a0cc14bc7d">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyDec}]]></textFieldExpression>
                 </textField>
                 <staticText>
-                    <reportElement x="176" y="20" width="56" height="20" uuid="8c5260bc-9079-4f62-803d-1c3e3fc9f41c">
+                    <reportElement x="190" y="20" width="60" height="20" uuid="8c5260bc-9079-4f62-803d-1c3e3fc9f41c">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[四月]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="456" y="20" width="56" height="20" uuid="85c77a9b-c044-4bc2-8cd9-3b0058e4b74e">
+                    <reportElement x="489" y="20" width="60" height="20" uuid="85c77a9b-c044-4bc2-8cd9-3b0058e4b74e">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[九月]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="698" y="20" width="90" height="20" uuid="f092d4db-d5c5-4515-a826-8fec621a8992">
+                    <reportElement x="730" y="20" width="60" height="20" uuid="f092d4db-d5c5-4515-a826-8fec621a8992">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[總和]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="64" y="20" width="56" height="20" uuid="ec7698ae-c92b-4b44-9f7a-28f10ba5f385">
+                    <reportElement x="70" y="20" width="60" height="20" uuid="ec7698ae-c92b-4b44-9f7a-28f10ba5f385">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle" markup="html">
+                    <textElement textAlignment="Center" verticalAlignment="Middle" markup="html">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[二月]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="120" y="20" width="56" height="20" uuid="ac124afb-3aa8-4ec6-b4a8-8de161e8bbc5">
+                    <reportElement x="130" y="20" width="60" height="20" uuid="ac124afb-3aa8-4ec6-b4a8-8de161e8bbc5">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[三月]]></text>
                 </staticText>
                 <textField pattern="#,##0">
-                    <reportElement x="344" y="40" width="56" height="20" uuid="609cce9b-4703-441d-91c0-5ee489a324ac">
+                    <reportElement x="369" y="40" width="60" height="20" uuid="609cce9b-4703-441d-91c0-5ee489a324ac">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyJul}]]></textFieldExpression>
                 </textField>
                 <textField pattern="#,##0">
-                    <reportElement x="120" y="40" width="56" height="20" uuid="4d98e638-347d-46fe-9379-cebb088c43a1">
+                    <reportElement x="130" y="40" width="60" height="20" uuid="4d98e638-347d-46fe-9379-cebb088c43a1">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyMar}]]></textFieldExpression>
                 </textField>
                 <staticText>
-                    <reportElement x="568" y="20" width="56" height="20" uuid="e51758d1-2a7e-4fef-8b41-206e9aa6c611">
+                    <reportElement x="610" y="20" width="59" height="20" uuid="e51758d1-2a7e-4fef-8b41-206e9aa6c611">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[十一月]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="232" y="20" width="56" height="20" uuid="5204319c-5b4e-421b-9493-4dd988caca52">
+                    <reportElement x="250" y="20" width="60" height="20" uuid="5204319c-5b4e-421b-9493-4dd988caca52">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[五月]]></text>
                 </staticText>
                 <textField pattern="#,##0">
-                    <reportElement x="64" y="40" width="56" height="20" uuid="bccf4a6c-8364-4a2e-be89-8e0d35154f06">
+                    <reportElement x="70" y="40" width="60" height="20" uuid="bccf4a6c-8364-4a2e-be89-8e0d35154f06">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyFeb}]]></textFieldExpression>
                 </textField>
                 <staticText>
-                    <reportElement x="344" y="20" width="56" height="20" uuid="b221e73b-0f35-4036-bffb-9230a495b827">
+                    <reportElement x="369" y="20" width="60" height="20" uuid="b221e73b-0f35-4036-bffb-9230a495b827">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.height" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[七月]]></text>
                 </staticText>
                 <textField pattern="#,##0">
-                    <reportElement x="568" y="40" width="56" height="20" uuid="933ea07b-1ecc-4f91-b522-9fb5382fbf5b">
+                    <reportElement x="610" y="40" width="59" height="20" uuid="933ea07b-1ecc-4f91-b522-9fb5382fbf5b">
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <textFieldExpression><![CDATA[$F{qtyNov}]]></textFieldExpression>
                 </textField>
                 <staticText>
-                    <reportElement x="624" y="20" width="74" height="20" uuid="d7c79995-7b3c-4622-8d08-6b4a87345cbe">
+                    <reportElement x="669" y="20" width="61" height="20" uuid="d7c79995-7b3c-4622-8d08-6b4a87345cbe">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[十二月]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="288" y="20" width="56" height="20" uuid="424446ec-655d-4bff-a30a-61e898dbc7ad">
+                    <reportElement x="310" y="20" width="59" height="20" uuid="424446ec-655d-4bff-a30a-61e898dbc7ad">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[六月]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="8" y="20" width="56" height="20" uuid="e4267f38-4a00-4a22-965d-9ab531262592">
+                    <reportElement x="8" y="20" width="62" height="20" uuid="e4267f38-4a00-4a22-965d-9ab531262592">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[一月]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="400" y="20" width="56" height="20" uuid="2a9e0115-d056-4c4b-b0b2-0800f55435ad">
+                    <reportElement x="429" y="20" width="60" height="20" uuid="2a9e0115-d056-4c4b-b0b2-0800f55435ad">
                         <property name="com.jaspersoft.studio.unit.y" value="px"/>
                         <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     </reportElement>
-                    <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10"/>
                     </textElement>
                     <text><![CDATA[八月]]></text>

src/main/resources/jasper/StockInTraceabilityReport.jrxml

@@ -28,21 +28,21 @@
 		<![CDATA[]]>
 	</queryString>
 	<field name="itemNo" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.name" value="itemNo"/>
-		<property name="com.jaspersoft.studio.field.label" value="itemNo"/>
+		<property name="com.jaspersoft.studio.field.name" value="code"/>
+		<property name="com.jaspersoft.studio.field.label" value="code"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="items"/>
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
 	<field name="itemName" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.name" value="itemName"/>
-		<property name="com.jaspersoft.studio.field.label" value="itemName"/>
+		<property name="com.jaspersoft.studio.field.name" value="name"/>
+		<property name="com.jaspersoft.studio.field.label" value="name"/>
 		<property name="com.jaspersoft.studio.field.tree.path" value="items"/>
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
 	<field name="stockSubCategory" class="java.lang.String">
-		<property name="com.jaspersoft.studio.field.name" value="stockSubCategory"/>
-		<property name="com.jaspersoft.studio.field.label" value="stockSubCategory"/>
-		<property name="com.jaspersoft.studio.field.tree.path" value="item_category"/>
+		<property name="com.jaspersoft.studio.field.name" value="categoryId"/>
+		<property name="com.jaspersoft.studio.field.label" value="categoryId"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="items"/>
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
 	<field name="unitOfMeasure" class="java.lang.String"/>
@@ -64,38 +64,29 @@
 	<group name="Group1" isStartNewPage="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
-			<band height="77">
+			<band height="51">
 				<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				<textField>
-					<reportElement x="1" y="26" width="60" height="18" uuid="096e6f34-38cd-4b84-8283-b9895067998c">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Top">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{stockSubCategory}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="280" y="26" width="61" height="18" uuid="751247a0-9870-48dd-b854-75d105fb13cd">
+					<reportElement x="380" y="2" width="179" height="18" uuid="751247a0-9870-48dd-b854-75d105fb13cd">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="61" y="26" width="119" height="18" uuid="d52a8b20-92ea-478c-a5e5-fccae4664baa">
+					<reportElement x="61" y="2" width="79" height="18" uuid="d52a8b20-92ea-478c-a5e5-fccae4664baa">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="180" y="8" width="100" height="18" uuid="5d687dac-ddbb-4071-901d-65e8c988ad7b">
+					<reportElement x="141" y="2" width="59" height="18" uuid="5d687dac-ddbb-4071-901d-65e8c988ad7b">
 						<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"/>
@@ -103,31 +94,20 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨品名稱]]></text>
+					<text><![CDATA[貨品名稱：]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="180" y="26" width="100" height="18" uuid="f21e9d4e-ef66-4c17-83df-f5fb411e460f">
+					<reportElement x="200" y="2" width="151" height="18" uuid="f21e9d4e-ef66-4c17-83df-f5fb411e460f">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="61" y="8" width="119" height="18" uuid="00ef3912-d68e-4354-94ad-8e074f903526">
-						<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="1" y="8" width="60" height="18" uuid="e84b4d15-1dd6-41cb-9d47-a915d1911743">
+					<reportElement x="1" y="2" width="59" height="18" uuid="00ef3912-d68e-4354-94ad-8e074f903526">
 						<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"/>
@@ -135,10 +115,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨物子分類]]></text>
+					<text><![CDATA[貨品編號：]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="280" y="8" width="61" height="18" uuid="08922c86-bd48-42ab-acc3-5157ae295a9d">
+					<reportElement x="349" y="2" width="31" height="18" uuid="08922c86-bd48-42ab-acc3-5157ae295a9d">
 						<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"/>
@@ -146,10 +126,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[單位]]></text>
+					<text><![CDATA[單位：]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="360" y="48" width="50" height="28" uuid="1f82d706-0492-46e4-b692-dced5c97c824">
+					<reportElement stretchType="RelativeToTallestObject" x="360" y="20" width="50" height="28" uuid="1f82d706-0492-46e4-b692-dced5c97c824">
 						<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 +141,7 @@
 缺陷數量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="48" width="110" height="28" uuid="3fa7c301-1c2a-430b-8985-338ebf7aa6cf">
+					<reportElement stretchType="RelativeToTallestObject" x="0" y="20" width="110" height="28" uuid="3fa7c301-1c2a-430b-8985-338ebf7aa6cf">
 						<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 +152,7 @@
 					<text><![CDATA[送貨單編號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="670" y="48" width="40" height="28" uuid="0687499f-0edd-455b-b0a4-caf5725b5f81">
+					<reportElement stretchType="RelativeToTallestObject" x="670" y="20" width="40" height="28" uuid="0687499f-0edd-455b-b0a4-caf5725b5f81">
 						<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"/>
@@ -184,7 +164,7 @@
 編號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="310" y="48" width="50" height="28" uuid="006c5557-c246-47cd-b599-4775f71cbf16">
+					<reportElement stretchType="RelativeToTallestObject" x="310" y="20" width="50" height="28" uuid="006c5557-c246-47cd-b599-4775f71cbf16">
 						<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"/>
@@ -196,7 +176,7 @@
 樣品數量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="110" y="48" width="90" height="28" uuid="2f1e753f-ee01-42a1-a4e3-f75985403431">
+					<reportElement stretchType="RelativeToTallestObject" x="110" y="20" width="90" height="28" uuid="2f1e753f-ee01-42a1-a4e3-f75985403431">
 						<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"/>
@@ -207,7 +187,7 @@
 					<text><![CDATA[批號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="710" y="48" width="90" height="28" uuid="db5b9c55-0185-420b-ba6c-0e10d154cc8a">
+					<reportElement stretchType="RelativeToTallestObject" x="710" y="20" width="90" height="28" uuid="db5b9c55-0185-420b-ba6c-0e10d154cc8a">
 						<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"/>
@@ -218,7 +198,7 @@
 					<text><![CDATA[供應商名稱]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="590" y="48" width="80" height="28" uuid="c1d0f0dd-34d6-4716-90bd-deb94e5084d2">
+					<reportElement stretchType="RelativeToTallestObject" x="590" y="20" width="80" height="28" uuid="c1d0f0dd-34d6-4716-90bd-deb94e5084d2">
 						<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"/>
@@ -226,10 +206,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[店鋪位置]]></text>
+					<text><![CDATA[存貨位置]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="200" y="48" width="60" height="28" uuid="cd7a146a-1af0-4428-9b88-dcb159691656">
+					<reportElement stretchType="RelativeToTallestObject" x="200" y="20" width="60" height="28" uuid="cd7a146a-1af0-4428-9b88-dcb159691656">
 						<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"/>
@@ -240,7 +220,7 @@
 					<text><![CDATA[到期日]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="470" y="48" width="50" height="28" uuid="3c732314-35c2-42ad-98e6-ef42a512c233">
+					<reportElement stretchType="RelativeToTallestObject" x="470" y="20" width="50" height="28" uuid="3c732314-35c2-42ad-98e6-ef42a512c233">
 						<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"/>
@@ -252,7 +232,7 @@
 檢查結果]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="260" y="48" width="50" height="28" uuid="5c05c89c-843b-4fd6-928c-002c6a529679">
+					<reportElement stretchType="RelativeToTallestObject" x="260" y="20" width="50" height="28" uuid="5c05c89c-843b-4fd6-928c-002c6a529679">
 						<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"/>
@@ -263,7 +243,7 @@
 					<text><![CDATA[入庫數量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="520" y="48" width="70" height="28" uuid="58b33148-a772-4295-b10a-718fccc89683">
+					<reportElement stretchType="RelativeToTallestObject" x="520" y="20" width="70" height="28" uuid="58b33148-a772-4295-b10a-718fccc89683">
 						<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"/>
@@ -275,7 +255,7 @@
 檢查備註]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="410" y="48" width="60" height="28" uuid="c70088ac-bcf1-48a1-bb82-ad238a3dbe70">
+					<reportElement stretchType="RelativeToTallestObject" x="410" y="20" width="60" height="28" uuid="c70088ac-bcf1-48a1-bb82-ad238a3dbe70">
 						<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"/>
@@ -287,7 +267,7 @@
 缺陷百分比]]></text>
 				</staticText>
 				<line>
-					<reportElement x="0" y="76" width="799" height="1" uuid="f4f75850-3693-4fe6-abe5-306378f15c10">
+					<reportElement x="0" y="50" width="799" height="1" uuid="6032b143-631d-4978-8f0a-68a7febeef78">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
@@ -296,12 +276,12 @@
 		<groupFooter>
 			<band height="23">
 				<staticText>
-					<reportElement x="0" y="0" width="190" height="18" uuid="8d002bea-8762-4e6b-9101-35a570f55031">
+					<reportElement x="190" y="0" width="70" height="18" uuid="8d002bea-8762-4e6b-9101-35a570f55031">
 						<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">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<text><![CDATA[總入倉數量：]]></text>
@@ -310,7 +290,7 @@
 					<reportElement x="260" y="0" width="50" height="18" uuid="d98c4478-22bd-4fd6-9be4-b3777f91de6d">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalStockInQty}]]></textFieldExpression>
@@ -319,7 +299,7 @@
 					<reportElement x="310" y="0" width="50" height="18" uuid="bac1f216-48f1-4b5b-af50-f8ba18b97b78">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalIqcSampleQty}]]></textFieldExpression>
@@ -328,7 +308,7 @@
 					<reportElement x="360" y="0" width="50" height="18" uuid="1fb42453-c956-4a2b-8a04-fd297a980b38">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalIqcDefectQty}]]></textFieldExpression>
@@ -351,72 +331,35 @@
 			</band>
 		</groupFooter>
 	</group>
-	<title>
-		<band height="85" splitType="Stretch">
-			<staticText>
-				<reportElement x="288" y="0" width="226" height="23" uuid="15ab756b-0e92-466c-be47-112c2ee1aad1">
-					<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="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Stock In Traceability Report
-]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="35" width="90" height="23" uuid="7338c712-b4ee-4194-9c37-07af197eee92">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+	<pageHeader>
+		<band height="71" splitType="Stretch">
+			<line>
+				<reportElement x="0" y="70" width="799" height="1" uuid="8628d83e-856d-44d2-9454-b6d048e6ecae">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告日期：]]></text>
-			</staticText>
+			</line>
 			<staticText>
-				<reportElement x="0" y="58" width="90" height="23" uuid="84d51895-1f38-40bc-a2f8-ad5979628d51">
+				<reportElement x="760" y="0" width="20" height="18" uuid="c612993d-f309-41f0-bda2-abc0a7d5a3b5">
 					<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="16" isBold="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[貨物分類：]]></text>
+				<text><![CDATA[/]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="90" y="35" width="390" height="23" uuid="ff7dd53c-f505-4615-bed4-107d0f053ffe"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="90" y="58" width="708" height="23" uuid="451b69eb-de5f-49e6-b8ba-d579f51e9658"/>
-				<textElement>
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{stockCategory}]]></textFieldExpression>
-			</textField>
 			<staticText>
-				<reportElement x="480" y="35" width="90" height="23" uuid="465d0d50-d1f6-49e2-966a-86c87294e1c3">
+				<reportElement x="335" y="0" width="100" height="23" uuid="15ab756b-0e92-466c-be47-112c2ee1aad1">
 					<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="16" isBold="true"/>
 				</textElement>
-				<text><![CDATA[報告時間：]]></text>
+				<text><![CDATA[入倉記錄報告]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="570" y="35" width="228" height="23" uuid="bf131b2e-1da1-411a-b247-97280b89de21"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
-			</textField>
 			<textField evaluationTime="Report">
-				<reportElement x="780" y="12" width="20" height="18" uuid="ad15e154-51b2-4775-8b7e-3cf2d3bc8da9">
+				<reportElement x="780" y="0" width="20" height="18" uuid="ad15e154-51b2-4775-8b7e-3cf2d3bc8da9">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -425,28 +368,25 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="760" y="12" width="20" height="18" uuid="c612993d-f309-41f0-bda2-abc0a7d5a3b5">
-					<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"/>
+			<textField>
+				<reportElement x="570" y="23" width="230" height="22" uuid="bf131b2e-1da1-411a-b247-97280b89de21"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement x="700" y="12" width="40" height="18" uuid="375abc61-d5a7-4b06-8f95-b2ce305302c6">
+				<reportElement x="0" y="23" width="100" height="22" uuid="7338c712-b4ee-4194-9c37-07af197eee92">
 					<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 textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[頁數]]></text>
+				<text><![CDATA[報告日期：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="740" y="12" width="20" height="18" uuid="c58d1f01-d047-414b-8436-b173dcb58d48">
+				<reportElement x="740" y="0" width="20" height="18" uuid="c58d1f01-d047-414b-8436-b173dcb58d48">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -454,89 +394,59 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
-			<line>
-				<reportElement x="0" y="84" width="800" height="1" uuid="51721ea2-ec7b-4532-9e60-4903d8400cc8">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="60" splitType="Stretch">
+			<textField>
+				<reportElement x="100" y="23" width="90" height="22" uuid="ff7dd53c-f505-4615-bed4-107d0f053ffe"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement x="0" y="0" width="78" height="18" uuid="75beabc0-3521-4b1d-a158-7b054a53d850">
+				<reportElement x="480" y="23" width="90" height="22" uuid="465d0d50-d1f6-49e2-966a-86c87294e1c3">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[貨物子分類：]]></text>
+				<text><![CDATA[報告時間：]]></text>
 			</staticText>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="82" y="0" width="720" height="18" uuid="d40757f7-6aeb-45fc-8914-43d045a3306b">
+			<textField>
+				<reportElement x="100" y="45" width="298" height="22" uuid="b2f17ca6-bddc-4eb6-9960-f0e7fdf886af">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="14" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{stockSubCategory}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="18" width="78" height="18" uuid="35526b03-269a-4990-956e-5125754fd8d5">
+				<reportElement x="700" y="0" width="40" height="18" uuid="375abc61-d5a7-4b06-8f95-b2ce305302c6">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[貨品編號：]]></text>
+				<text><![CDATA[頁數]]></text>
 			</staticText>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="82" y="18" width="720" height="18" uuid="1308e091-8b78-4bc9-9364-7cbae26c1181">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{itemNo}]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement x="0" y="55" width="799" height="1" uuid="394a53f7-1257-476f-a4fa-b26fd14ce9cd">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-			<line>
-				<reportElement x="0" y="59" width="799" height="1" uuid="8628d83e-856d-44d2-9454-b6d048e6ecae">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
 			<staticText>
-				<reportElement x="0" y="36" width="82" height="18" uuid="83857f28-3707-4003-a7e7-26f3e6847e6b">
+				<reportElement x="0" y="45" width="100" height="22" uuid="83857f28-3707-4003-a7e7-26f3e6847e6b">
 					<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="Top">
-					<font fontName="微軟正黑體" size="12"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[最後入倉日期:]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="82" y="36" width="298" height="18" uuid="b2f17ca6-bddc-4eb6-9960-f0e7fdf886af">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
-			</textField>
 		</band>
 	</pageHeader>
 	<detail>
-		<band height="18" splitType="Stretch">
+		<band height="22" splitType="Stretch">
 			<textField textAdjust="StretchHeight">
-				<reportElement x="0" y="0" width="110" height="18" uuid="2e173086-b353-417e-9883-5374e9207e86">
+				<reportElement x="0" y="2" width="110" height="18" uuid="2e173086-b353-417e-9883-5374e9207e86">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -545,7 +455,7 @@
 				<textFieldExpression><![CDATA[$F{dnNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="110" y="0" width="90" height="18" uuid="ec54cf40-555d-4307-921e-23d2cc35418d">
+				<reportElement x="110" y="2" width="90" height="18" uuid="ec54cf40-555d-4307-921e-23d2cc35418d">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -554,14 +464,14 @@
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="200" y="0" width="60" height="18" uuid="4c835a14-380f-46e3-a77e-6d61bbc6766a"/>
+				<reportElement x="200" y="2" width="60" height="18" uuid="4c835a14-380f-46e3-a77e-6d61bbc6766a"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="260" y="0" width="50" height="18" uuid="0e8b333b-88ec-4d30-8fca-b02bc906305f">
+				<reportElement x="260" y="2" width="50" height="18" uuid="0e8b333b-88ec-4d30-8fca-b02bc906305f">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -570,7 +480,7 @@
 				<textFieldExpression><![CDATA[$F{stockInQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="310" y="0" width="50" height="18" uuid="d6417d18-6b11-4964-8774-a8795bc0983b">
+				<reportElement x="310" y="2" width="50" height="18" uuid="d6417d18-6b11-4964-8774-a8795bc0983b">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -579,7 +489,7 @@
 				<textFieldExpression><![CDATA[$F{iqcSampleQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="360" y="0" width="50" height="18" uuid="5b94c23b-0ef3-4283-85ce-698ca4a2599e">
+				<reportElement x="360" y="2" width="50" height="18" uuid="5b94c23b-0ef3-4283-85ce-698ca4a2599e">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -588,7 +498,7 @@
 				<textFieldExpression><![CDATA[$F{iqcDefectQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="410" y="0" width="60" height="18" uuid="de73b394-93be-440e-9cf3-0ff402506a3a">
+				<reportElement x="410" y="2" width="60" height="18" uuid="de73b394-93be-440e-9cf3-0ff402506a3a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -597,7 +507,7 @@
 				<textFieldExpression><![CDATA[$F{iqcDefectPercentage}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="470" y="0" width="50" height="18" uuid="c2575894-67a5-4251-aebd-59999fec00b5">
+				<reportElement x="470" y="2" width="50" height="18" uuid="c2575894-67a5-4251-aebd-59999fec00b5">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
@@ -606,7 +516,7 @@
 				<textFieldExpression><![CDATA[$F{iqcResult}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="520" y="0" width="70" height="18" uuid="62104cab-dcd5-41f0-abbf-21d7badc0edb">
+				<reportElement x="520" y="2" width="70" height="18" uuid="62104cab-dcd5-41f0-abbf-21d7badc0edb">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -615,7 +525,7 @@
 				<textFieldExpression><![CDATA[$F{iqcRemarks}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="590" y="0" width="80" height="18" uuid="091605c2-1a39-4823-ae74-1c8f51ac0145">
+				<reportElement x="590" y="2" width="80" height="18" uuid="091605c2-1a39-4823-ae74-1c8f51ac0145">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -624,7 +534,7 @@
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="670" y="0" width="40" height="18" uuid="18fceed4-b742-4cbe-87b2-90933c50965c">
+				<reportElement x="670" y="2" width="40" height="18" uuid="18fceed4-b742-4cbe-87b2-90933c50965c">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -633,7 +543,7 @@
 				<textFieldExpression><![CDATA[$F{supplierID}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="710" y="0" width="90" height="18" uuid="eb6ed0fc-bfda-4a89-a163-fe08b00a0120">
+				<reportElement x="710" y="2" width="90" height="18" uuid="eb6ed0fc-bfda-4a89-a163-fe08b00a0120">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">

src/main/resources/qrCodeLabel/poItemPDF.jrxml

@@ -9,6 +9,7 @@
     <parameter name="qrCode" class="java.awt.Image"/>
     <parameter name="acceptedQty" class="java.math.BigDecimal"/>
     <parameter name="uom" class="java.lang.String"/>
+    <parameter name="isTransfer" class="java.lang.String"/>
     <queryString>
         <![CDATA[]]>
     </queryString>
@@ -172,6 +173,20 @@
                 </textElement>
                 <textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
             </textField>
+            <textField>
+                <reportElement x="250" y="216" width="150" height="44" uuid="d66a64b0-3335-4846-bcb0-a67594520055">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <printWhenExpression><![CDATA[$P{isTransfer} != null && !$P{isTransfer}.toString().trim().isEmpty()]]></printWhenExpression>
+                </reportElement>
+                <box>
+                    <pen lineWidth="2.0"/>
+                </box>
+                <textElement textAlignment="Center" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="12" isBold="true" isUnderline="true"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{isTransfer}]]></textFieldExpression>
+            </textField>
         </band>
     </detail>
 </jasperReport>