add m18 up

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

@@ -44,6 +44,7 @@ data class M18PurchaseOrderPot (
     val unitId: Long,
 //    val seriesId: Long?,
     val qty: BigDecimal,
+    val up: BigDecimal, // unit price
     val amt: BigDecimal,
     val disc: BigDecimal,
     val lot: String,

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

@@ -286,6 +286,7 @@ open class M18DeliveryOrderService(
                                             uomId = itemUom?.uom?.id,
                                             deliveryOrderId = deliveryOrderId,
                                             qty = line.qty,
+                                            up = line.up,
                                             price = line.amt,
 //                                            m18CurrencyId = mainpo.curId,
                                             status = existingDeliveryOrderLine?.status?.value

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

@@ -341,6 +341,7 @@ open class M18PurchaseOrderService(
                                             uomId = itemUom?.uom?.id,
                                             purchaseOrderId = purchaseOrderId,
                                             qty = line.qty,
+                                            up = line.up,
                                             price = line.amt,
 //                                            m18CurrencyId = mainpo.curId,
                                             status = existingPurchaseOrderLine?.status?.value

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

@@ -31,6 +31,9 @@ open class DeliveryOrderLine: BaseEntity<Long>() {
     @Column(name = "qty", precision = 14, scale = 2)
     open var qty: BigDecimal? = null
 
+    @Column(name = "up", precision = 14, scale = 2)
+    open var up: BigDecimal? = null
+
     @ManyToOne
     @JoinColumn(name = "uomId")
     open var uom: UomConversion? = null

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

@@ -43,6 +43,7 @@ open class DeliveryOrderLineService(
             itemNo = item?.code
             this.deliveryOrder = deliveryOrder
             qty = request.qty
+            up = request.up
             price = request.price
             this.uom = uom
             this.status = status

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

@@ -8,6 +8,7 @@ data class SaveDeliveryOrderLineRequest(
     val uomId: Long?,
     val deliveryOrderId: Long?,
     val qty: BigDecimal?,
+    val up: BigDecimal?,
     val price: BigDecimal?,
     val status: String?,
     val m18DataLogId: Long?,

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

@@ -33,6 +33,9 @@ open class PurchaseOrderLine : BaseEntity<Long>() {
     @Column(name = "qty", precision = 14, scale = 2)
     open var qty: BigDecimal? = null
 
+    @Column(name = "up", precision = 14, scale = 2)
+    open var up: BigDecimal? = null
+
     @Column(name = "price", precision = 14, scale = 2)
     open var price: BigDecimal? = null
 

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

@@ -55,6 +55,7 @@ open class PurchaseOrderLineService(
             itemNo = item?.code
             this.purchaseOrder = purchaseOrder
             qty = request.qty
+            up = request.up
             price = request.price
             this.uom = uom
 //            this.currency = currency

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

@@ -8,6 +8,7 @@ data class SavePurchaseOrderLineRequest(
     val uomId: Long?,
     val purchaseOrderId: Long?,
     val qty: BigDecimal?,
+    val up: BigDecimal?, // unit price
     val price: BigDecimal?,
 //    val currencyId: Long? = null,
 //    val m18CurrencyId: Long? = null,

src/main/resources/db/changelog/changes/20250724_01_cyril/01_update_po.sql

@@ -0,0 +1,8 @@
+-- liquibase formatted sql
+-- changeset cyril:update_do
+
+ALTER TABLE `purchase_order_line`
+    ADD COLUMN `up` DECIMAL(14,2) NULL AFTER `qty`;
+
+ALTER TABLE `delivery_order_line`
+    ADD COLUMN `up` DECIMAL(14,2) NULL AFTER `qty`;