From b9bcd7d6589f1d6c531c2aedc902e39df0eaffd8 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Thu, 25 Sep 2025 13:40:13 +0800
Subject: [PATCH] quick update

---
 .../modules/jobOrder/entity/JobOrderRepository.kt     |  2 +-
 .../fpsms/modules/stock/service/StockTakeService.kt   | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
index 5c532dd..4b700e3 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
@@ -32,7 +32,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
                     ) as pickedLotNo
                 from pick_order po
                 left join pick_order_line pol on pol.poId = po.id
-                left join stock_out_line sol on sol.pickOrderLineId = pol.id
+                left join stock_out_line sol on sol.pickOrderLineId = pol.id and sol.status = 'completed'
                 left join inventory_lot_line ill on ill.id = sol.inventoryLotLineId
                 left join inventory_lot il on il.id = ill.inventoryLotId
                 where po.joId = :id and il.lotNo is not null
diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/StockTakeService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/StockTakeService.kt
index 281f60a..1a6c47e 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/service/StockTakeService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/service/StockTakeService.kt
@@ -69,7 +69,7 @@ class StockTakeService(
             when (it.cellType) {
                 CellType.STRING -> it.stringCellValue
                 CellType.NUMERIC -> it.numericCellValue
-                else -> null
+                else -> ""
             }
         }.toString()
     }
@@ -85,6 +85,8 @@ class StockTakeService(
 
         // Columns
         val COLUMN_ITEM_CODE_INDEX = 6;
+        val COLUMN_FLOOR_INDEX = 11;
+        val COLUMN_PLACE_INDEX = 12;
         val COLUMN_WAREHOSE_INDEX = 13;
         val COLUMN_ZONE_INDEX = 14;
         val COLUMN_SLOT_INDEX = 15;
@@ -117,6 +119,8 @@ class StockTakeService(
 
             // Warehouse
             val warehouse = try {
+                val floor = getCellStringValue(row.getCell(COLUMN_FLOOR_INDEX))
+                val place = getCellStringValue(row.getCell(COLUMN_PLACE_INDEX))
                 val code = getCellStringValue(row.getCell(COLUMN_WAREHOSE_INDEX))
                 val zone = getCellStringValue(row.getCell(COLUMN_ZONE_INDEX))
                 val slot = getCellStringValue(row.getCell(COLUMN_SLOT_INDEX))
@@ -124,6 +128,7 @@ class StockTakeService(
 
                 val defaultCapacity = BigDecimal(10000)
                 val warehouseCode = "$code-$zone-$slot"
+                val warehouseName = "$floor-$place"
                 val existingWarehouse = warehouseService.findByCode(warehouseCode)
 
                 if (existingWarehouse != null) {
@@ -131,8 +136,8 @@ class StockTakeService(
                 } else {
                     val warehouseRequest = SaveWarehouseRequest(
                         code = warehouseCode,
-                        name = warehouseCode,
-                        description = warehouseCode,
+                        name = warehouseName,
+                        description = warehouseName,
                         capacity = defaultCapacity
                     )
                     warehouseService.saveWarehouse(warehouseRequest)