update po

src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderInfo.kt

@@ -24,6 +24,11 @@ data class PurchaseOrderDataClass(
     val estimatedArrivalDate: LocalDateTime?,
     val completeDate: LocalDateTime?,
     val itemDetail: String,
+    val itemCode: String,
+    val itemName: String,
+    val itemQty: String,
+    val itemSumAcceptedQty: String,
+    val itemUom: String,
     val status: String,
     val supplier: String?,
     var escalated: Boolean?

src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt

@@ -83,6 +83,26 @@ open class PurchaseOrderService(
                     "       ')' " +
                     "       SEPARATOR ','" +
                     "     ) as itemDetail," +
+                    "     group_concat(" +
+                    "       coalesce(i.code, \"N/A\") " +
+                    "       SEPARATOR ','" +
+                    "     ) as itemCode," +
+                    "     group_concat(" +
+                    "       coalesce(i.name, \"N/A\") " +
+                    "       SEPARATOR ','" +
+                    "     ) as itemName," +
+                    "     group_concat(" +
+                    "       coalesce(uc.udfudesc, \"N/A\") " +
+                    "       SEPARATOR ','" +
+                    "     ) as itemUom," +
+                    "     group_concat(" +
+                    "       coalesce(pol.qty, 0) " +
+                    "       SEPARATOR ','" +
+                    "     ) as itemQty," +
+                    "     group_concat(" +
+                    "       coalesce(sil2.sumAcceptedQty, 0) " +
+                    "       SEPARATOR ','" +
+                    "     ) as itemSumAcceptedQty," +
                     "     s.name as supplier, " +
                     "     CASE " +
                     "         WHEN sil.purchaseOrderId IS NOT NULL THEN 1 " +
@@ -145,7 +165,7 @@ open class PurchaseOrderService(
         sql.append(" order by po.orderDate desc")
         sql.append(" ) r")
         if (args.containsKey("itemDetail")){
-            sql.append(" AND r.itemDetail like :itemDetail ");
+            sql.append(" where r.itemDetail like :itemDetail ");
         }
         val list = jdbcDao.queryForList(sql.toString(), args);
 
@@ -156,6 +176,11 @@ open class PurchaseOrderService(
                 orderDate = it["orderDate"] as LocalDateTime?,
                 estimatedArrivalDate = it["estimatedArrivalDate"] as LocalDateTime?,
                 itemDetail = it["itemDetail"] as String,
+                itemCode = it["itemCode"] as String,
+                itemName = it["itemName"] as String,
+                itemQty = it["itemQty"] as String,
+                itemSumAcceptedQty = it["itemSumAcceptedQty"] as String,
+                itemUom = it["itemUom"] as String,
                 completeDate = it["completeDate"] as LocalDateTime?,
                 status = it["status"] as String,
                 supplier = it["supplier"] as String?,