diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
index ea7d54d..0a6638d 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt
@@ -899,7 +899,7 @@ open class DeliveryOrderService(
             else -> "2F"
         }
 
-        val defaultTruckId = 4658L
+        val defaultTruckId = 5577L
         val effectiveTruck = truck ?: truckRepository.findById(defaultTruckId).orElse(null)
         if (effectiveTruck == null) {
             val errorMsg = "No matching truck for preferredFloor ($preferredFloor) and default truck $defaultTruckId not found. Skipping DO ${deliveryOrder.id}."
@@ -1591,7 +1591,7 @@ open class DeliveryOrderService(
             }
 
         }
-        val defaultTruckId = 4658L
+        val defaultTruckId = 5577L
         val effectiveTruck = truck ?: truckRepository.findById(defaultTruckId).orElse(null) 
         val usedDefaultTruck = (truck == null)
         if (effectiveTruck == null) {
diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt
index a90b522..39d4426 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt
@@ -95,7 +95,7 @@ class DoPickOrderQueryService(
                 handledBy = it.handledBy
             )
         }
-        val defaultTruckId = 4658L
+        val defaultTruckId = 5577L
         val defaultTruck = truckRepository.findById(defaultTruckId).orElse(null)
         val defaultTruckLaneCode = defaultTruck?.truckLanceCode ?: ""
         println("    DEBUG: After filtering, ${allRecords.size} records remain (${filteredActiveRecords.size} active + ${filteredCompletedRecords.size} completed)")
diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
index 1f5a41a..1645a8f 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
@@ -555,7 +555,7 @@ open class DoPickOrderService(
             "3/F" -> "3F"
             else -> "2F"
         }
-        val defaultTruckId = 4658L
+        val defaultTruckId = 5577L
         val trucks = truckRepository.findByShopIdAndDeletedFalse(shopId)
         return trucks.find { it.storeId == storeId } ?: truckRepository.findById(defaultTruckId).orElse(null)
     }
diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckService.kt
index e9a7b84..0b43162 100644
--- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckService.kt
@@ -124,6 +124,11 @@ open class TruckService(
         for (i in START_ROW_INDEX..<sheet.lastRowNum) {
             val row = sheet.getRow(i)
 
+            if (row == null) {
+                logger.warn("Row ${i + 1}: Skipped - row is null or empty")
+                continue
+            }
+
             try {
                 val truckLanceCode = ExcelUtils.getStringValue(row.getCell(COLUMN_TRUCK_LANCE_CODE_INDEX)).trim()
                 val departureTimeStr = ExcelUtils.getStringValue(row.getCell(COLUMN_DEPARTURE_TIME_INDEX)).trim()
@@ -144,12 +149,15 @@ open class TruckService(
                 }
                 val departureTime = parseDepartureTime(departureTimeStr)
                 if (departureTime == null) {
-                    logger.warn("Row ${i + 1}: Invalid departure time '$departureTimeStr', skipping")
+                    logger.warn("Row ${i + 1}: Skipped - invalid departure time '$departureTimeStr'")
                     continue
                 }
                 val normalizedShopCode = normalizeShopCode(shopCode)
                 val shop = shopRepository.findAllByDeletedIsFalse().firstOrNull { it.code == normalizedShopCode }
-                //println("shop: ${shop}")
+                if (shop == null) {
+                    logger.warn("Row ${i + 1}: Skipped - no shop found for shopCode '$shopCode' (normalized: '$normalizedShopCode')")
+                    continue
+                }
                 val existingTruck = truckRepository.findByShopCodeAndStoreId(shopCode, store_id)
                 if (existingTruck != null) {
 
@@ -158,13 +166,14 @@ open class TruckService(
                         store_id = store_id,
                         truckLanceCode = truckLanceCode ?: existingTruck.truckLanceCode ?: "",
                         departureTime = departureTime,
-                        shopId = shop?.id!!,
+                        shopId = shop.id!!,
                         shopName = shopName ?: "",
                         shopCode = normalizedShopCode,
                         loadingSequence = loadingSequence,
                         remark = remark
                     )
                     saveTruck(truckRequest)
+                    logger.info("Row ${i + 1}: Updated truck id=${existingTruck.id}, truckLanceCode=$truckLanceCode, shopCode=$normalizedShopCode, store_id=$store_id")
                 } else {
                    
                     val truckRequest = SaveTruckRequest(
@@ -172,16 +181,17 @@ open class TruckService(
                         store_id = store_id,
                         truckLanceCode = truckLanceCode ?: "",
                         departureTime = departureTime,
-                        shopId = shop?.id!!,
+                        shopId = shop.id!!,
                         shopName = shopName ?: "",
                         shopCode = normalizedShopCode,
                         loadingSequence = loadingSequence,
                         remark = remark
                     )
                     saveTruck(truckRequest)
+                    logger.info("Row ${i + 1}: Created truck truckLanceCode=$truckLanceCode, shopCode=$normalizedShopCode, store_id=$store_id")
                 }
             } catch (e: Exception) {
-                logger.error("Import Error (Warehouse Error): ${e.message}")
+                logger.error("Row ${i + 1}: Skipped - exception: ${e.message}", e)
             }
         }
         logger.info("--------- End - Import Warehouse Excel -------")