From 495dbd8fdb16f41c38a0c0497d74959055df71c1 Mon Sep 17 00:00:00 2001 From: Fai Luk Date: Thu, 26 Feb 2026 22:52:22 +0800 Subject: [PATCH] no message --- src/main/java/com/ffii/core/entity/BaseEntity.java | 4 +++- .../java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt | 2 +- .../com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ffii/core/entity/BaseEntity.java b/src/main/java/com/ffii/core/entity/BaseEntity.java index b8dc60b..a9af393 100644 --- a/src/main/java/com/ffii/core/entity/BaseEntity.java +++ b/src/main/java/com/ffii/core/entity/BaseEntity.java @@ -44,7 +44,9 @@ public abstract class BaseEntity extends IdEntity { public void autoSetCreated() { this.setCreated(LocalDateTime.now()); this.setModified(LocalDateTime.now()); - this.setDeleted(Boolean.FALSE); + if (this.deleted == null) { + this.setDeleted(Boolean.FALSE); + } Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication()) .ifPresentOrElse( 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 7c237a4..65863f9 100644 --- a/src/main/java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt +++ b/src/main/java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt @@ -30,7 +30,7 @@ data class M18PurchaseOrderMainPo ( /** Business Unit (Shop) */ val virDeptId: Long?, val beId: Long?, - val udfIsVoid: String, + val udfIsVoid: Boolean? = false, ) data class M18PurchaseOrderPot ( 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 a52e1f7..69335e9 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt +++ b/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt @@ -238,7 +238,7 @@ open class M18DeliveryOrderService( m18DataLogId = saveM18DeliveryOrderLog.id, handlerId = null, m18BeId = mainpo.beId, - deleted = mainpo.udfIsVoid == "true" + deleted = mainpo.udfIsVoid == true ) val saveDeliveryOrderResponse =