From 66df3b1db6df24574b8e1420b75b205792d25da8 Mon Sep 17 00:00:00 2001 From: tommy Date: Thu, 30 Apr 2026 16:40:16 +0800 Subject: [PATCH] add logistic table , chnaged district reference type --- .../modules/master/entity/ShopAndTruck.kt | 7 +++--- .../master/entity/projections/ShopAndTruck.kt | 2 +- .../fpsms/modules/pickOrder/entity/Truck.kt | 5 ++-- .../modules/pickOrder/service/TruckService.kt | 2 +- .../pickOrder/web/models/SaveTruckRequest.kt | 6 ++--- .../01_create_logistic_and_alter_truck.sql | 23 +++++++++++++++++++ 6 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/db/changelog/changes/20260430_01_2fi/01_create_logistic_and_alter_truck.sql diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/ShopAndTruck.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/ShopAndTruck.kt index 0a0d9ac..8d94a9b 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/entity/ShopAndTruck.kt +++ b/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() { // --- Shop fields --- @@ -49,8 +49,9 @@ open class ShopAndTruck : BaseEntity() { @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 diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/projections/ShopAndTruck.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/projections/ShopAndTruck.kt index 345dbdf..bd88f21 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/entity/projections/ShopAndTruck.kt +++ b/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? diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/Truck.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/Truck.kt index 34c15f4..976ac97 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/Truck.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/Truck.kt @@ -35,8 +35,9 @@ open class Truck : BaseEntity() { @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 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 0b43162..a473ae3 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 @@ -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 diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/SaveTruckRequest.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/SaveTruckRequest.kt index 708b4b3..b96e33c 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/SaveTruckRequest.kt +++ b/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, ) diff --git a/src/main/resources/db/changelog/changes/20260430_01_2fi/01_create_logistic_and_alter_truck.sql b/src/main/resources/db/changelog/changes/20260430_01_2fi/01_create_logistic_and_alter_truck.sql new file mode 100644 index 0000000..9f4e7c8 --- /dev/null +++ b/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;