| @@ -136,7 +136,7 @@ class M18TestController ( | |||||
| m18PurchaseOrderService.savePurchaseOrders(request) | m18PurchaseOrderService.savePurchaseOrders(request) | ||||
| } | } | ||||
| // --------------------------------------------- Purchase Order --------------------------------------------- /// | |||||
| // --------------------------------------------- Delivery Order --------------------------------------------- /// | |||||
| @PostMapping("/do") | @PostMapping("/do") | ||||
| fun m18DO(@Valid @RequestBody request: M18TestDoRequest) { | fun m18DO(@Valid @RequestBody request: M18TestDoRequest) { | ||||
| logger.info("Access token: ${m18Config.ACCESS_TOKEN}") | logger.info("Access token: ${m18Config.ACCESS_TOKEN}") | ||||
| @@ -21,7 +21,7 @@ open class Bom : BaseEntity<Long>() { | |||||
| @Column | @Column | ||||
| open var isDense: Int? = null | open var isDense: Int? = null | ||||
| @ManyToOne | |||||
| @OneToOne | |||||
| @JoinColumn(name = "itemId") | @JoinColumn(name = "itemId") | ||||
| open var item: Items? = null | open var item: Items? = null | ||||
| @@ -9,4 +9,6 @@ interface BomMaterialRepository : AbstractRepository<BomMaterial, Long> { | |||||
| fun findByIdAndDeletedIsFalse(id: Serializable): BomMaterial? | fun findByIdAndDeletedIsFalse(id: Serializable): BomMaterial? | ||||
| fun findByM18IdAndDeletedIsFalse(m18Id: Long): BomMaterial? | fun findByM18IdAndDeletedIsFalse(m18Id: Long): BomMaterial? | ||||
| fun findAllByBomItemIdAndDeletedIsFalse(itemId: Long): List<BomMaterial> | |||||
| } | } | ||||
| @@ -2,6 +2,7 @@ package com.ffii.fpsms.modules.master.entity | |||||
| import com.fasterxml.jackson.annotation.JsonManagedReference | import com.fasterxml.jackson.annotation.JsonManagedReference | ||||
| import com.ffii.core.entity.BaseEntity | import com.ffii.core.entity.BaseEntity | ||||
| import com.ffii.fpsms.modules.stock.entity.Inventory | |||||
| import jakarta.persistence.* | import jakarta.persistence.* | ||||
| import jakarta.validation.constraints.NotNull | import jakarta.validation.constraints.NotNull | ||||
| import java.time.LocalDateTime | import java.time.LocalDateTime | ||||
| @@ -45,4 +46,12 @@ open class Items : BaseEntity<Long>() { | |||||
| @JsonManagedReference | @JsonManagedReference | ||||
| @OneToMany(mappedBy = "item", cascade = [CascadeType.ALL], orphanRemoval = true) | @OneToMany(mappedBy = "item", cascade = [CascadeType.ALL], orphanRemoval = true) | ||||
| open var itemUoms: MutableList<ItemUom> = mutableListOf() | open var itemUoms: MutableList<ItemUom> = mutableListOf() | ||||
| @JsonManagedReference | |||||
| @OneToMany(mappedBy = "item", cascade = [CascadeType.ALL], orphanRemoval = true) | |||||
| open var inventories: MutableList<Inventory> = mutableListOf() | |||||
| @JsonManagedReference | |||||
| @OneToOne(mappedBy = "item", cascade = [CascadeType.ALL], orphanRemoval = true) | |||||
| open var bom: Bom = Bom() | |||||
| } | } | ||||