Browse Source

update jo

master
cyril.tsui 2 months ago
parent
commit
77cf2d7868
3 changed files with 8 additions and 2 deletions
  1. +2
    -2
      src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
  2. +4
    -0
      src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
  3. +2
    -0
      src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt

+ 2
- 2
src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt View File

@@ -41,6 +41,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
select
jo.id,
jo.code,
i.code as itemCode,
b.name,
jo.reqQty,
-- b.outputQtyUom,
@@ -68,8 +69,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
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
where jo.id = :id
group by jo.id, uc2.udfudesc, uc2.udfShortDesc
group by jo.id, uc2.udfudesc, uc2.udfShortDesc, i.code
limit 1
"""
)


+ 4
- 0
src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt View File

@@ -8,6 +8,8 @@ interface JobOrderInfo {
val id: Long;
val code: String;

@get:Value("#{target.bom.item.code}")
val itemCode: String;
@get:Value("#{target.bom.name}")
val name: String;
val reqQty: BigDecimal;
@@ -23,6 +25,7 @@ interface JobOrderInfo {
interface JobOrderDetailWithJsonString {
val id: Long?;
val code: String?;
val itemCode: String?;
val name: String?;
val reqQty: BigDecimal?;
val uom: String?;
@@ -34,6 +37,7 @@ interface JobOrderDetailWithJsonString {
data class JobOrderDetail(
val id: Long?,
val code: String?,
val itemCode: String?,
val name: String?,
val reqQty: BigDecimal?,
val uom: String?,


+ 2
- 0
src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt View File

@@ -79,6 +79,7 @@ open class JobOrderService(
return JobOrderDetail(
id = sqlResult.id,
code = sqlResult.code,
itemCode = sqlResult.itemCode,
name = sqlResult.name,
reqQty = sqlResult.reqQty,
uom = sqlResult.uom,
@@ -96,6 +97,7 @@ open class JobOrderService(
return JobOrderDetail(
id = sqlResult.id,
code = sqlResult.code,
itemCode = sqlResult.itemCode,
name = sqlResult.name,
reqQty = sqlResult.reqQty,
uom = sqlResult.uom,


Loading…
Cancel
Save