semireport,sictreport

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

@@ -123,7 +123,7 @@ class SemiFGProductionAnalysisReportService(
                 COALESCE(ic.sub, '') as stockSubCategory,
                 COALESCE(sl.itemCode, '') as itemNo,
                 COALESCE(b.name, '') as itemName,
-                COALESCE(uc.code, '') as unitOfMeasure,
+                COALESCE(uc.udfudesc, '') as unitOfMeasure,
                 CAST(COALESCE(SUM(CASE WHEN MONTH(sl.modified) = 1 THEN sl.inQty ELSE 0 END), 0) AS DECIMAL(18,2)) as qtyJan,
                 CAST(COALESCE(SUM(CASE WHEN MONTH(sl.modified) = 2 THEN sl.inQty ELSE 0 END), 0) AS DECIMAL(18,2)) as qtyFeb,
                 CAST(COALESCE(SUM(CASE WHEN MONTH(sl.modified) = 3 THEN sl.inQty ELSE 0 END), 0) AS DECIMAL(18,2)) as qtyMar,
@@ -152,7 +152,7 @@ class SemiFGProductionAnalysisReportService(
             $yearSql
             $lastOutDateStartSql
             $lastOutDateEndSql
-            GROUP BY sl.itemCode, ic.sub, it.id, b.name, uc.code, b.description
+            GROUP BY sl.itemCode, ic.sub, it.id, b.name, uc.udfudesc, b.description
             ORDER BY ic.sub, sl.itemCode
         """.trimIndent()
         

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

@@ -138,7 +138,7 @@ class StockItemConsumptionTrendReportService(
                 COALESCE(ic.sub, '') as stockSubCategory,
                 COALESCE(it.code, '') as itemNo,
                 COALESCE(it.name, '') as itemName,
-                COALESCE(uc.code, '') as unitOfMeasure,
+                COALESCE(uc.udfudesc, '') as unitOfMeasure,
                 CAST(COALESCE(SUM(CASE WHEN MONTH(sl.modified) = 1 THEN COALESCE(sl.outQty, 0) ELSE 0 END), 0) AS DECIMAL(18,2)) as qtyJan,
                 CAST(COALESCE(SUM(CASE WHEN MONTH(sl.modified) = 2 THEN COALESCE(sl.outQty, 0) ELSE 0 END), 0) AS DECIMAL(18,2)) as qtyFeb,
                 CAST(COALESCE(SUM(CASE WHEN MONTH(sl.modified) = 3 THEN COALESCE(sl.outQty, 0) ELSE 0 END), 0) AS DECIMAL(18,2)) as qtyMar,
@@ -167,7 +167,7 @@ class StockItemConsumptionTrendReportService(
             $yearSql
             $lastOutDateStartSql
             $lastOutDateEndSql
-            GROUP BY it.id, ic.sub, it.code, it.name, it.description, uc.code
+            GROUP BY it.id, ic.sub, it.code, it.name, it.description, uc.udfudesc
             ORDER BY ic.sub, it.code
         """.trimIndent()