[M18] Update M18 PO

src/main/java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt

@@ -29,6 +29,7 @@ data class M18PurchaseOrderMainPo (
     val curId: Long,
     /** Business Unit (Shop) */
     val virDeptId: Long?,
+    val beId: Long?,
 )
 
 data class M18PurchaseOrderPot (
@@ -44,6 +45,8 @@ data class M18PurchaseOrderPot (
 //    val seriesId: Long?,
     val qty: BigDecimal,
     val amt: BigDecimal,
+    val disc: BigDecimal,
+    val lot: String,
 )
 
 /** Purchase Order List Response */

src/main/java/com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt

@@ -244,6 +244,7 @@ open class M18PurchaseOrderService(
                                     status = PurchaseOrderStatus.PENDING.value,
                                     type = type.value,
                                     m18DataLogId = saveM18PurchaseOrderLog.id,
+                                    m18BeId = mainpo.beId
                                 )
 
                                 val savePurchaseOrderResponse =
@@ -345,6 +346,8 @@ open class M18PurchaseOrderService(
                                             status = existingPurchaseOrderLine?.status?.value
                                                 ?: PurchaseOrderLineStatus.PENDING.value,
                                             m18DataLogId = saveM18PurchaseOrderLineLog.id,
+                                            m18Discount = line.disc,
+                                            m18Lot = line.lot
                                         )
 
                                         val savePurchaseOrderLineResponse =

src/main/java/com/ffii/fpsms/m18/service/M18TokenService.kt

@@ -15,7 +15,7 @@ open class M18TokenService(
     private val m18Config: M18Config
 ) {
 
-//    @Bean
+    @Bean
      fun run() {
 //        val params: MutableMap<String, String> = mutableMapOf(
 //            "grant_type" to m18Config.GRANT_TYPE,

src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt

@@ -84,7 +84,7 @@ class M18TestController (
         m18MasterDataService.saveVendors(request)
         m18MasterDataService.saveBusinessUnits(request)
         m18MasterDataService.saveCurrencies(request)
-        m18MasterDataService.saveBoms(request)
+//        m18MasterDataService.saveBoms(request)
     }
 
     @PostMapping("/product")

src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrder.kt

@@ -56,4 +56,7 @@ open class PurchaseOrder : BaseEntity<Long>() {
     @ManyToOne
     @JoinColumn(name = "m18DataLogId", nullable = false)
     open var m18DataLog: M18DataLog? = null
+
+    @Column(name = "m18BeId")
+    open var m18BeId: Long? = null
 }

src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLine.kt

@@ -50,4 +50,11 @@ open class PurchaseOrderLine : BaseEntity<Long>() {
     @ManyToOne
     @JoinColumn(name = "uomId", nullable = false)
     open var uom: UomConversion? = null
+
+    @Column(name = "m18Discount", precision = 14, scale = 2)
+    open var m18Discount: BigDecimal? = null
+
+    @Size(max = 20)
+    @Column(name = "m18Lot", length = 20)
+    open var m18Lot: String? = null
 }

src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderLineService.kt

@@ -60,6 +60,8 @@ open class PurchaseOrderLineService(
 //            this.currency = currency
             this.status = status
             this.m18DataLog = m18DataLog ?: this.m18DataLog
+            m18Discount = request.m18Discount
+            m18Lot = request.m18Lot
         }
 
         val savedPurchaseOrderLine = purchaseOrderLineRepository.saveAndFlush(purchaseOrderLine).let {

src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt

@@ -185,6 +185,7 @@ open class PurchaseOrderService(
             this.status = status
             this.type = type
             this.m18DataLog = m18DataLog
+            m18BeId = request.m18BeId
         }
 
         val savedPurchaseOrder = purchaseOrderRepository.saveAndFlush(purchaseOrder).let {

src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/model/SavePurchaseOrderLineRequest.kt

@@ -13,4 +13,6 @@ data class SavePurchaseOrderLineRequest(
 //    val m18CurrencyId: Long? = null,
     val status: String?,
     val m18DataLogId: Long?,
+    val m18Discount: BigDecimal?,
+    val m18Lot: String?,
 )

src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/model/SavePurchaseOrderRequest.kt

@@ -18,5 +18,6 @@ data class SavePurchaseOrderRequest (
     val completeDate: LocalDateTime?,
     val status: String?,
     val type: String?,
-    val m18DataLogId: Long?
+    val m18DataLogId: Long?,
+    val m18BeId: Long?
 )

src/main/resources/db/changelog/changes/20250711_01_cyril/01_update_m18po.sql

@@ -0,0 +1,9 @@
+-- liquibase formatted sql
+-- changeset cyril:update_m18po
+
+ALTER TABLE `purchase_order`
+    ADD COLUMN `m18BeId` INT NULL AFTER `m18DataLogId`;
+
+ALTER TABLE `purchase_order_line`
+    ADD COLUMN `m18Discount` DECIMAL(14,2) NULL AFTER `m18DataLogId`,
+    ADD COLUMN `m18Lot` VARCHAR(20) NULL AFTER `m18Discount`;