From a0b3a58d656d10bef32a21347ea4e168ea7063ea Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Fri, 12 Jun 2026 16:00:25 +0800 Subject: [PATCH] report fix 2 --- .../service/MaterialStockOutTraceabilityReportService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/modules/report/service/MaterialStockOutTraceabilityReportService.kt b/src/main/java/com/ffii/fpsms/modules/report/service/MaterialStockOutTraceabilityReportService.kt index 5facee6..0f61589 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/service/MaterialStockOutTraceabilityReportService.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/service/MaterialStockOutTraceabilityReportService.kt @@ -11,7 +11,7 @@ class MaterialStockOutTraceabilityReportService( val sql = """ SELECT DISTINCT COALESCE(picker_user.name, jpo_handler_user.name, created_user.name, modified_user.name, '') AS handler FROM stock_out_line sol - INNER JOIN stock_out so ON sol.stockOutId = so.id AND so.deleted = 0 AND so.type = 'job' + INNER JOIN stock_out so ON sol.stockOutId = so.id AND so.deleted = 0 AND so.type in ('job', 'jo') INNER JOIN pick_order_line pol ON sol.pickOrderLineId = pol.id AND pol.deleted = 0 INNER JOIN pick_order po ON pol.poId = po.id AND po.deleted = 0 AND po.type IN ('jo', 'JOB_ORDER') AND po.joId IS NOT NULL LEFT JOIN user picker_user ON sol.handled_by = picker_user.id AND picker_user.deleted = 0 @@ -111,7 +111,7 @@ class MaterialStockOutTraceabilityReportService( INNER JOIN stock_out so ON sol.stockOutId = so.id AND so.deleted = 0 - AND so.type = 'job' + AND so.type in ('job', 'jo') INNER JOIN pick_order_line pol ON sol.pickOrderLineId = pol.id AND pol.deleted = 0