diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt index 0a20ec7..0d851a2 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt @@ -115,6 +115,9 @@ open class PurchaseOrderService( if (args.containsKey("code")){ sql.append(" AND po.code like :code "); } + if (args.containsKey("supplier")){ + sql.append(" AND s.name like :supplier "); + } if (args.containsKey("status")){ sql.append(" AND po.status = :status "); } diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/PurchaseOrderController.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/PurchaseOrderController.kt index 52a7ec0..f6fb554 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/PurchaseOrderController.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/PurchaseOrderController.kt @@ -39,6 +39,7 @@ class PurchaseOrderController( // println("request") // println(request) val criteriaArgs = CriteriaArgsBuilder.withRequest(request) + .addStringLike("supplier") .addStringLike("code") .addString("status") .addBoolean("escalated")