From c9b74dad83d355c18cfc6d1d4c88c8762259ccf6 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Wed, 18 Jun 2025 14:39:09 +0800 Subject: [PATCH] add bom weighting score --- .../settings/entity/BomWeightingScore.kt | 23 +++++++++++++++++++ .../entity/BomWeightingScoreRepository.kt | 6 +++++ .../stock/web/model/SaveStockInRequest.kt | 3 ++- .../01_add_corresponding_weighting.sql | 6 +++++ .../20250618_01_derek/02_revert_last.sql | 6 +++++ .../03_create_weighting_score.sql | 15 ++++++++++++ .../20250618_01_derek/04_add_remarks.sql | 4 ++++ 7 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/ffii/fpsms/modules/settings/entity/BomWeightingScore.kt create mode 100644 src/main/java/com/ffii/fpsms/modules/settings/entity/BomWeightingScoreRepository.kt create mode 100644 src/main/resources/db/changelog/changes/20250618_01_derek/01_add_corresponding_weighting.sql create mode 100644 src/main/resources/db/changelog/changes/20250618_01_derek/02_revert_last.sql create mode 100644 src/main/resources/db/changelog/changes/20250618_01_derek/03_create_weighting_score.sql create mode 100644 src/main/resources/db/changelog/changes/20250618_01_derek/04_add_remarks.sql diff --git a/src/main/java/com/ffii/fpsms/modules/settings/entity/BomWeightingScore.kt b/src/main/java/com/ffii/fpsms/modules/settings/entity/BomWeightingScore.kt new file mode 100644 index 0000000..f82fcc9 --- /dev/null +++ b/src/main/java/com/ffii/fpsms/modules/settings/entity/BomWeightingScore.kt @@ -0,0 +1,23 @@ +package com.ffii.fpsms.modules.settings.entity + +import com.ffii.core.entity.BaseEntity +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Table +import java.math.BigDecimal + +@Table(name = "bom_weighting_score") +@Entity +open class BomWeightingScore: BaseEntity() { + @Column + open var name: String? = null + + @Column + open var range: Int? = null + + @Column + open var weighting: BigDecimal? = null + + @Column + open var remarks: String? = null +} \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/settings/entity/BomWeightingScoreRepository.kt b/src/main/java/com/ffii/fpsms/modules/settings/entity/BomWeightingScoreRepository.kt new file mode 100644 index 0000000..70f17cf --- /dev/null +++ b/src/main/java/com/ffii/fpsms/modules/settings/entity/BomWeightingScoreRepository.kt @@ -0,0 +1,6 @@ +package com.ffii.fpsms.modules.settings.entity + +import com.ffii.core.support.AbstractRepository + +interface BomWeightingScoreRepository: AbstractRepository { +} \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt b/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt index e93bf6a..56b4270 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt @@ -19,7 +19,8 @@ enum class StockInLineStatus(val status: String) { ThirdDetermine("determine3"), RECEIVING("receiving"), RECEIVED("received"), - COMPLETE("completed"); + COMPLETE("completed"), + REJECT("rejected"); } data class SaveStockInRequest( val purchaseOrderId: Long? = null, diff --git a/src/main/resources/db/changelog/changes/20250618_01_derek/01_add_corresponding_weighting.sql b/src/main/resources/db/changelog/changes/20250618_01_derek/01_add_corresponding_weighting.sql new file mode 100644 index 0000000..3369fd1 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20250618_01_derek/01_add_corresponding_weighting.sql @@ -0,0 +1,6 @@ +-- liquibase formatted sql +-- changeset derek:add_corresponding_weighting +ALTER TABLE `bom` +ADD COLUMN `isDarkWeighting` DECIMAL(14, 2) NOT NULL AFTER `isDark`, +ADD COLUMN `isFloatWeighting` DECIMAL(14, 2) NOT NULL AFTER `isFloat`, +ADD COLUMN `isDenseWeighting` DECIMAL(14, 2) NOT NULL AFTER `isDense`; \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/20250618_01_derek/02_revert_last.sql b/src/main/resources/db/changelog/changes/20250618_01_derek/02_revert_last.sql new file mode 100644 index 0000000..b742131 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20250618_01_derek/02_revert_last.sql @@ -0,0 +1,6 @@ +-- liquibase formatted sql +-- changeset derek:revert_add_corresponding_weighting +ALTER TABLE `bom` +DROP COLUMN `isDarkWeighting`, +DROP COLUMN `isFloatWeighting`, +DROP COLUMN `isDenseWeighting`; \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/20250618_01_derek/03_create_weighting_score.sql b/src/main/resources/db/changelog/changes/20250618_01_derek/03_create_weighting_score.sql new file mode 100644 index 0000000..6aef11a --- /dev/null +++ b/src/main/resources/db/changelog/changes/20250618_01_derek/03_create_weighting_score.sql @@ -0,0 +1,15 @@ +-- liquibase formatted sql +-- changeset derek:add_weighting_score +CREATE TABLE `bom_weighting_score` ( + `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', + `name` VARCHAR(255) NOT NULL, + `range` INT(11) NOT NULL, + `weighting` DECIMAL(14, 2) NOT NULL, + PRIMARY KEY (id) +); \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/20250618_01_derek/04_add_remarks.sql b/src/main/resources/db/changelog/changes/20250618_01_derek/04_add_remarks.sql new file mode 100644 index 0000000..84aeb09 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20250618_01_derek/04_add_remarks.sql @@ -0,0 +1,4 @@ +-- liquibase formatted sql +-- changeset derek:add_remarks +ALTER TABLE `bom_weighting_score` +ADD COLUMN `remarks` VARCHAR(255) NULL; \ No newline at end of file