From aee6779430a2a0e6ddd2d2984a6e6eceb66bda4e Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Mon, 14 Apr 2025 18:30:39 +0800
Subject: [PATCH] update master table liquidbase, drop schema run again

---
 .../changes/20250312_01_derek/01_master.sql   | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

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 e0d842b..2881b8d 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
@@ -1,16 +1,6 @@
 --liquibase formatted sql
 
 --changeset derek:master item table
-CREATE TABLE item_type (
-  id INT NOT NULL AUTO_INCREMENT,
-  name VARCHAR(50) NOT NULL,
-  CONSTRAINT pk_item_type PRIMARY KEY (id)
-);
-INSERT INTO item_type (name) VALUES
-('material'),
-('product'),
-('by-product'),
-('consumables');
 
 CREATE TABLE items (
    id INT NOT NULL AUTO_INCREMENT,
@@ -24,16 +14,11 @@ CREATE TABLE items (
    `name` VARCHAR(50) NOT NULL,
    description VARCHAR(100) NULL,
    remarks varchar(500) NULL,
-   typeId INT(11) NOT NULL,
+   type VARCHAR(50) NOT NULL,
+   uomId INT(11) NOT NULL DEFAULT 0,
    shelfLife INT(11) NULL,
    countryOfOrigin varchar(50) NULL,
-   minHumid DECIMAL(16,2) NULL,
-   maxHumid DECIMAL(16,2) NULL,
-   minTemp DECIMAL(16,2) NULL,
-   maxTemp DECIMAL(16,2) NULL,
-   sampleRate DECIMAL(16,2) NULL,
-   passingRate DECIMAL(16,2) NULL,
-   netWeight DECIMAL(16,2) NULL,
+   maxQty DECIMAL(16,2) NULL,
    CONSTRAINT pk_material PRIMARY KEY (id),
    CONSTRAINT fk_items FOREIGN KEY (`typeId`) REFERENCES `item_type` (`id`)
 );
@@ -45,10 +30,10 @@ CREATE TABLE uom_conversion (
    modified datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
    modifiedBy VARCHAR(30) NULL,
    deleted TINYINT(1) NOT NULL DEFAULT '0',
-   inQty DECIMAL(16,2) NOT NULL DEFAULT 1,
-   inUom VARCHAR(50) NOT NULL,
-   ratio DECIMAL(16,2) NOT NULL,
-   outQty DECIMAL(16,2) NOT NULL DEFAULT 1,
-   outUom VARCHAR(50) NOT NULL,
+   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