From 0ac516da3b775b50fcec9ff0180fa8fc8b167588 Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Thu, 24 Jul 2025 12:29:02 +0800 Subject: [PATCH] add m18 up --- .../com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt | 1 + .../com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt | 1 + .../com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt | 1 + .../modules/deliveryOrder/entity/DeliveryOrderLine.kt | 3 +++ .../deliveryOrder/service/DeliveryOrderLineService.kt | 1 + .../web/models/SaveDeliveryOrderLineRequest.kt | 1 + .../modules/purchaseOrder/entity/PurchaseOrderLine.kt | 3 +++ .../purchaseOrder/service/PurchaseOrderLineService.kt | 1 + .../web/model/SavePurchaseOrderLineRequest.kt | 1 + .../changelog/changes/20250724_01_cyril/01_update_po.sql | 8 ++++++++ 10 files changed, 21 insertions(+) create mode 100644 src/main/resources/db/changelog/changes/20250724_01_cyril/01_update_po.sql diff --git a/src/main/java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt b/src/main/java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt index 09390e0..0edec13 100644 --- a/src/main/java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt +++ b/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, diff --git a/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt b/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt index 5827d8f..7ccde0b 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt +++ b/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 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 dbc422c..e2e506e 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt +++ b/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 diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderLine.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderLine.kt index 06d4df2..a7ed9b0 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderLine.kt +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderLine.kt @@ -31,6 +31,9 @@ open class DeliveryOrderLine: BaseEntity() { @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 diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderLineService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderLineService.kt index 46a5aba..5490be5 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderLineService.kt +++ b/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 diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderLineRequest.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderLineRequest.kt index bae7f3d..6f05c13 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderLineRequest.kt +++ b/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?, diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLine.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLine.kt index 2cf7ae1..2196af4 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLine.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLine.kt @@ -33,6 +33,9 @@ open class PurchaseOrderLine : BaseEntity() { @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 diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderLineService.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderLineService.kt index 1f1796e..d20d6a6 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderLineService.kt +++ b/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 diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/model/SavePurchaseOrderLineRequest.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/model/SavePurchaseOrderLineRequest.kt index 3ad33c1..9dfa9bc 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/model/SavePurchaseOrderLineRequest.kt +++ b/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, diff --git a/src/main/resources/db/changelog/changes/20250724_01_cyril/01_update_po.sql b/src/main/resources/db/changelog/changes/20250724_01_cyril/01_update_po.sql new file mode 100644 index 0000000..a685468 --- /dev/null +++ b/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`; \ No newline at end of file