update naming & add m18id to item

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

@@ -34,4 +34,7 @@ open class Items : BaseEntity<Long>() {
 
     @Column(name = "maxQty")
     open var maxQty: Double? = null
+
+    @Column(name = "m18Id")
+    open var m18Id: Long? = null
 }

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<NewTypeRequest>?,
 //    val uom: List<NewUomRequest>?,
 //    val weightUnit: List<NewWeightUnitRequest>?,

src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderItem.kt → 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<Long>(){
+@Table(name = "purchase_order_line")
+class PurchaseOrderLine : BaseEntity<Long>(){
     @NotNull
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "itemId", nullable = false)

src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderItemRepository.kt → 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<PurchaseOrderItem, Long> {
+interface PurchaseOrderLineRepository : AbstractRepository<PurchaseOrderLine, Long> {
 }

src/main/java/com/ffii/fpsms/modules/stock/entity/M18DataLog.kt

@@ -18,8 +18,8 @@ open class M18DataLog : BaseEntity<Long>() {
     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)

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)
 );

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)

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,