diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt index 73f187f..2dc2712 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt @@ -54,6 +54,9 @@ open class StockInLine : BaseEntity() { @Column(name = "priceUnit", length = 5) open var priceUnit: String? = null + @Column(name = "dnDate") + open var dnDate: LocalDateTime? = null + @Column(name = "receiptDate") open var receiptDate: LocalDateTime? = null diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt index f57222c..7ac6281 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt @@ -43,4 +43,6 @@ interface StockInLineInfo { val poCode: String @get:Value("#{target.item?.type}") val itemType: String + val dnNo: String + val dnDate: LocalDateTime } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt index 7af2282..892c451 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt @@ -96,6 +96,9 @@ open class StockInLineService( this.purchaseOrderLine = purchaseOrderLine this.stockIn = stockIn acceptedQty = request.acceptedQty + dnNo = request.dnNo + dnDate = request.dnDate?.atStartOfDay() + productLotNo = request.productLotNo status = StockInLineStatus.PENDING.status } val savedInLine = saveAndFlush(stockInLine) @@ -278,6 +281,7 @@ open class StockInLineService( this.productionDate = request.productionDate?.atStartOfDay() // maybe need to change the request to LocalDateTime this.productLotNo = request.productLotNo this.dnNo = request.dnNo + this.dnDate = request.dnDate?.atStartOfDay() this.invoiceNo = request.invoiceNo this.receiptDate = request.receiptDate?.atStartOfDay() this.status = request.status @@ -327,6 +331,7 @@ open class StockInLineService( this.purchaseOrderLine = stockInLine.purchaseOrderLine this.productLotNo = stockInLine.productLotNo this.dnNo = stockInLine.dnNo + this.dnDate = stockInLine.dnDate this.invoiceNo = stockInLine.invoiceNo this.remarks = stockInLine.remarks ?: request.remarks this.receiptDate = stockInLine.receiptDate @@ -362,6 +367,7 @@ open class StockInLineService( this.expiryDate = stockInLine.expiryDate ?: request.expiryDate this.productLotNo = stockInLine.productLotNo ?: request.productLotNo this.dnNo = stockInLine.dnNo ?: request.dnNo + this.dnDate = stockInLine.dnDate ?: request.dnDate?.atStartOfDay() this.invoiceNo = stockInLine.invoiceNo ?: request.invoiceNo this.remarks = stockInLine.remarks ?: request.remarks } diff --git a/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt b/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt index 4837e42..730bd29 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt @@ -47,6 +47,7 @@ data class SaveStockInLineRequest( var dnNo: String?, var invoiceNo: String?, var remarks: String?, + var dnDate: LocalDate?, var receiptDate: LocalDate?, var productionDate: LocalDate?, var qcResult: List?, diff --git a/src/main/resources/db/changelog/changes/20250816_01_cyril/01_update_stock_in_line.sql b/src/main/resources/db/changelog/changes/20250816_01_cyril/01_update_stock_in_line.sql new file mode 100644 index 0000000..85f96e0 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20250816_01_cyril/01_update_stock_in_line.sql @@ -0,0 +1,5 @@ +-- liquibase formatted sql +-- changeset cyril:update_qc_id_with_auto + +ALTER TABLE `stock_in_line` + ADD COLUMN `dnDate` DATETIME NULL AFTER `priceUnit`;