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 37e3ef2..7c237a4 100644 --- a/src/main/java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt +++ b/src/main/java/com/ffii/fpsms/m18/model/M18PurchaseOrderResponse.kt @@ -30,6 +30,7 @@ data class M18PurchaseOrderMainPo ( /** Business Unit (Shop) */ val virDeptId: Long?, val beId: Long?, + val udfIsVoid: String, ) 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 0a47216..74a5518 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt +++ b/src/main/java/com/ffii/fpsms/m18/service/M18DeliveryOrderService.kt @@ -231,7 +231,8 @@ open class M18DeliveryOrderService( type = type.value, m18DataLogId = saveM18DeliveryOrderLog.id, handlerId = null, - m18BeId = mainpo.beId + m18BeId = mainpo.beId, + deleted = mainpo.udfIsVoid == "false" ) val saveDeliveryOrderResponse = diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderRequest.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderRequest.kt index 6e70e16..c119531 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderRequest.kt +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderRequest.kt @@ -18,7 +18,8 @@ data class SaveDeliveryOrderRequest( val type: String?, val m18DataLogId: Long?, val handlerId: Long?, - val m18BeId: Long? + val m18BeId: Long?, + val deleted: Boolean? = false, ) data class SaveDeliveryOrderStatusRequest( diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderResponse.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderResponse.kt index 706b8be..92581fc 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderResponse.kt +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/SaveDeliveryOrderResponse.kt @@ -4,6 +4,7 @@ import java.time.LocalDateTime data class SaveDeliveryOrderResponse( val id: Long?, + val deleted: Boolean?, val code: String?, val supplierCode: String?, val shopCode: String?,