From c5d6dfe3530cae834b67c221fa80390e7338dbf7 Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Fri, 25 Apr 2025 14:15:32 +0800 Subject: [PATCH] update naming & add m18id to item --- .../ffii/fpsms/modules/master/entity/Items.kt | 3 + .../master/web/models/NewItemRequest.kt | 1 + ...chaseOrderItem.kt => PurchaseOrderLine.kt} | 4 +- ...tory.kt => PurchaseOrderLineRepository.kt} | 2 +- .../fpsms/modules/stock/entity/M18DataLog.kt | 4 +- .../changes/20250312_01_derek/01_master.sql | 67 ++++++++++--------- .../20250409_01_cyril/02_m18_data_log.sql | 2 +- .../20250414_01_cyril/01_purchase_order.sql | 2 +- 8 files changed, 46 insertions(+), 39 deletions(-) rename src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/{PurchaseOrderItem.kt => PurchaseOrderLine.kt} (94%) rename src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/{PurchaseOrderItemRepository.kt => PurchaseOrderLineRepository.kt} (65%) diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/Items.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/Items.kt index c7c2a41..1fe6afe 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/entity/Items.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/entity/Items.kt @@ -34,4 +34,7 @@ open class Items : BaseEntity() { @Column(name = "maxQty") open var maxQty: Double? = null + + @Column(name = "m18Id") + open var m18Id: Long? = null } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/master/web/models/NewItemRequest.kt b/src/main/java/com/ffii/fpsms/modules/master/web/models/NewItemRequest.kt index 7d227e6..c360614 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/web/models/NewItemRequest.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/web/models/NewItemRequest.kt @@ -23,6 +23,7 @@ data class NewItemRequest( val shelfLife: Double?, val countryOfOrigin: String?, val maxQty: Double?, + val m18Id: Long?, // val type: List?, // val uom: List?, // val weightUnit: List?, diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderItem.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLine.kt similarity index 94% rename from src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderItem.kt rename to src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLine.kt index 8a551c5..30dbc64 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderItem.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLine.kt @@ -9,8 +9,8 @@ import jakarta.validation.constraints.Size import java.math.BigDecimal @Entity -@Table(name = "purchase_order_item") -class PurchaseOrderItem : BaseEntity(){ +@Table(name = "purchase_order_line") +class PurchaseOrderLine : BaseEntity(){ @NotNull @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "itemId", nullable = false) diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderItemRepository.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLineRepository.kt similarity index 65% rename from src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderItemRepository.kt rename to src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLineRepository.kt index b7a7258..63f1f66 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderItemRepository.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLineRepository.kt @@ -4,5 +4,5 @@ import com.ffii.core.support.AbstractRepository import org.springframework.stereotype.Repository @Repository -interface PurchaseOrderItemRepository : AbstractRepository { +interface PurchaseOrderLineRepository : AbstractRepository { } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/M18DataLog.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/M18DataLog.kt index 2b15e02..95708e8 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/entity/M18DataLog.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/M18DataLog.kt @@ -18,8 +18,8 @@ open class M18DataLog : BaseEntity() { open var refType: String? = null @NotNull - @Column(name = "m18Key", nullable = false) - open var m18Key: Int? = null + @Column(name = "m18Id", nullable = false) + open var m18Id: Int? = null @NotNull @JdbcTypeCode(SqlTypes.JSON) diff --git a/src/main/resources/db/changelog/changes/20250312_01_derek/01_master.sql b/src/main/resources/db/changelog/changes/20250312_01_derek/01_master.sql index b23ba51..af45030 100644 --- a/src/main/resources/db/changelog/changes/20250312_01_derek/01_master.sql +++ b/src/main/resources/db/changelog/changes/20250312_01_derek/01_master.sql @@ -2,37 +2,40 @@ --changeset derek:master item table -CREATE TABLE items ( - id INT NOT NULL AUTO_INCREMENT, - version INT NOT NULL DEFAULT '0', - created datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - createdBy VARCHAR(30) NULL, - modified datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - modifiedBy VARCHAR(30) NULL, - deleted TINYINT(1) NOT NULL DEFAULT '0', - `code` VARCHAR(50) NOT NULL, - `name` VARCHAR(50) NOT NULL, - description VARCHAR(100) NULL, - remarks varchar(500) NULL, - type VARCHAR(50) NOT NULL, - uomId INT(11) NOT NULL DEFAULT 0, - shelfLife INT(11) NULL, - countryOfOrigin varchar(50) NULL, - maxQty DECIMAL(16,2) NULL, - CONSTRAINT pk_material PRIMARY KEY (id) +CREATE TABLE items +( + id INT NOT NULL AUTO_INCREMENT, + version INT NOT NULL DEFAULT '0', + created datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + createdBy VARCHAR(30) NULL, + modified datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + modifiedBy VARCHAR(30) NULL, + deleted TINYINT(1) NOT NULL DEFAULT '0', + `code` VARCHAR(50) NOT NULL, + `name` VARCHAR(50) NOT NULL, + description VARCHAR(100) NULL, + remarks varchar(500) NULL, + type VARCHAR(50) NOT NULL, + uomId INT(11) NOT NULL DEFAULT 0, + shelfLife INT(11) NULL, + countryOfOrigin varchar(50) NULL, + maxQty DECIMAL(16, 2) NULL, + m18Id INT(11) NULL, + CONSTRAINT pk_material PRIMARY KEY (id) ); -CREATE TABLE uom_conversion ( - id INT NOT NULL AUTO_INCREMENT, - version INT NOT NULL DEFAULT '0', - created datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - createdBy VARCHAR(30) NULL, - modified datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - modifiedBy VARCHAR(30) NULL, - deleted TINYINT(1) NOT NULL DEFAULT '0', - numerator DECIMAL(16,2) NOT NULL DEFAULT 1, - numUnit VARCHAR(50) NOT NULL, - denominator DECIMAL(16,2) NOT NULL DEFAULT 1, - denUnit VARCHAR(50) NOT NULL, - description VARCHAR(255) NOT NULL, - CONSTRAINT pk_uom_conversion PRIMARY KEY (id) +CREATE TABLE uom_conversion +( + id INT NOT NULL AUTO_INCREMENT, + version INT NOT NULL DEFAULT '0', + created datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + createdBy VARCHAR(30) NULL, + modified datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + modifiedBy VARCHAR(30) NULL, + deleted TINYINT(1) NOT NULL DEFAULT '0', + numerator DECIMAL(16, 2) NOT NULL DEFAULT 1, + numUnit VARCHAR(50) NOT NULL, + denominator DECIMAL(16, 2) NOT NULL DEFAULT 1, + denUnit VARCHAR(50) NOT NULL, + description VARCHAR(255) NOT NULL, + CONSTRAINT pk_uom_conversion PRIMARY KEY (id) ); \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/20250409_01_cyril/02_m18_data_log.sql b/src/main/resources/db/changelog/changes/20250409_01_cyril/02_m18_data_log.sql index f1b30b8..68ffd66 100644 --- a/src/main/resources/db/changelog/changes/20250409_01_cyril/02_m18_data_log.sql +++ b/src/main/resources/db/changelog/changes/20250409_01_cyril/02_m18_data_log.sql @@ -11,7 +11,7 @@ CREATE TABLE `m18_data_log` `modifiedBy` VARCHAR(30) NULL DEFAULT NULL, `deleted` TINYINT(1) NOT NULL DEFAULT '0', `refType` VARCHAR(10) NOT NULL, - `m18Key` INT NOT NULL, + `m18Id` INT NOT NULL, `dataLog` JSON NOT NULL, `status` VARCHAR(5) NOT NULL, CONSTRAINT pk_m18_data_log PRIMARY KEY (id) diff --git a/src/main/resources/db/changelog/changes/20250414_01_cyril/01_purchase_order.sql b/src/main/resources/db/changelog/changes/20250414_01_cyril/01_purchase_order.sql index 8a90051..0ead8f8 100644 --- a/src/main/resources/db/changelog/changes/20250414_01_cyril/01_purchase_order.sql +++ b/src/main/resources/db/changelog/changes/20250414_01_cyril/01_purchase_order.sql @@ -22,7 +22,7 @@ CREATE TABLE `purchase_order` CONSTRAINT FK_PURCHASE_ORDER_ON_M18DATALOGID FOREIGN KEY (m18DataLogId) REFERENCES m18_data_log (id) ); -CREATE TABLE `purchase_order_item` +CREATE TABLE `purchase_order_line` ( `id` INT NOT NULL AUTO_INCREMENT, `created` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,