| @@ -97,6 +97,7 @@ data class JobOrderDetailPickLine( | |||||
| val code: String?, | val code: String?, | ||||
| val name: String?, | val name: String?, | ||||
| val pickedLotNo: List<JobOrderDetailPickedLotNo>?, | val pickedLotNo: List<JobOrderDetailPickedLotNo>?, | ||||
| val type: String?, | |||||
| val reqQty: BigDecimal?, | val reqQty: BigDecimal?, | ||||
| val uom: String?, | val uom: String?, | ||||
| val shortUom: String?, | val shortUom: String?, | ||||
| @@ -223,8 +223,9 @@ open class JobOrderService( | |||||
| status = JobOrderStatus.PENDING | status = JobOrderStatus.PENDING | ||||
| } | } | ||||
| jobOrderRepository.save(jo) | jobOrderRepository.save(jo) | ||||
| val pols = jo.jobms.map { | |||||
| val pols = jo.jobms.filter { it.item?.type != "mat"&& it.item?.type != "item"}. | |||||
| map { | |||||
| SavePickOrderLineRequest( | SavePickOrderLineRequest( | ||||
| itemId = it.item?.id, | itemId = it.item?.id, | ||||
| qty = it.reqQty ?: BigDecimal.ZERO, | qty = it.reqQty ?: BigDecimal.ZERO, | ||||
| @@ -73,6 +73,7 @@ data class jobOrderLineInfo( | |||||
| val itemId: Long?, | val itemId: Long?, | ||||
| val itemCode: String?, | val itemCode: String?, | ||||
| val itemName: String?, | val itemName: String?, | ||||
| val type: String?, | |||||
| val reqQty: Int?, | val reqQty: Int?, | ||||
| val stockQty: Int?, | val stockQty: Int?, | ||||
| val uom: String?, | val uom: String?, | ||||
| @@ -630,6 +630,7 @@ open class ProductProcessService( | |||||
| stockQty = stockQty, | stockQty = stockQty, | ||||
| uom = uom?.udfudesc ?: "", | uom = uom?.udfudesc ?: "", | ||||
| shortUom = shortUom, | shortUom = shortUom, | ||||
| type = line.item?.type?: "", | |||||
| availableStatus = availableStatus, | availableStatus = availableStatus, | ||||
| bomProcessId = bomProcessMaterial?.bomProcess?.id?:0, | bomProcessId = bomProcessMaterial?.bomProcess?.id?:0, | ||||
| bomProcessSeqNo = bomProcessMaterial?.bomProcess?.seqNo?:0 | bomProcessSeqNo = bomProcessMaterial?.bomProcess?.seqNo?:0 | ||||