From db80dcb46950161fa85e613f91a679bb2d8fde36 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Wed, 15 Oct 2025 18:06:51 +0800
Subject: [PATCH] [database] insert data. & quick update

---
 .../fpsms/m18/service/M18PurchaseOrderService.kt |  2 +-
 .../common/mail/service/MailTemplateService.kt   | 10 ++++++----
 .../modules/master/service/WarehouseService.kt   |  2 +-
 .../20251013_01_cyril/01_insert_warehouse.sql    |  6 ++++++
 .../02_update_bom_weighting_score.sql            | 16 ++++++++++++++++
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changes/20251013_01_cyril/01_insert_warehouse.sql
 create mode 100644 src/main/resources/db/changelog/changes/20251013_01_cyril/02_update_bom_weighting_score.sql

diff --git a/src/main/java/com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt b/src/main/java/com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt
index 867a382..ef5e6c9 100644
--- a/src/main/java/com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt
@@ -195,7 +195,7 @@ open class M18PurchaseOrderService(
                         val mainpo = purchaseOrderDetail?.data?.mainpo?.get(0)
                         val pot = purchaseOrderDetail?.data?.pot
                         val purchaseOrderLineMessage = purchaseOrderDetail?.messages
-                        logger.info("deliveryOrderDetail: data is null? ${purchaseOrderDetail?.data == null} | mainpo is null? ${purchaseOrderDetail?.data?.mainpo == null} | get(0) is null? ${purchaseOrderDetail?.data?.mainpo?.get(0) == null}")
+                        logger.info("purchaseOrderDetail: data is null? ${purchaseOrderDetail?.data == null} | mainpo is null? ${purchaseOrderDetail?.data?.mainpo == null} | get(0) is null? ${purchaseOrderDetail?.data?.mainpo?.get(0) == null}")
 
                         // purchase_order + m18_data_log table
                         if (mainpo != null) {
diff --git a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt
index 569b4e6..875d2a2 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailTemplateService.kt
@@ -100,7 +100,7 @@ open class MailTemplateService(
         val itemName: String = "",
         val itemQty: String = "",
         val uom: String = "",
-        val planDnDate: String = "",
+        val dnDate: String = "",
         val unitPrice: String = "",
         val receivedCompany: String = "",
         val lotNo: String = "",
@@ -122,7 +122,7 @@ open class MailTemplateService(
                 "\${itemName}" to itemName,
                 "\${itemQty}" to itemQty,
                 "\${uom}" to uom,
-                "\${planDnDate}" to planDnDate,
+                "\${dnDate}" to dnDate,
                 "\${unitPrice}" to unitPrice,
                 "\${receivedCompany}" to receivedCompany,
                 "\${lotNo}" to lotNo,
@@ -156,7 +156,8 @@ open class MailTemplateService(
         val itemName = item?.name ?: "N/A"
         val itemQty = (pol?.qty ?: zero).toString()
         val uom = pol?.uom?.udfudesc ?: "N/A"
-        val planDnDate = po?.estimatedArrivalDate?.let { formatter.format(it) } ?: "N/A"
+//        val planDnDate = po?.estimatedArrivalDate?.let { formatter.format(it) } ?: "N/A"
+        val dnDate = stockInLine.dnDate?.let { formatter.format(it) } ?: "N/A"
         val unitPrice = (pol?.up ?: zero).toString()
         val receivedCompany = po?.shop?.name ?: "N/A"
         val lotNo = stockInLine.productLotNo ?: "N/A"
@@ -200,7 +201,8 @@ open class MailTemplateService(
             itemName = itemName,
             itemQty = itemQty,
             uom = uom,
-            planDnDate = planDnDate,
+//            planDnDate = planDnDate,
+            dnDate = dnDate,
             unitPrice = unitPrice,
             receivedCompany = receivedCompany,
             lotNo = lotNo,
diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/WarehouseService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/WarehouseService.kt
index 4be4358..f936c62 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/service/WarehouseService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/service/WarehouseService.kt
@@ -74,7 +74,7 @@ open class WarehouseService(
         val COLUMN_FLOOR_INDEX = 4;
         val COLUMN_PLACE_INDEX = 5;
 
-        val START_ROW_INDEX = 2;
+        val START_ROW_INDEX = 1;
 
         // Start Import
         for (i in START_ROW_INDEX..<sheet.lastRowNum) {
diff --git a/src/main/resources/db/changelog/changes/20251013_01_cyril/01_insert_warehouse.sql b/src/main/resources/db/changelog/changes/20251013_01_cyril/01_insert_warehouse.sql
new file mode 100644
index 0000000..dd166e7
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/20251013_01_cyril/01_insert_warehouse.sql
@@ -0,0 +1,6 @@
+-- liquibase formatted sql
+-- changeset cyril:insert_temp_production_to_warehouse
+
+insert into warehouse (createdBy, version, modifiedBy, deleted, code, name, description, capacity)
+select '2fi', '0', '2fi', '0', 'P001', '生產車間', '生產車間', '1000000'
+where not exists(select 1 from warehouse where code = 'P001');
diff --git a/src/main/resources/db/changelog/changes/20251013_01_cyril/02_update_bom_weighting_score.sql b/src/main/resources/db/changelog/changes/20251013_01_cyril/02_update_bom_weighting_score.sql
new file mode 100644
index 0000000..ac18f1c
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/20251013_01_cyril/02_update_bom_weighting_score.sql
@@ -0,0 +1,16 @@
+-- liquibase formatted sql
+-- changeset cyril:update_bom_weighting_score
+
+ALTER TABLE bom_weighting_score
+    ADD COLUMN code VARCHAR(255) NOT NULL AFTER deleted;
+
+insert into bom_weighting_score (createdBy, version, modifiedBy, deleted, code, name, `range`, weighting)
+select '2fi', '0', '2fi', '0', 'dark', '顔色深淺度', '1', '0.34'
+where not exists(select 1 from bom_weighting_score where code = 'dark')
+UNION ALL
+select '2fi', '0', '2fi', '0', 'float', '浮沉', '5', '0.33'
+where not exists(select 1 from bom_weighting_score where code = 'float')
+UNION ALL
+select '2fi', '0', '2fi', '0', 'dense', '濃淡程度 濃5 淡1', '5', '0.33'
+where not exists(select 1 from bom_weighting_score where code = 'dense')
+;
\ No newline at end of file