DO Update

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

@@ -2,6 +2,8 @@ package com.ffii.fpsms.modules.deliveryOrder.entity
 
 import com.ffii.core.support.AbstractRepository
 import com.ffii.fpsms.modules.deliveryOrder.entity.models.DeliveryOrderInfo
+import com.ffii.fpsms.modules.master.entity.projections.SearchId
+import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 import java.io.Serializable
 
@@ -12,4 +14,12 @@ interface DeliveryOrderRepository : AbstractRepository<DeliveryOrder, Long> {
     fun findDeliveryOrderInfoByDeletedIsFalse(): List<DeliveryOrderInfo>
 
     fun findByIdAndDeletedIsFalse(id: Serializable): DeliveryOrder?
+
+    fun findAllByCodeAndDeletedIsFalse(code: String): List<DeliveryOrderInfo>
+
+
+
+
+
+
 }

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

@@ -3,6 +3,7 @@ package com.ffii.fpsms.modules.deliveryOrder.entity.models
 import com.ffii.fpsms.modules.deliveryOrder.entity.DeliveryOrderLine
 import com.ffii.fpsms.modules.deliveryOrder.enums.DeliveryOrderStatus
 import com.ffii.fpsms.modules.deliveryOrder.enums.DeliveryOrderStatusConverter
+import com.ffii.fpsms.modules.master.entity.Shop
 import jakarta.persistence.Convert
 import org.springframework.beans.factory.annotation.Value
 import java.time.LocalDateTime
@@ -11,6 +12,7 @@ interface DeliveryOrderInfo{
     val id: Long
     val code: String
     val orderDate: LocalDateTime?
+    val estimatedArrivalDate: LocalDateTime?
 
     @get:Value("#{target.status.value}")
     val status: String?
@@ -18,6 +20,11 @@ interface DeliveryOrderInfo{
     @get:Value("#{target.shop?.name}")
     val shopName: String?
 
+    @get:Value("#{target.supplier?.name}")
+    val supplierName: String?
+
     val deliveryOrderLines: List<DeliveryOrderLineInfo>
+
+
 }
 

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

@@ -11,8 +11,6 @@ import com.ffii.fpsms.modules.deliveryOrder.web.models.SaveDeliveryOrderResponse
 import com.ffii.fpsms.modules.deliveryOrder.web.models.SaveDeliveryOrderStatusRequest
 import com.ffii.fpsms.modules.master.service.CurrencyService
 import com.ffii.fpsms.modules.master.service.ShopService
-import com.ffii.fpsms.modules.master.web.models.MessageResponse
-import com.ffii.fpsms.modules.purchaseOrder.enums.PurchaseOrderStatus
 import com.ffii.fpsms.modules.user.entity.UserRepository
 import com.ffii.fpsms.modules.user.service.UserService
 import org.springframework.stereotype.Service
@@ -44,6 +42,11 @@ open class DeliveryOrderService(
         return deliveryOrderRepository.findByIdAndDeletedIsFalse(id);
     }
 
+    open fun searchByCode(code: String) : List<DeliveryOrderInfo> {
+        return deliveryOrderRepository.findAllByCodeAndDeletedIsFalse(code);
+    }
+
+
     open fun updateDeliveryOrderStatus(request: SaveDeliveryOrderStatusRequest): SaveDeliveryOrderResponse {
         val deliveryOrder = checkNotNull(
             request.id?.let { deliveryOrderRepository.findById(it).getOrNull() }

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

@@ -30,6 +30,11 @@ class DeliveryOrderController(
         return deliveryOrderService.getDetailedDo(id);
     }
 
+    @GetMapping("/search-code/{code}")
+    fun searchByCode(@PathVariable code: String): List<DeliveryOrderInfo>{
+        return deliveryOrderService.searchByCode(code);
+    }
+
     @PostMapping("/update-status")
     fun updateDoStatus(@RequestBody request: SaveDeliveryOrderStatusRequest): SaveDeliveryOrderResponse {
         return deliveryOrderService.updateDeliveryOrderStatus(request);

src/main/resources/application-db-local.yml

@@ -1,5 +1,5 @@
 spring:
   datasource:
-    jdbc-url: jdbc:mysql://127.0.0.1:3308/fpsmsdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8
+    jdbc-url: jdbc:mysql://127.0.0.1:3306/fpsmsdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8
     username: root
     password: secret