Rename

src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt

@@ -137,13 +137,13 @@ open class PickOrderService(
                 val uom = pol.uom
 
                 // Check If already have suggestion
-                val suggestion = pol.suggestedPickLots
-//                if (suggestion.isEmpty()) {
-//                    suggestion = suggestedList.filter { it.pickOrderLine?.id == pol.id }.toMutableList()
+                val suggestedPickLots = pol.suggestedPickLots
+//                if (suggestedPickLots.isEmpty()) {
+//                    suggestedPickLots = suggestedList.filter { it.pickOrderLine?.id == pol.id }.toMutableList()
 //                }
 
                 // Mapping: SuggestedPickLot -> SuggestPickLotInConso
-                val finalSuggestion = suggestion.map {
+                val finalSuggestedPickLots = suggestedPickLots.map {
                     val inventoryLotLine = it.suggestedLotLine
                     val remainingQty = (inventoryLotLine?.inQty ?: zero)
                         .minus(inventoryLotLine?.outQty ?: zero)
@@ -164,7 +164,7 @@ open class PickOrderService(
                     )
 
                     // Return
-                    SuggestPickLotInConso(
+                    SuggestedPickLotInConso(
                         id = it.id,
                         type = it.type?.value,
                         qty = it.qty,
@@ -173,13 +173,17 @@ open class PickOrderService(
                     )
                 }
 
+                // Actual Pick Lots
+//                val actualPickLots = pol.stockOutLines
+//                val finalActu
+
                 // Return
                 PickOrderLineInConso(
                     id = pol.id,
                     item = IdCodeName(item?.id, item?.code, item?.name),
                     qty = pol.qty,
                     uom = IdCodeDesc(uom?.id, uom?.code, uom?.udfudesc),
-                    suggestPickLots = finalSuggestion,
+                    suggestedPickLots = finalSuggestedPickLots,
                     status = pol.status?.value,
                     actualPickLots = mutableListOf()
                 )
@@ -209,10 +213,10 @@ open class PickOrderService(
             .groupBy { it.item.id }
             .map { (_itemId, _line) ->
                 val itemSuggestions = _line
-                    .flatMap { it.suggestPickLots }
+                    .flatMap { it.suggestedPickLots }
                     .groupBy { it.inventoryLotLine.id to it.pickSuggested }
                     .map { (_key, _lot) ->
-                        SuggestPickLotInConso(
+                        SuggestedPickLotInConso(
                             id = _key.first,
                             type = _lot.first().type,
                             inventoryLotLine = _lot.first().inventoryLotLine,

src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt

@@ -37,11 +37,11 @@ data class PickOrderLineInConso(
     val qty: BigDecimal?,
     val uom: IdCodeDesc,
     val status: String?,
-    val suggestPickLots: List<SuggestPickLotInConso>,
+    val suggestedPickLots: List<SuggestedPickLotInConso>,
     val actualPickLots: List<ActualPickLotInConso>,
 )
 
-data class SuggestPickLotInConso(
+data class SuggestedPickLotInConso(
     val id: Long?,
     val type: String?,
     val inventoryLotLine: InventoryLotLineInConso,
@@ -73,7 +73,7 @@ data class ItemInConso(
     val code: String?,
     val name: String?,
     val qty: BigDecimal?,
-    val suggestPickLots: List<SuggestPickLotInConso>,
+    val suggestPickLots: List<SuggestedPickLotInConso>,
     val actualPickLots: List<ActualPickLotInConso>,
 )