diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
index fb62ac9..2504341 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
@@ -97,6 +97,7 @@ data class JobOrderDetailPickLine(
     val code: String?,
     val name: String?,
     val pickedLotNo: List<JobOrderDetailPickedLotNo>?,
+    val type: String?,
     val reqQty: BigDecimal?,
     val uom: String?,
     val shortUom: String?,
diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
index 3df4c29..acc5653 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
@@ -223,8 +223,9 @@ open class JobOrderService(
             status = JobOrderStatus.PENDING
         }
         jobOrderRepository.save(jo)
-
-        val pols = jo.jobms.map {
+        
+        val pols = jo.jobms.filter { it.item?.type != "mat"&& it.item?.type != "item"}.
+        map {
             SavePickOrderLineRequest(
                 itemId = it.item?.id,
                 qty = it.reqQty ?: BigDecimal.ZERO,
diff --git a/src/main/java/com/ffii/fpsms/modules/productProcess/entity/projections/ProductProcessInfo.kt b/src/main/java/com/ffii/fpsms/modules/productProcess/entity/projections/ProductProcessInfo.kt
index 9893999..6db83dc 100644
--- a/src/main/java/com/ffii/fpsms/modules/productProcess/entity/projections/ProductProcessInfo.kt
+++ b/src/main/java/com/ffii/fpsms/modules/productProcess/entity/projections/ProductProcessInfo.kt
@@ -73,6 +73,7 @@ data class jobOrderLineInfo(
     val itemId: Long?,
     val itemCode: String?,
     val itemName: String?,
+    val type: String?,
     val reqQty: Int?,
     val stockQty: Int?,
     val uom: String?,
diff --git a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
index 0bd7c76..c801012 100644
--- a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
@@ -630,6 +630,7 @@ open class ProductProcessService(
                         stockQty = stockQty,
                         uom = uom?.udfudesc ?: "",
                         shortUom = shortUom,
+                        type = line.item?.type?: "",
                         availableStatus = availableStatus,
                         bomProcessId = bomProcessMaterial?.bomProcess?.id?:0,
                         bomProcessSeqNo = bomProcessMaterial?.bomProcess?.seqNo?:0