add logistic table , chnaged district reference type

src/main/java/com/ffii/fpsms/modules/master/entity/ShopAndTruck.kt

@@ -15,7 +15,7 @@ import java.time.LocalTime
 
 @Entity
 @Table(name = "shop")
-@SecondaryTable(name="Truck", pkJoinColumns = [PrimaryKeyJoinColumn(name = "shopId", referencedColumnName = "id")])
+@SecondaryTable(name = "truck", pkJoinColumns = [PrimaryKeyJoinColumn(name = "shopId", referencedColumnName = "id")])
 open class ShopAndTruck : BaseEntity<Long>() {
 
     // --- Shop fields ---
@@ -49,8 +49,9 @@ open class ShopAndTruck : BaseEntity<Long>() {
     @Column(table = "truck", name = "LoadingSequence")
     open var loadingSequence: Long? = null
 
-    @Column(table = "truck", name = "districtReference")
-    open var districtReference: Long? = null
+    @Size(max = 255)
+    @Column(table = "truck", name = "districtReference", length = 255)
+    open var districtReference: String? = null
 
     @Column(table = "truck", name = "Store_id")
     open var storeId: String? = null

src/main/java/com/ffii/fpsms/modules/master/entity/projections/ShopAndTruck.kt

@@ -16,7 +16,7 @@ interface ShopAndTruck {
     val truckLanceCode: String?
     val departureTime: LocalTime?
     val LoadingSequence: Long?
-    val districtReference: Long?
+    val districtReference: String?
     val Store_id: String?
     val remark: String?
     val truckId: Long?

src/main/java/com/ffii/fpsms/modules/pickOrder/entity/Truck.kt

@@ -35,8 +35,9 @@ open class Truck : BaseEntity<Long>() {
     @Column(name = "Store_id")
     open var storeId: String? = null
 
-    @Column(name = "districtReference")
-    open var districtReference: Int? = null
+    @Size(max = 255)
+    @Column(name = "districtReference", length = 255)
+    open var districtReference: String? = null
 
     @Column(name = "remark")
     open var remark: String? = null

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

@@ -212,7 +212,7 @@ open class TruckService(
         // Use remark from request (user input) - no auto-fill
         updateTruckLance.truckLanceCode = request.truckLanceCode
         updateTruckLance.loadingSequence = request.loadingSequence.toInt()
-        updateTruckLance.districtReference = request.districtReference.toInt()
+        updateTruckLance.districtReference = request.districtReference
         updateTruckLance.departureTime = request.departureTime
         updateTruckLance.storeId = request.storeId
         // Only set remark if storeId is "4F", otherwise set to null

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

@@ -10,14 +10,14 @@ data class SaveTruckRequest(
     val shopCode: String,
     val loadingSequence: Int,
     val remark: String? = null,
-    val districtReference: Int? = null,
+    val districtReference: String? = null,
 )
 data class SaveTruckLane(
     val id: Long,
     val truckLanceCode: String,
     val departureTime: LocalTime,
     val loadingSequence: Long,
-    val districtReference: Long,
+    val districtReference: String?,
     val storeId: String,
     val remark: String? = null
 )
@@ -37,6 +37,6 @@ data class CreateTruckWithoutShopRequest(
     val truckLanceCode: String,
     val departureTime: LocalTime,
     val loadingSequence: Int = 0,
-    val districtReference: Int? = null,
+    val districtReference: String? = null,
     val remark: String? = null,
 )

src/main/resources/db/changelog/changes/20260430_01_2fi/01_create_logistic_and_alter_truck.sql

@@ -0,0 +1,23 @@
+-- liquibase formatted sql
+-- changeset 2fi:20260430_01_create_logistic
+
+CREATE TABLE `logistic`
+(
+    `id`           INT          NOT NULL AUTO_INCREMENT,
+    `created`      DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `createdBy`    VARCHAR(30)  NULL     DEFAULT NULL,
+    `version`      INT          NOT NULL DEFAULT '0',
+    `modified`     DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `modifiedBy`   VARCHAR(30)  NULL     DEFAULT NULL,
+    `deleted`      TINYINT(1)   NOT NULL DEFAULT '0',
+    `logisticName` VARCHAR(255) NOT NULL,
+    `carPlate`     VARCHAR(50)  NOT NULL,
+    `driverName`   VARCHAR(255) NOT NULL,
+    `driverNumber` INT          NOT NULL,
+    CONSTRAINT pk_logistic PRIMARY KEY (`id`)
+);
+
+-- changeset 2fi:20260430_02_truck_district_reference_to_string
+
+ALTER TABLE `truck`
+    MODIFY COLUMN `districtReference` VARCHAR(255) NULL;