[m18] update m18 do

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

@@ -190,7 +190,8 @@ open class M18DeliveryOrderService(
                                     status = DeliveryOrderStatus.PENDING.value,
                                     type = type.value,
                                     m18DataLogId = saveM18DeliveryOrderLog.id,
-                                    handlerId = null
+                                    handlerId = null,
+                                    m18BeId = mainpo.beId
                                 )
 
                                 val saveDeliveryOrderResponse =
@@ -293,6 +294,8 @@ open class M18DeliveryOrderService(
                                             status = existingDeliveryOrderLine?.status?.value
                                                 ?: DeliveryOrderLineStatus.PENDING.value,
                                             m18DataLogId = saveM18DeliveryOrderLineLog.id,
+                                            m18Discount = line.disc,
+                                            m18Lot = line.lot
                                         )
 
                                         val saveDeliveryOrderLineResponse =

src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrder.kt

@@ -59,4 +59,7 @@ open class DeliveryOrder: BaseEntity<Long>() {
     @JsonManagedReference
     @OneToMany(mappedBy = "deliveryOrder", cascade = [CascadeType.ALL], orphanRemoval = true)
     open var deliveryOrderLines: MutableList<DeliveryOrderLine> = mutableListOf()
+
+    @Column(name = "m18BeId")
+    open var m18BeId: Long? = null
 }

src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderLine.kt

@@ -52,4 +52,11 @@ open class DeliveryOrderLine: BaseEntity<Long>() {
     @ManyToOne
     @JoinColumn(name = "deliveryOrderId")
     open var deliveryOrder: DeliveryOrder? = 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/deliveryOrder/service/DeliveryOrderLineService.kt

@@ -47,6 +47,8 @@ open class DeliveryOrderLineService(
             this.uom = uom
             this.status = status
             this.m18DataLog = m18DataLog ?: this.m18DataLog
+            m18Discount = request.m18Discount
+            m18Lot = request.m18Lot
         }
 
         val savedDeliveryOrderLine = deliveryOrderLineRepository.saveAndFlush(deliveryOrderLine).let {

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt

@@ -101,6 +101,7 @@ open class DeliveryOrderService(
             this.status = status
             this.m18DataLog = m18DataLog
             this.handler = handler
+            m18BeId = request.m18BeId
         }
 
         val savedDeliveryOrder = deliveryOrderRepository.saveAndFlush(deliveryOrder).let {

src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderLineRequest.kt

@@ -11,4 +11,6 @@ data class SaveDeliveryOrderLineRequest(
     val price: BigDecimal?,
     val status: String?,
     val m18DataLogId: Long?,
+    val m18Discount: BigDecimal?,
+    val m18Lot: String?
 )

src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderRequest.kt

@@ -17,7 +17,8 @@ data class SaveDeliveryOrderRequest(
     val status: String?,
     val type: String?,
     val m18DataLogId: Long?,
-    val handlerId: Long?
+    val handlerId: Long?,
+    val m18BeId: Long?
 )
 
 data class SaveDeliveryOrderStatusRequest(

src/main/resources/db/changelog/changes/20250711_01_cyril/02_update_m18do.sql

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