| @@ -44,7 +44,9 @@ public abstract class BaseEntity<ID extends Serializable> extends IdEntity<ID> { | |||||
| public void autoSetCreated() { | public void autoSetCreated() { | ||||
| this.setCreated(LocalDateTime.now()); | this.setCreated(LocalDateTime.now()); | ||||
| this.setModified(LocalDateTime.now()); | this.setModified(LocalDateTime.now()); | ||||
| this.setDeleted(Boolean.FALSE); | |||||
| if (this.deleted == null) { | |||||
| this.setDeleted(Boolean.FALSE); | |||||
| } | |||||
| Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication()) | Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication()) | ||||
| .ifPresentOrElse( | .ifPresentOrElse( | ||||
| @@ -30,7 +30,7 @@ data class M18PurchaseOrderMainPo ( | |||||
| /** Business Unit (Shop) */ | /** Business Unit (Shop) */ | ||||
| val virDeptId: Long?, | val virDeptId: Long?, | ||||
| val beId: Long?, | val beId: Long?, | ||||
| val udfIsVoid: String, | |||||
| val udfIsVoid: Boolean? = false, | |||||
| ) | ) | ||||
| data class M18PurchaseOrderPot ( | data class M18PurchaseOrderPot ( | ||||
| @@ -238,7 +238,7 @@ open class M18DeliveryOrderService( | |||||
| m18DataLogId = saveM18DeliveryOrderLog.id, | m18DataLogId = saveM18DeliveryOrderLog.id, | ||||
| handlerId = null, | handlerId = null, | ||||
| m18BeId = mainpo.beId, | m18BeId = mainpo.beId, | ||||
| deleted = mainpo.udfIsVoid == "true" | |||||
| deleted = mainpo.udfIsVoid == true | |||||
| ) | ) | ||||
| val saveDeliveryOrderResponse = | val saveDeliveryOrderResponse = | ||||