| @@ -41,6 +41,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> { | |||||
| select | select | ||||
| jo.id, | jo.id, | ||||
| jo.code, | jo.code, | ||||
| i.code as itemCode, | |||||
| b.name, | b.name, | ||||
| jo.reqQty, | jo.reqQty, | ||||
| -- b.outputQtyUom, | -- b.outputQtyUom, | ||||
| @@ -68,8 +69,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> { | |||||
| left join uom_conversion uc on uc.id = jobm.uomId | left join uom_conversion uc on uc.id = jobm.uomId | ||||
| left join picked_lot_no pln on pln.itemId = jobm.itemId and pln.joId = jo.id | left join picked_lot_no pln on pln.itemId = jobm.itemId and pln.joId = jo.id | ||||
| where jo.id = :id | where jo.id = :id | ||||
| group by jo.id, uc2.udfudesc, uc2.udfShortDesc | |||||
| group by jo.id, uc2.udfudesc, uc2.udfShortDesc, i.code | |||||
| limit 1 | limit 1 | ||||
| """ | """ | ||||
| ) | ) | ||||
| @@ -8,6 +8,8 @@ interface JobOrderInfo { | |||||
| val id: Long; | val id: Long; | ||||
| val code: String; | val code: String; | ||||
| @get:Value("#{target.bom.item.code}") | |||||
| val itemCode: String; | |||||
| @get:Value("#{target.bom.name}") | @get:Value("#{target.bom.name}") | ||||
| val name: String; | val name: String; | ||||
| val reqQty: BigDecimal; | val reqQty: BigDecimal; | ||||
| @@ -23,6 +25,7 @@ interface JobOrderInfo { | |||||
| interface JobOrderDetailWithJsonString { | interface JobOrderDetailWithJsonString { | ||||
| val id: Long?; | val id: Long?; | ||||
| val code: String?; | val code: String?; | ||||
| val itemCode: String?; | |||||
| val name: String?; | val name: String?; | ||||
| val reqQty: BigDecimal?; | val reqQty: BigDecimal?; | ||||
| val uom: String?; | val uom: String?; | ||||
| @@ -34,6 +37,7 @@ interface JobOrderDetailWithJsonString { | |||||
| data class JobOrderDetail( | data class JobOrderDetail( | ||||
| val id: Long?, | val id: Long?, | ||||
| val code: String?, | val code: String?, | ||||
| val itemCode: String?, | |||||
| val name: String?, | val name: String?, | ||||
| val reqQty: BigDecimal?, | val reqQty: BigDecimal?, | ||||
| val uom: String?, | val uom: String?, | ||||
| @@ -79,6 +79,7 @@ open class JobOrderService( | |||||
| return JobOrderDetail( | return JobOrderDetail( | ||||
| id = sqlResult.id, | id = sqlResult.id, | ||||
| code = sqlResult.code, | code = sqlResult.code, | ||||
| itemCode = sqlResult.itemCode, | |||||
| name = sqlResult.name, | name = sqlResult.name, | ||||
| reqQty = sqlResult.reqQty, | reqQty = sqlResult.reqQty, | ||||
| uom = sqlResult.uom, | uom = sqlResult.uom, | ||||
| @@ -96,6 +97,7 @@ open class JobOrderService( | |||||
| return JobOrderDetail( | return JobOrderDetail( | ||||
| id = sqlResult.id, | id = sqlResult.id, | ||||
| code = sqlResult.code, | code = sqlResult.code, | ||||
| itemCode = sqlResult.itemCode, | |||||
| name = sqlResult.name, | name = sqlResult.name, | ||||
| reqQty = sqlResult.reqQty, | reqQty = sqlResult.reqQty, | ||||
| uom = sqlResult.uom, | uom = sqlResult.uom, | ||||