Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt

src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt

@@ -54,6 +54,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
                         'pickedLotNo', pln.pickedLotNo,
                         'reqQty', jobm.reqQty,
                         'uom', uc.udfudesc,
+                        'shortUom', uc.udfShortdesc,
                         'status', jobm.status
                     )
                 ) as pickLines,
@@ -68,6 +69,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
             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
             limit 1
         """
     )

src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt

@@ -26,6 +26,7 @@ interface JobOrderDetailWithJsonString {
     val name: String?;
     val reqQty: BigDecimal?;
     val uom: String?;
+    val shortUom: String?;
     val pickLines: String?;
     val status: String?;
 }
@@ -36,6 +37,7 @@ data class JobOrderDetail(
     val name: String?,
     val reqQty: BigDecimal?,
     val uom: String?,
+    val shortUom: String?,
     val pickLines: List<JobOrderDetailPickLine>?,
     val status: String?
 )

src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt

@@ -83,7 +83,8 @@ open class JobOrderService(
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
             pickLines = jsonResult,
-            status = sqlResult.status
+            status = sqlResult.status,
+            shortUom = sqlResult.shortUom
         )
     }
     
@@ -99,7 +100,8 @@ open class JobOrderService(
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
             pickLines = jsonResult,
-            status = sqlResult.status
+            status = sqlResult.status,
+            shortUom = sqlResult.shortUom
         )
     }